From 78fe927fcf437876bafb1e7915c48dd56b48601d Mon Sep 17 00:00:00 2001
From: Jan-Willem Gmelig Meyling <jan-willem@youngmediaexperts.nl>
Date: Wed, 2 Jun 2021 20:33:55 +0200
Subject: [PATCH] Type generic in coalesce methods

---
 .../java/com/querydsl/core/types/dsl/BooleanExpression.java | 4 ++--
 .../com/querydsl/core/types/dsl/ComparableExpression.java   | 5 ++---
 .../querydsl/core/types/dsl/ComparableExpressionBase.java   | 5 ++---
 .../java/com/querydsl/core/types/dsl/DateExpression.java    | 4 ++--
 .../com/querydsl/core/types/dsl/DateTimeExpression.java     | 4 ++--
 .../java/com/querydsl/core/types/dsl/EnumExpression.java    | 6 ++----
 .../java/com/querydsl/core/types/dsl/NumberExpression.java  | 6 +++---
 .../java/com/querydsl/core/types/dsl/StringExpression.java  | 5 ++---
 .../java/com/querydsl/core/types/dsl/TimeExpression.java    | 5 ++---
 9 files changed, 19 insertions(+), 25 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 3cbcb4a8c..6263f8e11 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
@@ -184,9 +184,9 @@ public abstract class BooleanExpression extends LiteralExpression<Boolean> imple
      * @return coalesce
      */
     @Override
-    public BooleanExpression coalesce(Expression<?>... exprs) {
+    public BooleanExpression coalesce(Expression<Boolean>... exprs) {
         Coalesce<Boolean> coalesce = new Coalesce<Boolean>(getType(), mixin);
-        for (Expression expr : exprs) {
+        for (Expression<Boolean> 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 2677c03c6..bfa616dfb 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
@@ -416,10 +416,9 @@ public abstract class ComparableExpression<T extends Comparable> extends Compara
      * @return coalesce
      */
     @Override
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    public ComparableExpression<T> coalesce(Expression<?>... exprs) {
+    public ComparableExpression<T> coalesce(Expression<T>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression expr : exprs) {
+        for (Expression<T> 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 78e99332d..9ba0837ed 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
@@ -58,10 +58,9 @@ public abstract class ComparableExpressionBase<T extends Comparable> extends Sim
      * @param exprs additional arguments
      * @return coalesce
      */
-    @SuppressWarnings("unchecked")
-    public ComparableExpressionBase<T> coalesce(Expression<?>...exprs) {
+    public ComparableExpressionBase<T> coalesce(Expression<T>...exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression expr : exprs) {
+        for (Expression<T> 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 408f494e5..80def4bd1 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
@@ -235,9 +235,9 @@ public abstract class DateExpression<T extends Comparable> extends TemporalExpre
      * @return coalesce
      */
     @Override
-    public DateExpression<T> coalesce(Expression<?>... exprs) {
+    public DateExpression<T> coalesce(Expression<T>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression expr : exprs) {
+        for (Expression<T> 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 578014b3c..6aadff464 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
@@ -305,9 +305,9 @@ public abstract class DateTimeExpression<T extends Comparable> extends TemporalE
      * @return coalesce
      */
     @Override
-    public DateTimeExpression<T> coalesce(Expression<?>... exprs) {
+    public DateTimeExpression<T> coalesce(Expression<T>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression expr : exprs) {
+        for (Expression<T> 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 c8ed7275f..2fdd81eff 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
@@ -87,10 +87,9 @@ public abstract class EnumExpression<T extends Enum<T>> extends LiteralExpressio
      * @return coalesce
      */
     @Override
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    public EnumExpression<T> coalesce(Expression<?>... exprs) {
+    public EnumExpression<T> coalesce(Expression<T>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression expr : exprs) {
+        for (Expression<T> expr : exprs) {
             coalesce.add(expr);
         }
         return (EnumExpression<T>) coalesce.asEnum();
@@ -103,7 +102,6 @@ public abstract class EnumExpression<T extends Enum<T>> extends LiteralExpressio
      * @return coalesce
      */
     @Override
-    @SuppressWarnings({"unchecked", "rawtypes"})
     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 9e5962a28..736d4cec3 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
@@ -811,10 +811,10 @@ public abstract class NumberExpression<T extends Number & Comparable<?>> extends
      * @return coalesce
      */
     @Override
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    public NumberExpression<T> coalesce(Expression<?>... exprs) {
+    @SuppressWarnings({"unchecked"})
+    public NumberExpression<T> coalesce(Expression<T>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression expr : exprs) {
+        for (Expression<T> 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 c39f03602..54b27b734 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
@@ -870,10 +870,9 @@ public abstract class StringExpression extends LiteralExpression<String> {
      * @return coalesce
      */
     @Override
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    public StringExpression coalesce(Expression<?>... exprs) {
+    public StringExpression coalesce(Expression<String>... exprs) {
         Coalesce<String> coalesce = new Coalesce<String>(getType(), mixin);
-        for (Expression expr : exprs) {
+        for (Expression<String> 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 bc860a061..abc7e3804 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
@@ -151,10 +151,9 @@ public abstract class TimeExpression<T extends Comparable> extends TemporalExpre
      * @return coalesce
      */
     @Override
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    public TimeExpression<T> coalesce(Expression<?>... exprs) {
+    public TimeExpression<T> coalesce(Expression<T>... exprs) {
         Coalesce<T> coalesce = new Coalesce<T>(getType(), mixin);
-        for (Expression expr : exprs) {
+        for (Expression<T> expr : exprs) {
             coalesce.add(expr);
         }
         return coalesce.asTime();