From 72de70ec98cae0ce1c68eb164af17e660de2062e Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 18 Sep 2020 10:44:01 +0200 Subject: [PATCH] [jOOQ/jOOQ#10638] Fix Java 6 compilation error We don't need a type witness this time, since we can just use the varargs overload instead of the Collection one --- jOOQ/src/main/java/org/jooq/impl/ParserImpl.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index a8d882c5cb..d8587f01ae 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -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); }