From e825fa7258e7a24cf8e41c06eb45d33a142663e7 Mon Sep 17 00:00:00 2001
From: f43nd1r <account+github@faendir.com>
Date: Mon, 7 Jun 2021 15:29:48 +0200
Subject: [PATCH 1/2] add one-arg overloads for coalesce

---
 .../core/types/dsl/BooleanExpression.java     | 27 +++++++++++++++++
 .../com/querydsl/core/types/dsl/Coalesce.java |  5 ++++
 .../core/types/dsl/ComparableExpression.java  | 27 +++++++++++++++++
 .../types/dsl/ComparableExpressionBase.java   | 26 ++++++++++++++++
 .../core/types/dsl/DateExpression.java        | 28 +++++++++++++++++
 .../core/types/dsl/DateTimeExpression.java    | 28 +++++++++++++++++
 .../core/types/dsl/EnumExpression.java        | 30 +++++++++++++++++++
 .../core/types/dsl/NumberExpression.java      | 28 +++++++++++++++++
 .../core/types/dsl/StringExpression.java      | 27 +++++++++++++++++
 .../core/types/dsl/TimeExpression.java        | 27 +++++++++++++++++
 10 files changed, 253 insertions(+)

diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanExpression.java
index 5d5ac660c..b8dae31b6 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanExpression.java
@@ -177,6 +177,19 @@ public abstract class BooleanExpression extends LiteralExpression<Boolean> imple
         return nullif(ConstantImpl.create(other));
     }
 
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    public BooleanExpression coalesce(Expression<Boolean> expr) {
+        Coalesce<Boolean> coalesce = new Coalesce<Boolean>(getType(), mixin);
+        coalesce.add(expr);
+        return coalesce.asBoolean();
+    }
+
     /**
      * Create a {@code coalesce(this, exprs...)} expression
      *
@@ -184,6 +197,7 @@ public abstract class BooleanExpression extends LiteralExpression<Boolean> imple
      * @return coalesce
      */
     @Override
+    @SuppressWarnings("unchecked")
     public BooleanExpression coalesce(Expression<Boolean>... exprs) {
         Coalesce<Boolean> coalesce = new Coalesce<Boolean>(getType(), mixin);
         for (Expression<Boolean> expr : exprs) {
@@ -192,6 +206,19 @@ public abstract class BooleanExpression extends LiteralExpression<Boolean> imple
         return coalesce.asBoolean();
     }
 
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    public BooleanExpression coalesce(Boolean arg) {
+        Coalesce<Boolean> coalesce = new Coalesce<Boolean>(getType(), mixin);
+        coalesce.add(arg);
+        return coalesce.asBoolean();
+    }
+
     /**
      * Create a {@code coalesce(this, args...)} expression
      *
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Coalesce.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Coalesce.java
index b32ad3935..60296ce42 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Coalesce.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/Coalesce.java
@@ -39,6 +39,11 @@ public class Coalesce<T extends Comparable> extends MutableExpressionBase<T> {
 
     private transient volatile ComparableExpression<T> value;
 
+    public Coalesce(Class<? extends T> type, Expression<T> expr) {
+        super(type);
+        add(expr);
+    }
+
     public Coalesce(Class<? extends T> type, Expression<?>... exprs) {
         super(type);
         // NOTE : type parameters for the varargs, would result in compiler warnings
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpression.java
index bfa616dfb..258dbcbef 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpression.java
@@ -409,6 +409,19 @@ public abstract class ComparableExpression<T extends Comparable> extends Compara
         return nullif(ConstantImpl.create(other));
     }
 
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    public ComparableExpression<T> coalesce(Expression<T> expr) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(expr);
+        return coalesce.getValue();
+    }
+
     /**
      * Create a {@code coalesce(this, exprs...)} expression
      *
@@ -416,6 +429,7 @@ public abstract class ComparableExpression<T extends Comparable> extends Compara
      * @return coalesce
      */
     @Override
+    @SuppressWarnings("unchecked")
     public ComparableExpression<T> coalesce(Expression<T>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
         for (Expression<T> expr : exprs) {
@@ -424,6 +438,19 @@ public abstract class ComparableExpression<T extends Comparable> extends Compara
         return coalesce.getValue();
     }
 
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    public ComparableExpression<T> coalesce(T arg) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(arg);
+        return coalesce.getValue();
+    }
+
     /**
      * Create a {@code coalesce(this, args...)} expression
      *
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java
index 9ba0837ed..2a592b3bc 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java
@@ -52,12 +52,25 @@ public abstract class ComparableExpressionBase<T extends Comparable> extends Sim
         return asc;
     }
 
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    public ComparableExpressionBase<T> coalesce(Expression<T> expr) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(expr);
+        return coalesce.getValue();
+    }
+
     /**
      * Create a {@code coalesce(this, exprs...)} expression
      *
      * @param exprs additional arguments
      * @return coalesce
      */
+    @SuppressWarnings("unchecked")
     public ComparableExpressionBase<T> coalesce(Expression<T>...exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
         for (Expression<T> expr : exprs) {
@@ -66,12 +79,25 @@ public abstract class ComparableExpressionBase<T extends Comparable> extends Sim
         return coalesce.getValue();
     }
 
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    public ComparableExpressionBase<T> coalesce(T arg) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(arg);
+        return coalesce.getValue();
+    }
+
     /**
      * Create a {@code coalesce(this, args...)} expression
      *
      * @param args additional arguments
      * @return coalesce
      */
+    @SuppressWarnings("unchecked")
     public ComparableExpressionBase<T> coalesce(T... args) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
         for (T arg : args) {
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateExpression.java
index 80def4bd1..e2b112ced 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateExpression.java
@@ -228,6 +228,19 @@ public abstract class DateExpression<T extends Comparable> extends TemporalExpre
         return nullif(ConstantImpl.create(other));
     }
 
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    public DateExpression<T> coalesce(Expression<T> expr) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(expr);
+        return coalesce.asDate();
+    }
+
     /**
      * Create a {@code coalesce(this, exprs...)} expression
      *
@@ -235,6 +248,7 @@ public abstract class DateExpression<T extends Comparable> extends TemporalExpre
      * @return coalesce
      */
     @Override
