github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#10638] Fix Java 6 compilation error

Browse Source 
We don't need a type witness this time, since we can just use the varargs overload instead of the Collection one
This commit is contained in:
Lukas Eder 2020-09-18 10:44:01 +02:00
parent 9a13287b35
commit 72de70ec98
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
View File

@ -39,8 +39,6 @@ package org.jooq.impl;
import static java.lang.Boolean.FALSE;
import static java.lang.Boolean.TRUE;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static org.jooq.Comparator.IN;
import static org.jooq.Comparator.NOT_IN;
import static org.jooq.JoinType.JOIN;
@ -1563,16 +1561,16 @@ final class ParserImpl implements Parser {
if (parseKeywordIf(ctx, "GROUP BY")) {
if (parseIf(ctx, '(')) {
parse(ctx, ')');
result.addGroupBy(emptyList());
result.addGroupBy();
}
else if (parseKeywordIf(ctx, "ROLLUP")) {
parse(ctx, '(');
result.addGroupBy(singletonList(rollup(parseFields(ctx).toArray(EMPTY_FIELD))));
result.addGroupBy(rollup(parseFields(ctx).toArray(EMPTY_FIELD)));
parse(ctx, ')');
}
else if (parseKeywordIf(ctx, "CUBE")) {
parse(ctx, '(');
result.addGroupBy(singletonList(cube(parseFields(ctx).toArray(EMPTY_FIELD))));
result.addGroupBy(cube(parseFields(ctx).toArray(EMPTY_FIELD)));
parse(ctx, ')');
}
else if (parseKeywordIf(ctx, "GROUPING SETS")) {
@ -1583,13 +1581,13 @@ final class ParserImpl implements Parser {
}
while (parseIf(ctx, ','));
parse(ctx, ')');
result.addGroupBy(singletonList(groupingSets(fieldSets.toArray((Collection[]) EMPTY_COLLECTION))));
result.addGroupBy(groupingSets(fieldSets.toArray((Collection[]) EMPTY_COLLECTION)));
}
else {
groupBy = (List) parseFields(ctx);
if (parseKeywordIf(ctx, "WITH ROLLUP"))
result.addGroupBy(singletonList(rollup(groupBy.toArray(EMPTY_FIELD))));
result.addGroupBy(rollup(groupBy.toArray(EMPTY_FIELD)));
else
result.addGroupBy(groupBy);
}