From f3ff999494d6caacb3b76586c270ad69b2294de6 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Wed, 18 Mar 2020 13:33:31 +0100 Subject: [PATCH] Whitespace change --- .../java/org/jooq/codegen/JavaGenerator.java | 2 - .../java/org/jooq/meta/AbstractDatabase.java | 2 - jOOQ/src/main/java/org/jooq/FilePattern.java | 2 - .../java/org/jooq/impl/AbstractField.java | 10 ---- .../main/java/org/jooq/impl/AbstractKeys.java | 8 --- .../main/java/org/jooq/impl/BatchSingle.java | 2 - .../java/org/jooq/impl/CreateTypeImpl.java | 2 - jOOQ/src/main/java/org/jooq/impl/DSL.java | 56 ------------------- jOOQ/src/main/java/org/jooq/impl/F.java | 6 -- .../src/main/java/org/jooq/impl/Internal.java | 8 --- .../java/org/jooq/impl/ReferenceImpl.java | 4 -- .../main/java/org/jooq/impl/ScopeStack.java | 2 - jOOQ/src/main/java/org/jooq/impl/Tools.java | 10 ---- .../main/java/org/jooq/tools/StringUtils.java | 2 - 14 files changed, 116 deletions(-) diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java index bc62443673..7b942b86ef 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java @@ -6726,9 +6726,7 @@ public class JavaGenerator extends AbstractGenerator { return getJavaType(type1).equals(getJavaType(type2)); } - @SafeVarargs - private static final List list(T... objects) { List result = new ArrayList<>(); diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java index 9a373220d0..edde728c9e 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java @@ -2535,9 +2535,7 @@ public abstract class AbstractDatabase implements Database { return type; } - @FunctionalInterface - private interface ExceptionRunnable { void run() throws Exception; } diff --git a/jOOQ/src/main/java/org/jooq/FilePattern.java b/jOOQ/src/main/java/org/jooq/FilePattern.java index 958b08db76..4898accef5 100644 --- a/jOOQ/src/main/java/org/jooq/FilePattern.java +++ b/jOOQ/src/main/java/org/jooq/FilePattern.java @@ -310,9 +310,7 @@ public final class FilePattern { /** * A callback interface that allows for loading a {@link Source}. */ - @FunctionalInterface - public interface Loader { void load(Source source); } diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java index f30ecafbfa..3146e2978e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java @@ -280,9 +280,7 @@ abstract class AbstractField extends AbstractTypedNamed implements Field sortAsc(T... sortList) { return sortAsc(Arrays.asList(sortList)); } @@ -299,9 +297,7 @@ abstract class AbstractField extends AbstractTypedNamed implements Field sortDesc(T... sortList) { return sortDesc(Arrays.asList(sortList)); } @@ -2007,9 +2003,7 @@ abstract class AbstractField extends AbstractTypedNamed implements Field greatest(T... others) { return DSL.greatest(this, Tools.fields(others).toArray(EMPTY_FIELD)); } @@ -2022,9 +2016,7 @@ abstract class AbstractField extends AbstractTypedNamed implements Field least(T... others) { return DSL.least(this, Tools.fields(others).toArray(EMPTY_FIELD)); } @@ -2109,9 +2101,7 @@ abstract class AbstractField extends AbstractTypedNamed implements Field coalesce(T option, T... options) { return DSL.coalesce(this, Tools.combine(Tools.field(option, this), Tools.fields(options, this).toArray(EMPTY_FIELD))); } diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java b/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java index 4780df8cf4..aa414f8316 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractKeys.java @@ -84,9 +84,7 @@ public abstract class AbstractKeys { * @deprecated - [#6875] [#7158] - 3.11.0 - Please re-generate your code */ @Deprecated - @SafeVarargs - public static UniqueKey createUniqueKey(Table table, TableField... fields) { return Internal.createUniqueKey(table, fields); } @@ -97,9 +95,7 @@ public abstract class AbstractKeys { * @deprecated - [#6875] [#7158] - 3.11.0 - Please re-generate your code */ @Deprecated - @SafeVarargs - public static UniqueKey createUniqueKey(Table table, String name, TableField... fields) { return Internal.createUniqueKey(table, name, fields); } @@ -110,9 +106,7 @@ public abstract class AbstractKeys { * @deprecated - [#6875] [#7158] - 3.11.0 - Please re-generate your code */ @Deprecated - @SafeVarargs - public static ForeignKey createForeignKey(UniqueKey key, Table table, TableField... fields) { return Internal.createForeignKey(key, table, fields); } @@ -123,9 +117,7 @@ public abstract class AbstractKeys { * @deprecated - [#6875] [#7158] - 3.11.0 - Please re-generate your code */ @Deprecated - @SafeVarargs - public static ForeignKey createForeignKey(UniqueKey key, Table table, String name, TableField... fields) { return Internal.createForeignKey(key, table, name, fields); } diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java index 1f065e16cf..79dd6f7204 100644 --- a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java +++ b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java @@ -125,9 +125,7 @@ final class BatchSingle extends AbstractBatch implements BatchBindStep { } @Override - @SafeVarargs - public final BatchSingle bind(Map... namedBindValues) { List defaultValues = dsl.extractBindValues(query); diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java index 32f8cb07e4..8f076d0c68 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateTypeImpl.java @@ -88,9 +88,7 @@ final class CreateTypeImpl extends AbstractRowCountQuery implements return asEnum(Tools.inline(v)); } - @SafeVarargs - @Override public final CreateTypeFinalStep asEnum(Field... v) { return asEnum(Arrays.asList(v)); diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java index 7b4ba92973..bfe5089a7a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DSL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java @@ -8329,9 +8329,7 @@ public class DSL { * @see Field#like(QuantifiedSelect) */ @Support - @SafeVarargs - public static QuantifiedSelect> all(Field... fields) { return new QuantifiedSelectImpl<>(Quantifier.ALL, fields); } @@ -8411,9 +8409,7 @@ public class DSL { * @see Field#like(QuantifiedSelect) */ @Support - @SafeVarargs - public static QuantifiedSelect> any(Field... fields) { return new QuantifiedSelectImpl<>(Quantifier.ANY, fields); } @@ -12513,9 +12509,7 @@ public class DSL { * The T-SQL CHOOSE() function. */ @Support - @SafeVarargs - public static Field choose(int index, Field... values) { return choose(val(index), values); } @@ -12532,9 +12526,7 @@ public class DSL { * The T-SQL CHOOSE() function. */ @Support - @SafeVarargs - public static Field choose(Field index, Field... values) { return new Choose<>(index, values); } @@ -18120,9 +18112,7 @@ public class DSL { * The XML concat function. */ @Support({ POSTGRES }) - @SafeVarargs - public static Field xmlconcat(Field... fields) { return xmlconcat(asList(fields)); } @@ -18559,9 +18549,7 @@ public class DSL { * * */ - @SafeVarargs - @Support({ H2, HSQLDB, POSTGRES }) public static Field array(Field... fields) { return array(Arrays.asList(fields)); @@ -22229,9 +22217,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row1... rows) { return new Values>(rows).as("v", "c1"); @@ -22263,9 +22249,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row2... rows) { return new Values>(rows).as("v", "c1", "c2"); @@ -22297,9 +22281,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row3... rows) { return new Values>(rows).as("v", "c1", "c2", "c3"); @@ -22331,9 +22313,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row4... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4"); @@ -22365,9 +22345,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row5... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5"); @@ -22399,9 +22377,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row6... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6"); @@ -22433,9 +22409,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row7... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7"); @@ -22467,9 +22441,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row8... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8"); @@ -22501,9 +22473,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row9... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9"); @@ -22535,9 +22505,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row10... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10"); @@ -22569,9 +22537,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row11... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11"); @@ -22603,9 +22569,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row12... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12"); @@ -22637,9 +22601,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row13... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13"); @@ -22671,9 +22633,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row14... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13", "c14"); @@ -22705,9 +22665,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row15... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13", "c14", "c15"); @@ -22739,9 +22697,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row16... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13", "c14", "c15", "c16"); @@ -22773,9 +22729,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row17... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13", "c14", "c15", "c16", "c17"); @@ -22807,9 +22761,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row18... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13", "c14", "c15", "c16", "c17", "c18"); @@ -22841,9 +22793,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row19... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13", "c14", "c15", "c16", "c17", "c18", "c19"); @@ -22875,9 +22825,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row20... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13", "c14", "c15", "c16", "c17", "c18", "c19", "c20"); @@ -22909,9 +22857,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row21... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13", "c14", "c15", "c16", "c17", "c18", "c19", "c20", "c21"); @@ -22943,9 +22889,7 @@ public class DSL { * Use {@link Table#as(String, String...)} to rename the resulting table and * its columns. */ - @SafeVarargs - @Support public static Table> values(Row22... rows) { return new Values>(rows).as("v", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10", "c11", "c12", "c13", "c14", "c15", "c16", "c17", "c18", "c19", "c20", "c21", "c22"); diff --git a/jOOQ/src/main/java/org/jooq/impl/F.java b/jOOQ/src/main/java/org/jooq/impl/F.java index 5bcf05e06d..9c080f281d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/F.java +++ b/jOOQ/src/main/java/org/jooq/impl/F.java @@ -37,23 +37,17 @@ */ package org.jooq.impl; - @FunctionalInterface - interface F0 { R apply(); } - @FunctionalInterface - interface F1 { R apply(T1 t1); } - @FunctionalInterface - interface F2 { R apply(T1 t1, T2 t2); } diff --git a/jOOQ/src/main/java/org/jooq/impl/Internal.java b/jOOQ/src/main/java/org/jooq/impl/Internal.java index 3b22a4165e..9ba495f413 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Internal.java +++ b/jOOQ/src/main/java/org/jooq/impl/Internal.java @@ -101,9 +101,7 @@ public final class Internal { /** * Factory method for unique keys. */ - @SafeVarargs - public static final UniqueKey createUniqueKey(Table table, TableField... fields) { return createUniqueKey(table, null, fields, true); } @@ -111,9 +109,7 @@ public final class Internal { /** * Factory method for unique keys. */ - @SafeVarargs - public static final UniqueKey createUniqueKey(Table table, String name, TableField... fields) { return createUniqueKey(table, name, fields, true); } @@ -128,9 +124,7 @@ public final class Internal { /** * Factory method for foreign keys. */ - @SafeVarargs - public static final ForeignKey createForeignKey(UniqueKey key, Table table, TableField... fields) { return createForeignKey(key, table, null, fields); } @@ -138,9 +132,7 @@ public final class Internal { /** * Factory method for foreign keys. */ - @SafeVarargs - public static final ForeignKey createForeignKey(UniqueKey key, Table table, String name, TableField... fields) { return createForeignKey(key, table, name, fields, true); } diff --git a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java index 7844fd9832..f4b24bdd1a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java @@ -87,9 +87,7 @@ final class ReferenceImpl extends AbstractKe } @Override - @SafeVarargs - public final Result fetchParents(R... records) { return fetchParents(list(records)); } @@ -100,9 +98,7 @@ final class ReferenceImpl extends AbstractKe } @Override - @SafeVarargs - public final Result fetchChildren(O... records) { return fetchChildren(list(records)); } diff --git a/jOOQ/src/main/java/org/jooq/impl/ScopeStack.java b/jOOQ/src/main/java/org/jooq/impl/ScopeStack.java index 76f45b32eb..533549fcc4 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ScopeStack.java +++ b/jOOQ/src/main/java/org/jooq/impl/ScopeStack.java @@ -190,9 +190,7 @@ final class ScopeStack implements Iterable { /** * Create a new value */ - @FunctionalInterface - interface Constructor { V create(int scopeLevel); } diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java index 5e88231493..14ad72c7bb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tools.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java @@ -2004,9 +2004,7 @@ final class Tools { /** * Create a new array */ - @SafeVarargs - static final T[] array(T... array) { return array; } @@ -2014,9 +2012,7 @@ final class Tools { /** * Reverse an array. */ - @SafeVarargs - static final T[] reverse(T... array) { if (array == null) return null; @@ -2033,9 +2029,7 @@ final class Tools { /** * Reverse iterate over an array. */ - @SafeVarargs - static final Iterable reverseIterable(final T... array) { return reverseIterable(Arrays.asList(array)); } @@ -2043,9 +2037,7 @@ final class Tools { /** * Reverse iterate over an array. */ - @SafeVarargs - static final Iterator reverseIterator(final T... array) { return reverseIterator(Arrays.asList(array)); } @@ -2090,9 +2082,7 @@ final class Tools { * Use this rather than {@link Arrays#asList(Object...)} for * null-safety */ - @SafeVarargs - static final List list(T... array) { return array == null ? Collections.emptyList() : Arrays.asList(array); } diff --git a/jOOQ/src/main/java/org/jooq/tools/StringUtils.java b/jOOQ/src/main/java/org/jooq/tools/StringUtils.java index 4b104373ea..a50f7e031c 100644 --- a/jOOQ/src/main/java/org/jooq/tools/StringUtils.java +++ b/jOOQ/src/main/java/org/jooq/tools/StringUtils.java @@ -1034,9 +1034,7 @@ public final class StringUtils { * @since 2.0 * @since 3.0 Changed signature to use varargs */ - @SafeVarargs - public static String join(T... elements) { return join(elements, null); }