+    @SuppressWarnings("unchecked")
     public DateExpression<T> coalesce(Expression<T>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
         for (Expression<T> expr : exprs) {
@@ -243,6 +257,19 @@ public abstract class DateExpression<T extends Comparable> extends TemporalExpre
         return coalesce.asDate();
     }
 
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    public DateExpression<T> coalesce(T arg) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(arg);
+        return coalesce.asDate();
+    }
+
     /**
      * Create a {@code coalesce(this, args...)} expression
      *
@@ -250,6 +277,7 @@ public abstract class DateExpression<T extends Comparable> extends TemporalExpre
      * @return coalesce
      */
     @Override
+    @SuppressWarnings("unchecked")
     public DateExpression<T> coalesce(T... args) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
         for (T arg : args) {
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeExpression.java
index 6aadff464..ec98a49e0 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeExpression.java
@@ -298,6 +298,19 @@ public abstract class DateTimeExpression<T extends Comparable> extends TemporalE
         return nullif(ConstantImpl.create(other));
     }
 
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    public DateTimeExpression<T> coalesce(Expression<T> expr) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(expr);
+        return coalesce.asDateTime();
+    }
+
     /**
      * Create a {@code coalesce(this, exprs...)} expression
      *
@@ -305,6 +318,7 @@ public abstract class DateTimeExpression<T extends Comparable> extends TemporalE
      * @return coalesce
      */
     @Override
+    @SuppressWarnings("unchecked")
     public DateTimeExpression<T> coalesce(Expression<T>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
         for (Expression<T> expr : exprs) {
@@ -313,6 +327,19 @@ public abstract class DateTimeExpression<T extends Comparable> extends TemporalE
         return coalesce.asDateTime();
     }
 
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    public DateTimeExpression<T> coalesce(T arg) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(arg);
+        return coalesce.asDateTime();
+    }
+
     /**
      * Create a {@code coalesce(this, args...)} expression
      *
@@ -320,6 +347,7 @@ public abstract class DateTimeExpression<T extends Comparable> extends TemporalE
      * @return coalesce
      */
     @Override
