From bdad1eaed23fd79adfecd9b0b8eeb9ae87c7a2da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Sun, 17 Apr 2016 16:18:21 +0300 Subject: [PATCH] Extend orderBy signature --- .../main/java/com/querydsl/sql/WindowFirstLast.java | 4 ++-- .../main/java/com/querydsl/sql/WindowFunction.java | 6 +++--- .../src/main/java/com/querydsl/sql/WithinGroup.java | 13 +++++++++++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/WindowFirstLast.java b/querydsl-sql/src/main/java/com/querydsl/sql/WindowFirstLast.java index 8082122e3..9c7fb96b5 100644 --- a/querydsl-sql/src/main/java/com/querydsl/sql/WindowFirstLast.java +++ b/querydsl-sql/src/main/java/com/querydsl/sql/WindowFirstLast.java @@ -14,7 +14,7 @@ package com.querydsl.sql; import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import javax.annotation.Nullable; @@ -80,7 +80,7 @@ public class WindowFirstLast extends MutableExpressionBase { public WindowFirstLast orderBy(OrderSpecifier... orderBy) { value = null; - this.orderBy.addAll(Arrays.asList(orderBy)); + Collections.addAll(this.orderBy, orderBy); return this; } diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/WindowFunction.java b/querydsl-sql/src/main/java/com/querydsl/sql/WindowFunction.java index b638313a9..6fe69ccd3 100644 --- a/querydsl-sql/src/main/java/com/querydsl/sql/WindowFunction.java +++ b/querydsl-sql/src/main/java/com/querydsl/sql/WindowFunction.java @@ -14,7 +14,7 @@ package com.querydsl.sql; import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import javax.annotation.Nullable; @@ -167,7 +167,7 @@ public class WindowFunction extends MutableExpressionBase { public WindowFunction orderBy(OrderSpecifier... orderBy) { value = null; - this.orderBy.addAll(Arrays.asList(orderBy)); + Collections.addAll(this.orderBy, orderBy); return this; } @@ -179,7 +179,7 @@ public class WindowFunction extends MutableExpressionBase { public WindowFunction partitionBy(Expression... partitionBy) { value = null; - this.partitionBy.addAll(Arrays.asList(partitionBy)); + Collections.addAll(this.partitionBy, partitionBy); return this; } diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/WithinGroup.java b/querydsl-sql/src/main/java/com/querydsl/sql/WithinGroup.java index 5fd90ea36..c21acdf9e 100644 --- a/querydsl-sql/src/main/java/com/querydsl/sql/WithinGroup.java +++ b/querydsl-sql/src/main/java/com/querydsl/sql/WithinGroup.java @@ -14,6 +14,7 @@ package com.querydsl.sql; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import javax.annotation.Nullable; @@ -100,6 +101,18 @@ public class WithinGroup extends SimpleOperation { } return this; } + + public OrderBy orderBy(OrderSpecifier orderBy) { + value = null; + this.orderBy.add(orderBy); + return this; + } + + public OrderBy orderBy(OrderSpecifier... orderBy) { + value = null; + Collections.addAll(this.orderBy, orderBy); + return this; + } } public WithinGroup(Class type, Operator op) {