From 562ec8a06e6489b8338ed58acbcadaa93cf42c8c Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 16 Jul 2019 16:29:52 +0200 Subject: [PATCH] [jOOQ/jOOQ#8932] Use diamond operator in jOOQ code These method calls use fully qualified constructor calls, which is why they had been overlooked. --- jOOQ/src/main/java/org/jooq/impl/DSL.java | 120 +++++++++++----------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 959c54408c..e8bbc7fa72 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -11354,7 +11354,7 @@ public class DSL { @Support @PlainSQL public static Field function(String name, DataType type, Field... arguments) { - return new org.jooq.impl.Function(name, type, nullSafe(arguments)); + return new org.jooq.impl.Function<>(name, type, nullSafe(arguments)); } /** @@ -11380,7 +11380,7 @@ public class DSL { */ @Support public static Field function(Name name, DataType type, Field... arguments) { - return new org.jooq.impl.Function(name, type, nullSafe(arguments)); + return new org.jooq.impl.Function<>(name, type, nullSafe(arguments)); } /** @@ -13883,7 +13883,7 @@ public class DSL { */ @Support public static Field charLength(Field field) { - return new org.jooq.impl.Function(Term.CHAR_LENGTH, SQLDataType.INTEGER, nullSafe(field)); + return new org.jooq.impl.Function<>(Term.CHAR_LENGTH, SQLDataType.INTEGER, nullSafe(field)); } /** @@ -13903,7 +13903,7 @@ public class DSL { */ @Support public static Field bitLength(Field field) { - return new org.jooq.impl.Function(Term.BIT_LENGTH, SQLDataType.INTEGER, nullSafe(field)); + return new org.jooq.impl.Function<>(Term.BIT_LENGTH, SQLDataType.INTEGER, nullSafe(field)); } /** @@ -13923,7 +13923,7 @@ public class DSL { */ @Support public static Field octetLength(Field field) { - return new org.jooq.impl.Function(Term.OCTET_LENGTH, SQLDataType.INTEGER, nullSafe(field)); + return new org.jooq.impl.Function<>(Term.OCTET_LENGTH, SQLDataType.INTEGER, nullSafe(field)); } // ------------------------------------------------------------------------ @@ -16326,7 +16326,7 @@ public class DSL { for (int i = 0; i < fieldSets.length; i++) array[i] = new WrappedList(new QueryPartList<>(fieldSets[i])); - return new org.jooq.impl.Function("grouping sets", SQLDataType.OTHER, array); + return new org.jooq.impl.Function<>("grouping sets", SQLDataType.OTHER, array); } @@ -17391,7 +17391,7 @@ public class DSL { */ @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static Field atan2(Field x, Field y) { - return new org.jooq.impl.Function(Term.ATAN2, SQLDataType.NUMERIC, nullSafe(x), nullSafe(y)); + return new org.jooq.impl.Function<>(Term.ATAN2, SQLDataType.NUMERIC, nullSafe(x), nullSafe(y)); } /** @@ -17784,7 +17784,7 @@ public class DSL { */ @Support public static AggregateFunction count(Field field) { - return new org.jooq.impl.Function("count", SQLDataType.INTEGER, nullSafe(field)); + return new org.jooq.impl.Function<>("count", SQLDataType.INTEGER, nullSafe(field)); } /** @@ -17792,7 +17792,7 @@ public class DSL { */ @Support public static AggregateFunction count(SelectFieldOrAsterisk field) { - return new org.jooq.impl.Function("count", SQLDataType.INTEGER, field("{0}", field)); + return new org.jooq.impl.Function<>("count", SQLDataType.INTEGER, field("{0}", field)); } /** @@ -17812,7 +17812,7 @@ public class DSL { */ @Support public static AggregateFunction countDistinct(Field field) { - return new org.jooq.impl.Function("count", true, SQLDataType.INTEGER, nullSafe(field)); + return new org.jooq.impl.Function<>("count", true, SQLDataType.INTEGER, nullSafe(field)); } /** @@ -17820,7 +17820,7 @@ public class DSL { */ @Support public static AggregateFunction countDistinct(SelectFieldOrAsterisk field) { - return new org.jooq.impl.Function("count", true, SQLDataType.INTEGER, field("{0}", field)); + return new org.jooq.impl.Function<>("count", true, SQLDataType.INTEGER, field("{0}", field)); } /** @@ -17846,7 +17846,7 @@ public class DSL { */ @Support({ HSQLDB, MYSQL, POSTGRES }) public static AggregateFunction countDistinct(Field... fields) { - return new org.jooq.impl.Function("count", true, SQLDataType.INTEGER, nullSafe(fields)); + return new org.jooq.impl.Function<>("count", true, SQLDataType.INTEGER, nullSafe(fields)); } /** @@ -17906,7 +17906,7 @@ public class DSL { */ @Support({ HSQLDB, POSTGRES }) public static ArrayAggOrderByStep arrayAgg(Field field) { - return new org.jooq.impl.Function(Term.ARRAY_AGG, field.getDataType().getArrayDataType(), nullSafe(field)); + return new org.jooq.impl.Function<>(Term.ARRAY_AGG, field.getDataType().getArrayDataType(), nullSafe(field)); } /** @@ -17914,7 +17914,7 @@ public class DSL { */ @Support({ HSQLDB, POSTGRES }) public static ArrayAggOrderByStep arrayAggDistinct(Field field) { - return new org.jooq.impl.Function(Term.ARRAY_AGG, true, field.getDataType().getArrayDataType(), nullSafe(field)); + return new org.jooq.impl.Function<>(Term.ARRAY_AGG, true, field.getDataType().getArrayDataType(), nullSafe(field)); } @@ -18066,7 +18066,7 @@ public class DSL { */ @Support public static AggregateFunction max(Field field) { - return new org.jooq.impl.Function("max", nullSafeDataType(field), nullSafe(field)); + return new org.jooq.impl.Function<>("max", nullSafeDataType(field), nullSafe(field)); } /** @@ -18074,7 +18074,7 @@ public class DSL { */ @Support public static AggregateFunction maxDistinct(Field field) { - return new org.jooq.impl.Function("max", true, nullSafeDataType(field), nullSafe(field)); + return new org.jooq.impl.Function<>("max", true, nullSafeDataType(field), nullSafe(field)); } /** @@ -18082,7 +18082,7 @@ public class DSL { */ @Support public static AggregateFunction min(Field field) { - return new org.jooq.impl.Function("min", nullSafeDataType(field), nullSafe(field)); + return new org.jooq.impl.Function<>("min", nullSafeDataType(field), nullSafe(field)); } /** @@ -18090,7 +18090,7 @@ public class DSL { */ @Support public static AggregateFunction minDistinct(Field field) { - return new org.jooq.impl.Function("min", true, nullSafeDataType(field), nullSafe(field)); + return new org.jooq.impl.Function<>("min", true, nullSafeDataType(field), nullSafe(field)); } /** @@ -18098,7 +18098,7 @@ public class DSL { */ @Support public static AggregateFunction sum(Field field) { - return new org.jooq.impl.Function("sum", SQLDataType.NUMERIC, nullSafe(field)); + return new org.jooq.impl.Function<>("sum", SQLDataType.NUMERIC, nullSafe(field)); } /** @@ -18106,7 +18106,7 @@ public class DSL { */ @Support public static AggregateFunction sumDistinct(Field field) { - return new org.jooq.impl.Function("sum", true, SQLDataType.NUMERIC, nullSafe(field)); + return new org.jooq.impl.Function<>("sum", true, SQLDataType.NUMERIC, nullSafe(field)); } /** @@ -18124,7 +18124,7 @@ public class DSL { */ @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static AggregateFunction product(Field field) { - return new org.jooq.impl.Function(Term.PRODUCT, SQLDataType.NUMERIC, nullSafe(field)); + return new org.jooq.impl.Function<>(Term.PRODUCT, SQLDataType.NUMERIC, nullSafe(field)); } /** @@ -18142,7 +18142,7 @@ public class DSL { */ @Support({ CUBRID, DERBY, FIREBIRD, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static AggregateFunction productDistinct(Field field) { - return new org.jooq.impl.Function(Term.PRODUCT, true, SQLDataType.NUMERIC, nullSafe(field)); + return new org.jooq.impl.Function<>(Term.PRODUCT, true, SQLDataType.NUMERIC, nullSafe(field)); } /** @@ -18150,7 +18150,7 @@ public class DSL { */ @Support public static AggregateFunction avg(Field field) { - return new org.jooq.impl.Function("avg", SQLDataType.NUMERIC, nullSafe(field)); + return new org.jooq.impl.Function<>("avg", SQLDataType.NUMERIC, nullSafe(field)); } /** @@ -18158,7 +18158,7 @@ public class DSL { */ @Support public static AggregateFunction avgDistinct(Field field) { - return new org.jooq.impl.Function("avg", true, SQLDataType.NUMERIC, nullSafe(field)); + return new org.jooq.impl.Function<>("avg", true, SQLDataType.NUMERIC, nullSafe(field)); } /** @@ -18166,7 +18166,7 @@ public class DSL { */ @Support({ H2, POSTGRES }) public static AggregateFunction mode(Field field) { - return new org.jooq.impl.Function(Term.MODE, nullSafeDataType(field), field); + return new org.jooq.impl.Function<>(Term.MODE, nullSafeDataType(field), field); } /** @@ -18174,7 +18174,7 @@ public class DSL { */ @Support({ CUBRID, H2, HSQLDB, MARIADB, POSTGRES }) public static AggregateFunction median(Field field) { - return new org.jooq.impl.Function(Term.MEDIAN, SQLDataType.NUMERIC, nullSafe(field)); + return new org.jooq.impl.Function<>(Term.MEDIAN, SQLDataType.NUMERIC, nullSafe(field)); } /** @@ -18182,7 +18182,7 @@ public class DSL { */ @Support({ CUBRID, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static AggregateFunction stddevPop(Field field) { - return new org.jooq.impl.Function(Term.STDDEV_POP, SQLDataType.NUMERIC, nullSafe(field)); + return new org.jooq.impl.Function<>(Term.STDDEV_POP, SQLDataType.NUMERIC, nullSafe(field)); } /** @@ -18190,7 +18190,7 @@ public class DSL { */ @Support({ CUBRID, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static AggregateFunction stddevSamp(Field field) { - return new org.jooq.impl.Function(Term.STDDEV_SAMP, SQLDataType.NUMERIC, nullSafe(field)); + return new org.jooq.impl.Function<>(Term.STDDEV_SAMP, SQLDataType.NUMERIC, nullSafe(field)); } /** @@ -18198,7 +18198,7 @@ public class DSL { */ @Support({ CUBRID, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static AggregateFunction varPop(Field field) { - return new org.jooq.impl.Function(Term.VAR_POP, SQLDataType.NUMERIC, nullSafe(field)); + return new org.jooq.impl.Function<>(Term.VAR_POP, SQLDataType.NUMERIC, nullSafe(field)); } /** @@ -18206,7 +18206,7 @@ public class DSL { */ @Support({ CUBRID, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static AggregateFunction varSamp(Field field) { - return new org.jooq.impl.Function(Term.VAR_SAMP, SQLDataType.NUMERIC, nullSafe(field)); + return new org.jooq.impl.Function<>(Term.VAR_SAMP, SQLDataType.NUMERIC, nullSafe(field)); } /** @@ -18221,7 +18221,7 @@ public class DSL { */ @Support({ POSTGRES }) public static AggregateFunction regrSlope(Field y, Field x) { - return new org.jooq.impl.Function("regr_slope", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); + return new org.jooq.impl.Function<>("regr_slope", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); } /** @@ -18236,7 +18236,7 @@ public class DSL { */ @Support({ POSTGRES }) public static AggregateFunction regrIntercept(Field y, Field x) { - return new org.jooq.impl.Function("regr_intercept", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); + return new org.jooq.impl.Function<>("regr_intercept", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); } /** @@ -18251,7 +18251,7 @@ public class DSL { */ @Support({ POSTGRES }) public static AggregateFunction regrCount(Field y, Field x) { - return new org.jooq.impl.Function("regr_count", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); + return new org.jooq.impl.Function<>("regr_count", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); } /** @@ -18266,7 +18266,7 @@ public class DSL { */ @Support({ POSTGRES }) public static AggregateFunction regrR2(Field y, Field x) { - return new org.jooq.impl.Function("regr_r2", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); + return new org.jooq.impl.Function<>("regr_r2", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); } /** @@ -18281,7 +18281,7 @@ public class DSL { */ @Support({ POSTGRES }) public static AggregateFunction regrAvgX(Field y, Field x) { - return new org.jooq.impl.Function("regr_avgx", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); + return new org.jooq.impl.Function<>("regr_avgx", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); } /** @@ -18296,7 +18296,7 @@ public class DSL { */ @Support({ POSTGRES }) public static AggregateFunction regrAvgY(Field y, Field x) { - return new org.jooq.impl.Function("regr_avgy", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); + return new org.jooq.impl.Function<>("regr_avgy", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); } /** @@ -18311,7 +18311,7 @@ public class DSL { */ @Support({ POSTGRES }) public static AggregateFunction regrSXX(Field y, Field x) { - return new org.jooq.impl.Function("regr_sxx", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); + return new org.jooq.impl.Function<>("regr_sxx", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); } /** @@ -18326,7 +18326,7 @@ public class DSL { */ @Support({ POSTGRES }) public static AggregateFunction regrSYY(Field y, Field x) { - return new org.jooq.impl.Function("regr_syy", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); + return new org.jooq.impl.Function<>("regr_syy", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); } /** @@ -18341,7 +18341,7 @@ public class DSL { */ @Support({ POSTGRES }) public static AggregateFunction regrSXY(Field y, Field x) { - return new org.jooq.impl.Function("regr_sxy", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); + return new org.jooq.impl.Function<>("regr_sxy", SQLDataType.NUMERIC, nullSafe(y), nullSafe(x)); } /** @@ -18364,7 +18364,7 @@ public class DSL { */ @Support({ CUBRID, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static OrderedAggregateFunction listAgg(Field field) { - return new org.jooq.impl.Function(Term.LIST_AGG, SQLDataType.VARCHAR, nullSafe(field)); + return new org.jooq.impl.Function<>(Term.LIST_AGG, SQLDataType.VARCHAR, nullSafe(field)); } /** @@ -18387,7 +18387,7 @@ public class DSL { */ @Support({ CUBRID, H2, HSQLDB, MARIADB, MYSQL, POSTGRES }) public static OrderedAggregateFunction listAgg(Field field, String separator) { - return new org.jooq.impl.Function(Term.LIST_AGG, SQLDataType.VARCHAR, nullSafe(field), inline(separator)); + return new org.jooq.impl.Function<>(Term.LIST_AGG, SQLDataType.VARCHAR, nullSafe(field), inline(separator)); } /** @@ -18495,7 +18495,7 @@ public class DSL { */ @Support({ H2, POSTGRES }) public static OrderedAggregateFunction rank(Field... fields) { - return new org.jooq.impl.Function("rank", SQLDataType.INTEGER, fields); + return new org.jooq.impl.Function<>("rank", SQLDataType.INTEGER, fields); } /** @@ -18504,7 +18504,7 @@ public class DSL { */ @Support({ H2, POSTGRES }) public static OrderedAggregateFunction rank(Collection> fields) { - return new org.jooq.impl.Function("rank", SQLDataType.INTEGER, fields.toArray(EMPTY_QUERYPART)); + return new org.jooq.impl.Function<>("rank", SQLDataType.INTEGER, fields.toArray(EMPTY_QUERYPART)); } /** @@ -18513,7 +18513,7 @@ public class DSL { */ @Support({ H2, POSTGRES }) public static OrderedAggregateFunction denseRank(Field... fields) { - return new org.jooq.impl.Function("dense_rank", SQLDataType.INTEGER, fields); + return new org.jooq.impl.Function<>("dense_rank", SQLDataType.INTEGER, fields); } /** @@ -18522,7 +18522,7 @@ public class DSL { */ @Support({ H2, POSTGRES }) public static OrderedAggregateFunction denseRank(Collection> fields) { - return new org.jooq.impl.Function("dense_rank", SQLDataType.INTEGER, fields.toArray(EMPTY_QUERYPART)); + return new org.jooq.impl.Function<>("dense_rank", SQLDataType.INTEGER, fields.toArray(EMPTY_QUERYPART)); } /** @@ -18531,7 +18531,7 @@ public class DSL { */ @Support({ H2, POSTGRES }) public static OrderedAggregateFunction percentRank(Field... fields) { - return new org.jooq.impl.Function("percent_rank", SQLDataType.INTEGER, fields); + return new org.jooq.impl.Function<>("percent_rank", SQLDataType.INTEGER, fields); } /** @@ -18540,7 +18540,7 @@ public class DSL { */ @Support({ H2, POSTGRES }) public static OrderedAggregateFunction percentRank(Collection> fields) { - return new org.jooq.impl.Function("percent_rank", SQLDataType.INTEGER, fields.toArray(EMPTY_QUERYPART)); + return new org.jooq.impl.Function<>("percent_rank", SQLDataType.INTEGER, fields.toArray(EMPTY_QUERYPART)); } /** @@ -18549,7 +18549,7 @@ public class DSL { */ @Support({ H2, POSTGRES }) public static OrderedAggregateFunction cumeDist(Field... fields) { - return new org.jooq.impl.Function("cume_dist", SQLDataType.NUMERIC, fields); + return new org.jooq.impl.Function<>("cume_dist", SQLDataType.NUMERIC, fields); } /** @@ -18558,7 +18558,7 @@ public class DSL { */ @Support({ H2, POSTGRES }) public static OrderedAggregateFunction cumeDist(Collection> fields) { - return new org.jooq.impl.Function("cume_dist", SQLDataType.NUMERIC, fields.toArray(EMPTY_QUERYPART)); + return new org.jooq.impl.Function<>("cume_dist", SQLDataType.NUMERIC, fields.toArray(EMPTY_QUERYPART)); } /** @@ -18586,7 +18586,7 @@ public class DSL { */ @Support({ H2, POSTGRES }) public static OrderedAggregateFunction percentileCont(Field field) { - return new org.jooq.impl.Function("percentile_cont", SQLDataType.NUMERIC, nullSafe(field)); + return new org.jooq.impl.Function<>("percentile_cont", SQLDataType.NUMERIC, nullSafe(field)); } /** @@ -18614,7 +18614,7 @@ public class DSL { */ @Support({ H2, POSTGRES }) public static OrderedAggregateFunction percentileDisc(Field field) { - return new org.jooq.impl.Function("percentile_disc", SQLDataType.NUMERIC, nullSafe(field)); + return new org.jooq.impl.Function<>("percentile_disc", SQLDataType.NUMERIC, nullSafe(field)); } // ------------------------------------------------------------------------- @@ -18916,7 +18916,7 @@ public class DSL { */ @Support public static WindowOverStep rowNumber() { - return new org.jooq.impl.Function(ROW_NUMBER, SQLDataType.INTEGER); + return new org.jooq.impl.Function<>(ROW_NUMBER, SQLDataType.INTEGER); } /** @@ -18924,7 +18924,7 @@ public class DSL { */ @Support({ CUBRID, FIREBIRD, H2, MARIADB, MYSQL, POSTGRES, SQLITE }) public static WindowOverStep rank() { - return new org.jooq.impl.Function(RANK, SQLDataType.INTEGER); + return new org.jooq.impl.Function<>(RANK, SQLDataType.INTEGER); } /** @@ -18932,7 +18932,7 @@ public class DSL { */ @Support({ CUBRID, FIREBIRD, H2, MARIADB, MYSQL, POSTGRES, SQLITE }) public static WindowOverStep denseRank() { - return new org.jooq.impl.Function(DENSE_RANK, SQLDataType.INTEGER); + return new org.jooq.impl.Function<>(DENSE_RANK, SQLDataType.INTEGER); } /** @@ -18940,7 +18940,7 @@ public class DSL { */ @Support({ CUBRID, H2, MARIADB, MYSQL, POSTGRES, SQLITE }) public static WindowOverStep percentRank() { - return new org.jooq.impl.Function(PERCENT_RANK, SQLDataType.NUMERIC); + return new org.jooq.impl.Function<>(PERCENT_RANK, SQLDataType.NUMERIC); } /** @@ -18948,7 +18948,7 @@ public class DSL { */ @Support({ CUBRID, H2, MARIADB, MYSQL, POSTGRES, SQLITE }) public static WindowOverStep cumeDist() { - return new org.jooq.impl.Function(CUME_DIST, SQLDataType.NUMERIC); + return new org.jooq.impl.Function<>(CUME_DIST, SQLDataType.NUMERIC); } /** @@ -18956,7 +18956,7 @@ public class DSL { */ @Support({ CUBRID, H2, MARIADB, MYSQL, POSTGRES, SQLITE }) public static WindowOverStep ntile(int number) { - return new org.jooq.impl.Function(NTILE, SQLDataType.INTEGER, inline(number)); + return new org.jooq.impl.Function<>(NTILE, SQLDataType.INTEGER, inline(number)); } /** @@ -18980,7 +18980,7 @@ public class DSL { */ @Support({ CUBRID, FIREBIRD, H2, MARIADB, MYSQL, POSTGRES, SQLITE }) public static WindowIgnoreNullsStep firstValue(Field field) { - return new org.jooq.impl.Function(FIRST_VALUE, nullSafeDataType(field), nullSafe(field)); + return new org.jooq.impl.Function<>(FIRST_VALUE, nullSafeDataType(field), nullSafe(field)); } /** @@ -18988,7 +18988,7 @@ public class DSL { */ @Support({ CUBRID, FIREBIRD, H2, MARIADB, MYSQL, POSTGRES, SQLITE }) public static WindowIgnoreNullsStep lastValue(Field field) { - return new org.jooq.impl.Function(LAST_VALUE, nullSafeDataType(field), nullSafe(field)); + return new org.jooq.impl.Function<>(LAST_VALUE, nullSafeDataType(field), nullSafe(field)); } /** @@ -19004,7 +19004,7 @@ public class DSL { */ @Support({ FIREBIRD, H2, MARIADB, MYSQL, POSTGRES, SQLITE }) public static WindowFromFirstLastStep nthValue(Field field, Field nth) { - return new org.jooq.impl.Function(NTH_VALUE, nullSafeDataType(field), nullSafe(field), nullSafe(nth)); + return new org.jooq.impl.Function<>(NTH_VALUE, nullSafeDataType(field), nullSafe(field), nullSafe(nth)); } /**