+    @SuppressWarnings("unchecked")
     public DateTimeExpression<T> coalesce(T... args) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
         for (T arg : args) {
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumExpression.java
index 2fdd81eff..d3a5bba5f 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumExpression.java
@@ -80,6 +80,20 @@ public abstract class EnumExpression<T extends Enum<T>> extends LiteralExpressio
         return nullif(ConstantImpl.create(other));
     }
 
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public EnumExpression<T> coalesce(Expression<T> expr) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(expr);
+        return (EnumExpression<T>) coalesce.asEnum();
+    }
+
     /**
      * Create a {@code coalesce(this, exprs...)} expression
      *
@@ -87,6 +101,7 @@ public abstract class EnumExpression<T extends Enum<T>> extends LiteralExpressio
      * @return coalesce
      */
     @Override
+    @SuppressWarnings({"unchecked"})
     public EnumExpression<T> coalesce(Expression<T>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
         for (Expression<T> expr : exprs) {
@@ -95,6 +110,20 @@ public abstract class EnumExpression<T extends Enum<T>> extends LiteralExpressio
         return (EnumExpression<T>) coalesce.asEnum();
     }
 
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public EnumExpression<T> coalesce(T arg) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(arg);
+        return (EnumExpression<T>) coalesce.asEnum();
+    }
+
     /**
      * Create a {@code coalesce(this, args...)} expression
      *
@@ -102,6 +131,7 @@ public abstract class EnumExpression<T extends Enum<T>> extends LiteralExpressio
      * @return coalesce
      */
     @Override
+    @SuppressWarnings({"unchecked"})
     public EnumExpression<T> coalesce(T... args) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
         for (T arg : args) {
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberExpression.java
index 736d4cec3..c04815612 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberExpression.java
@@ -804,6 +804,20 @@ public abstract class NumberExpression<T extends Number & Comparable<?>> extends
         return nullif(ConstantImpl.create(other));
     }
 
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public NumberExpression<T> coalesce(Expression<T> expr) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(expr);
+        return (NumberExpression<T>) coalesce.asNumber();
+    }
+
     /**
      * Create a {@code coalesce(this, exprs...)} expression
      *
@@ -820,6 +834,20 @@ public abstract class NumberExpression<T extends Number & Comparable<?>> extends
         return (NumberExpression<T>) coalesce.asNumber();
     }
 
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public NumberExpression<T> coalesce(T arg) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(arg);
+        return (NumberExpression<T>) coalesce.asNumber();
+    }
+
     /**
      * Create a {@code coalesce(this, args...)} expression
      *
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpression.java
index 54b27b734..b4091dd11 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpression.java
@@ -863,6 +863,19 @@ public abstract class StringExpression extends LiteralExpression<String> {
         return nullif(ConstantImpl.create(other));
     }
 
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    public StringExpression coalesce(Expression<String> expr) {
+        Coalesce<String> coalesce = new Coalesce<String>(getType(), mixin);
+        coalesce.add(expr);
+        return coalesce.asString();
+    }
+
     /**
      * Create a {@code coalesce(this, exprs...)} expression
      *
@@ -870,6 +883,7 @@ public abstract class StringExpression extends LiteralExpression<String> {
      * @return coalesce
      */
     @Override
