CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-06-30 21:08:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1138 from querydsl/i1112

Browse Source 
Improve GroupBy generics
This commit is contained in:
Ruben Dijkstra 2015-01-31 13:06:07 +01:00
commit be6e55b926
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
querydsl-core/src/main/java/com/querydsl/core/group/GAvg.java
View File

@ -24,7 +24,7 @@ import com.querydsl.core.util.MathUtils;
* @param <T>
*/
@SuppressWarnings("unchecked")
public class GAvg<T extends Number & Comparable<T>> extends AbstractGroupExpression<T, T> {
public class GAvg<T extends Number> extends AbstractGroupExpression<T, T> {
private static final long serialVersionUID = 3518868612387641383L;

2
querydsl-core/src/main/java/com/querydsl/core/group/GMax.java
View File

@ -20,7 +20,7 @@ import com.querydsl.core.types.Expression;
*
* @param <T>
*/
class GMax<T extends Comparable<T>> extends AbstractGroupExpression<T, T> {
class GMax<T extends Comparable<? super T>> extends AbstractGroupExpression<T, T> {
private static final long serialVersionUID = 3815394663181131511L;

2
querydsl-core/src/main/java/com/querydsl/core/group/GMin.java
View File

@ -20,7 +20,7 @@ import com.querydsl.core.types.Expression;
*
* @param <T>
*/
class GMin<T extends Comparable<T>> extends AbstractGroupExpression<T, T> {
class GMin<T extends Comparable<? super T>> extends AbstractGroupExpression<T, T> {
private static final long serialVersionUID = 8312168556148122576L;

2
querydsl-core/src/main/java/com/querydsl/core/group/GSum.java
View File

@ -24,7 +24,7 @@ import com.querydsl.core.util.MathUtils;
* @param <T>
*/
@SuppressWarnings("unchecked")
public class GSum<T extends Number & Comparable<T>> extends AbstractGroupExpression<T, T> {
public class GSum<T extends Number> extends AbstractGroupExpression<T, T> {
private static final long serialVersionUID = 3518868612387641383L;

8
querydsl-core/src/main/java/com/querydsl/core/group/GroupBy.java
View File

@ -57,7 +57,7 @@ public final class GroupBy {
* @param expression
* @return
*/
public static <E extends Comparable<E>> AbstractGroupExpression<E, E> min(Expression<E> expression) {
public static <E extends Comparable<? super E>> AbstractGroupExpression<E, E> min(Expression<E> expression) {
return new GMin<E>(expression);
}
@ -67,7 +67,7 @@ public final class GroupBy {
* @param expression
* @return
*/
public static <E extends Number & Comparable<E>> AbstractGroupExpression<E, E> sum(Expression<E> expression) {
public static <E extends Number> AbstractGroupExpression<E, E> sum(Expression<E> expression) {
return new GSum<E>(expression);
}
@ -77,7 +77,7 @@ public final class GroupBy {
* @param expression
* @return
*/
public static <E extends Number & Comparable<E>> AbstractGroupExpression<E, E> avg(Expression<E> expression) {
public static <E extends Number> AbstractGroupExpression<E, E> avg(Expression<E> expression) {
return new GAvg<E>(expression);
}
@ -87,7 +87,7 @@ public final class GroupBy {
* @param expression
* @return
*/
public static <E extends Comparable<E>> AbstractGroupExpression<E, E> max(Expression<E> expression) {
public static <E extends Comparable<? super E>> AbstractGroupExpression<E, E> max(Expression<E> expression) {
return new GMax<E>(expression);
}