Fix coalesce - requires exact type issue #683 (#684)

* Fix coalesce - requires exact type issue #683 * Fix coalesce - requires exact type issue #683 --------- Co-authored-by: kkrzywanski <[email protected]>
OpenFeign · Nov 25, 2024 · 7f97f77 · 7f97f77
1 parent 9d0de8c
commit 7f97f77
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/...-libraries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanExpression.java b/...-libraries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/BooleanExpression.java
@@ -199,7 +199,7 @@ public BooleanExpression coalesce(Expression<Boolean> expr) {
    */
   @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
-  public BooleanExpression coalesce(Expression<?>... exprs) {
+  public BooleanExpression coalesce(Expression<Boolean>... exprs) {
     var coalesce = new Coalesce<>(getType(), mixin);
     for (Expression expr : exprs) {
       coalesce.add(expr);

diff --git a/...braries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpression.java b/...braries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpression.java
@@ -436,7 +436,7 @@ public ComparableExpression<T> coalesce(Expression<T> expr) {
    */
   @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
-  public ComparableExpression<T> coalesce(Expression<?>... exprs) {
+  public ComparableExpression<T> coalesce(Expression<T>... exprs) {
     var coalesce = new Coalesce<>(getType(), mixin);
     for (Expression expr : exprs) {
       coalesce.add(expr);

diff --git a/...ies/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java b/...ies/querydsl-core/src/main/java/com/querydsl/core/types/dsl/ComparableExpressionBase.java
@@ -68,7 +68,7 @@ public ComparableExpressionBase<T> coalesce(Expression<T> expr) {
    * @return coalesce
    */
   @SuppressWarnings({"unchecked", "rawtypes"})
-  public ComparableExpressionBase<T> coalesce(Expression<?>... exprs) {
+  public ComparableExpressionBase<T> coalesce(Expression<T>... exprs) {
     var coalesce = new Coalesce<>(getType(), mixin);
     for (Expression expr : exprs) {
       coalesce.add(expr);

diff --git a/...dsl-libraries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateExpression.java b/...dsl-libraries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateExpression.java
@@ -244,7 +244,7 @@ public DateExpression<T> coalesce(Expression<T> expr) {
    */
   @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
-  public DateExpression<T> coalesce(Expression<?>... exprs) {
+  public DateExpression<T> coalesce(Expression<T>... exprs) {
     var coalesce = new Coalesce<>(getType(), mixin);
     for (Expression expr : exprs) {
       coalesce.add(expr);

diff --git a/...libraries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeExpression.java b/...libraries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/DateTimeExpression.java
@@ -311,7 +311,7 @@ public DateTimeExpression<T> coalesce(Expression<T> expr) {
    */
   @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
-  public DateTimeExpression<T> coalesce(Expression<?>... exprs) {
+  public DateTimeExpression<T> coalesce(Expression<T>... exprs) {
     var coalesce = new Coalesce<>(getType(), mixin);
     for (Expression expr : exprs) {
       coalesce.add(expr);

diff --git a/...dsl-libraries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumExpression.java b/...dsl-libraries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/EnumExpression.java
@@ -101,7 +101,7 @@ public EnumExpression<T> coalesce(Expression<T> expr) {
    */
   @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
-  public EnumExpression<T> coalesce(Expression<?>... exprs) {
+  public EnumExpression<T> coalesce(Expression<T>... exprs) {
     var coalesce = new Coalesce<>(getType(), mixin);
     for (Expression expr : exprs) {
       coalesce.add(expr);

diff --git a/...l-libraries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberExpression.java b/...l-libraries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/NumberExpression.java
@@ -873,7 +873,7 @@ public NumberExpression<T> coalesce(Expression<T> expr) {
    */
   @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
-  public NumberExpression<T> coalesce(Expression<?>... exprs) {
+  public NumberExpression<T> coalesce(Expression<T>... exprs) {
     var coalesce = new Coalesce<>(getType(), mixin);
     for (Expression expr : exprs) {
       coalesce.add(expr);

diff --git a/...l-libraries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpression.java b/...l-libraries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/StringExpression.java
@@ -894,7 +894,7 @@ public StringExpression coalesce(Expression<String> expr) {
    */
   @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
-  public StringExpression coalesce(Expression<?>... exprs) {
+  public StringExpression coalesce(Expression<String>... exprs) {
     var coalesce = new Coalesce<>(getType(), mixin);
     for (Expression expr : exprs) {
       coalesce.add(expr);

diff --git a/...dsl-libraries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeExpression.java b/...dsl-libraries/querydsl-core/src/main/java/com/querydsl/core/types/dsl/TimeExpression.java
@@ -163,7 +163,7 @@ public TimeExpression<T> coalesce(Expression<T> expr) {
    */
   @Override
   @SuppressWarnings({"unchecked", "rawtypes"})
-  public TimeExpression<T> coalesce(Expression<?>... exprs) {
+  public TimeExpression<T> coalesce(Expression<T>... exprs) {
     var coalesce = new Coalesce<>(getType(), mixin);
     for (Expression expr : exprs) {
       coalesce.add(expr);

diff --git a/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/types/ExpressivityTest.java b/querydsl-libraries/querydsl-core/src/test/java/com/querydsl/core/types/ExpressivityTest.java
@@ -90,7 +90,7 @@ public void test() {
     // Field<T>               coalesce(Field<T> option, Field<?>... options)
     str.coalesce(str);
     // Field<T>               coalesce(T option, T... options)
-
+    str.coalesce(str, str);
     // Field<String>          concat(Field<?>... fields)
     str.concat(str);
     // Field<String>          concat(String... values)