+    @SuppressWarnings("unchecked")
     public StringExpression coalesce(Expression<String>... exprs) {
         Coalesce<String> coalesce = new Coalesce<String>(getType(), mixin);
         for (Expression<String> expr : exprs) {
@@ -878,6 +892,19 @@ public abstract class StringExpression extends LiteralExpression<String> {
         return coalesce.asString();
     }
 
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    public StringExpression coalesce(String arg) {
+        Coalesce<String> coalesce = new Coalesce<String>(getType(), mixin);
+        coalesce.add(arg);
+        return coalesce.asString();
+    }
+
     /**
      * Create a {@code coalesce(this, args...)} expression
      *
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeExpression.java
index abc7e3804..e48d29d19 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeExpression.java
@@ -144,6 +144,19 @@ public abstract class TimeExpression<T extends Comparable> extends TemporalExpre
         return nullif(ConstantImpl.create(other));
     }
 
+    /**
+     * Create a {@code coalesce(this, expr)} expression
+     *
+     * @param expr additional argument
+     * @return coalesce
+     */
+    @Override
+    public TimeExpression<T> coalesce(Expression<T> expr) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(expr);
+        return coalesce.asTime();
+    }
+
     /**
      * Create a {@code coalesce(this, exprs...)} expression
      *
@@ -151,6 +164,7 @@ public abstract class TimeExpression<T extends Comparable> extends TemporalExpre
      * @return coalesce
      */
     @Override
+    @SuppressWarnings("unchecked")
     public TimeExpression<T> coalesce(Expression<T>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
         for (Expression<T> expr : exprs) {
@@ -159,6 +173,19 @@ public abstract class TimeExpression<T extends Comparable> extends TemporalExpre
         return coalesce.asTime();
     }
 
+    /**
+     * Create a {@code coalesce(this, arg)} expression
+     *
+     * @param arg additional argument
+     * @return coalesce
+     */
+    @Override
+    public TimeExpression<T> coalesce(T arg) {
+        Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
+        coalesce.add(arg);
+        return coalesce.asTime();
+    }
+
     /**
      * Create a {@code coalesce(this, args...)} expression
      *

From 472f20a8835152db89655076c2978261c9221250 Mon Sep 17 00:00:00 2001
From: f43nd1r <account+github@faendir.com>
Date: Mon, 7 Jun 2021 17:36:53 +0200
Subject: [PATCH 2/2] Revert "Type generic in coalesce methods"

This reverts commit 78fe927f
---
 .../com/querydsl/core/types/dsl/BooleanExpression.java    | 8 ++++----
 .../com/querydsl/core/types/dsl/ComparableExpression.java | 6 +++---
 .../querydsl/core/types/dsl/ComparableExpressionBase.java | 6 +++---
 .../java/com/querydsl/core/types/dsl/DateExpression.java  | 6 +++---
 .../com/querydsl/core/types/dsl/DateTimeExpression.java   | 6 +++---
 .../java/com/querydsl/core/types/dsl/EnumExpression.java  | 6 +++---
 .../com/querydsl/core/types/dsl/NumberExpression.java     | 6 +++---
 .../com/querydsl/core/types/dsl/StringExpression.java     | 6 +++---
 .../java/com/querydsl/core/types/dsl/TimeExpression.java  | 6 +++---
 9 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanExpression.java
index b8dae31b6..afa05af12 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanExpression.java
@@ -18,7 +18,7 @@ import org.jetbrains.annotations.Nullable;
 import com.querydsl.core.types.*;
 
 /**
- * {@code BooleanExpression} represents {@code java.lang.Boolean} expressions
+ * {@code BooleanExpression} represents {@link java.lang.Boolean} expressions
  *
  * @author tiwe
  * @see java.lang.Boolean
@@ -197,10 +197,10 @@ public abstract class BooleanExpression extends LiteralExpression<Boolean> imple
      * @return coalesce
      */
     @Override
-    @SuppressWarnings("unchecked")
-    public BooleanExpression coalesce(Expression<Boolean>... exprs) {
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public BooleanExpression coalesce(Expression<?>... exprs) {
         Coalesce<Boolean> coalesce = new Coalesce<Boolean>(getType(), mixin);
-        for (Expression<Boolean> expr : exprs) {
+        for (Expression expr : exprs) {
             coalesce.add(expr);
         }
         return coalesce.asBoolean();
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpression.java
index 258dbcbef..428683430 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpression.java
@@ -429,10 +429,10 @@ public abstract class ComparableExpression<T extends Comparable> extends Compara
      * @return coalesce
      */
     @Override
-    @SuppressWarnings("unchecked")
-    public ComparableExpression<T> coalesce(Expression<T>... exprs) {
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public ComparableExpression<T> coalesce(Expression<?>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression<T> expr : exprs) {
+        for (Expression expr : exprs) {
             coalesce.add(expr);
         }
         return coalesce.getValue();
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java
index 2a592b3bc..7830a527b 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java
@@ -70,10 +70,10 @@ public abstract class ComparableExpressionBase<T extends Comparable> extends Sim
      * @param exprs additional arguments
      * @return coalesce
      */
-    @SuppressWarnings("unchecked")
-    public ComparableExpressionBase<T> coalesce(Expression<T>...exprs) {
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public ComparableExpressionBase<T> coalesce(Expression<?>...exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression<T> expr : exprs) {
+        for (Expression expr : exprs) {
             coalesce.add(expr);
         }
         return coalesce.getValue();
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateExpression.java
index e2b112ced..3af2c237b 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateExpression.java
@@ -248,10 +248,10 @@ public abstract class DateExpression<T extends Comparable> extends TemporalExpre
      * @return coalesce
      */
     @Override
-    @SuppressWarnings("unchecked")
-    public DateExpression<T> coalesce(Expression<T>... exprs) {
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public DateExpression<T> coalesce(Expression<?>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression<T> expr : exprs) {
+        for (Expression expr : exprs) {
             coalesce.add(expr);
         }
         return coalesce.asDate();
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeExpression.java
index ec98a49e0..59c320bef 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeExpression.java
@@ -318,10 +318,10 @@ public abstract class DateTimeExpression<T extends Comparable> extends TemporalE
      * @return coalesce
      */
     @Override
-    @SuppressWarnings("unchecked")
-    public DateTimeExpression<T> coalesce(Expression<T>... exprs) {
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public DateTimeExpression<T> coalesce(Expression<?>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression<T> expr : exprs) {
+        for (Expression expr : exprs) {
             coalesce.add(expr);
         }
         return coalesce.asDateTime();
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumExpression.java
index d3a5bba5f..799c0d303 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumExpression.java
@@ -101,10 +101,10 @@ public abstract class EnumExpression<T extends Enum<T>> extends LiteralExpressio
      * @return coalesce
      */
     @Override
-    @SuppressWarnings({"unchecked"})
-    public EnumExpression<T> coalesce(Expression<T>... exprs) {
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public EnumExpression<T> coalesce(Expression<?>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression<T> expr : exprs) {
+        for (Expression expr : exprs) {
             coalesce.add(expr);
         }
         return (EnumExpression<T>) coalesce.asEnum();
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberExpression.java
index c04815612..701ad26f1 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberExpression.java
@@ -825,10 +825,10 @@ public abstract class NumberExpression<T extends Number & Comparable<?>> extends
      * @return coalesce
      */
     @Override
-    @SuppressWarnings({"unchecked"})
-    public NumberExpression<T> coalesce(Expression<T>... exprs) {
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public NumberExpression<T> coalesce(Expression<?>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression<T> expr : exprs) {
+        for (Expression expr : exprs) {
             coalesce.add(expr);
         }
         return (NumberExpression<T>) coalesce.asNumber();
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpression.java
index b4091dd11..bbb7f6d8b 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpression.java
@@ -883,10 +883,10 @@ public abstract class StringExpression extends LiteralExpression<String> {
      * @return coalesce
      */
     @Override
-    @SuppressWarnings("unchecked")
-    public StringExpression coalesce(Expression<String>... exprs) {
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public StringExpression coalesce(Expression<?>... exprs) {
         Coalesce<String> coalesce = new Coalesce<String>(getType(), mixin);
-        for (Expression<String> expr : exprs) {
+        for (Expression expr : exprs) {
             coalesce.add(expr);
         }
         return coalesce.asString();
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeExpression.java b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeExpression.java
index e48d29d19..4760c214f 100644
--- a/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeExpression.java
+++ b/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeExpression.java
@@ -164,10 +164,10 @@ public abstract class TimeExpression<T extends Comparable> extends TemporalExpre
      * @return coalesce
      */
     @Override
-    @SuppressWarnings("unchecked")
-    public TimeExpression<T> coalesce(Expression<T>... exprs) {
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    public TimeExpression<T> coalesce(Expression<?>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression<T> expr : exprs) {
+        for (Expression expr : exprs) {
             coalesce.add(expr);
         }
         return coalesce.asTime();