From eaadafa8bfdca2e444f42f50493b8cfee7e82fde Mon Sep 17 00:00:00 2001 From: Knut Wannheden Date: Tue, 20 Aug 2019 12:42:23 +0200 Subject: [PATCH] Cleanup: Remove some unnecessary preprocessor whitespace --- .../main/java/org/jooq/AlterTableStep.java | 2 +- .../org/jooq/impl/AbstractResultQuery.java | 2 +- .../java/org/jooq/impl/AbstractRoutine.java | 4 +-- .../java/org/jooq/impl/AlterTableImpl.java | 8 +++--- jOOQ/src/main/java/org/jooq/impl/Array.java | 2 +- .../java/org/jooq/impl/ConstraintImpl.java | 2 +- .../java/org/jooq/impl/CreateIndexImpl.java | 2 +- .../java/org/jooq/impl/CreateViewImpl.java | 4 +-- .../java/org/jooq/impl/DefaultBinding.java | 28 +++++++++---------- .../java/org/jooq/impl/DefaultDataType.java | 2 +- .../java/org/jooq/impl/DeleteQueryImpl.java | 2 +- .../org/jooq/impl/FieldMapsForInsert.java | 6 ++-- .../src/main/java/org/jooq/impl/Function.java | 8 +++--- jOOQ/src/main/java/org/jooq/impl/Limit.java | 2 +- .../main/java/org/jooq/impl/MergeImpl.java | 2 +- .../main/java/org/jooq/impl/ParserImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Tools.java | 2 +- jOOQ/src/main/java/org/jooq/impl/UDTImpl.java | 2 +- .../java/org/jooq/impl/UpdateQueryImpl.java | 4 +-- 19 files changed, 43 insertions(+), 43 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/AlterTableStep.java b/jOOQ/src/main/java/org/jooq/AlterTableStep.java index 081e3e2f98..8be001a4ba 100644 --- a/jOOQ/src/main/java/org/jooq/AlterTableStep.java +++ b/jOOQ/src/main/java/org/jooq/AlterTableStep.java @@ -591,7 +591,7 @@ public interface AlterTableStep { * Add a DROP PRIMARY KEY clause to the ALTER TABLE * statement. */ - @Support({ H2, HSQLDB, MARIADB, MYSQL }) + @Support({ H2, HSQLDB, MARIADB, MYSQL }) AlterTableFinalStep dropPrimaryKey(); /** diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java index ee591d3319..37673a0b77 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java @@ -1599,7 +1599,7 @@ abstract class AbstractResultQuery extends AbstractQuery imple private final boolean hasLimit1() { if (this instanceof SelectQueryImpl) { Limit l = ((SelectQueryImpl) this).getLimit(); - return !l.withTies() && l.limitOne(); + return !l.withTies() && l.limitOne(); } return false; diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java index d0811ba78e..d7670b0a24 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java +++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java @@ -352,7 +352,7 @@ public abstract class AbstractRoutine extends AbstractNamed implements Routin // [#4254] In PostgreSQL, there are only functions, no procedures. Some // functions cannot be called using a CallableStatement, e.g. those with // DEFAULT parameters - if ( family == POSTGRES) { + if ( family == POSTGRES) { return executeSelectFromPOSTGRES(); } @@ -1788,7 +1788,7 @@ public abstract class AbstractRoutine extends AbstractNamed implements Routin continue; // Disambiguate overloaded function signatures - if ( family == POSTGRES) + if ( family == POSTGRES) // [#4920] In case there are any unnamed parameters, we mustn't if (hasUnnamedParameters()) diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java index 3e58e0426e..e6960aee90 100644 --- a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java @@ -900,7 +900,7 @@ final class AlterTableImpl extends AbstractRowCountQuery implements (renameConstraint != null && family == HSQLDB) || (renameColumn != null && SUPPORT_RENAME_COLUMN.contains(family)); boolean renameTable = renameTo != null && SUPPORT_RENAME_TABLE.contains(family); - boolean renameObject = renameTo != null && (false ); + boolean renameObject = renameTo != null && (false); if (!omitAlterTable) { ctx.start(ALTER_TABLE_TABLE) @@ -1041,7 +1041,7 @@ final class AlterTableImpl extends AbstractRowCountQuery implements .qualify(qualify); else ctx.qualify(false) - .visit( K_RENAME_CONSTRAINT).sql(' ') + .visit( K_RENAME_CONSTRAINT).sql(' ') .visit(renameConstraint) .formatSeparator() .visit(K_TO).sql(' ') @@ -1053,8 +1053,8 @@ final class AlterTableImpl extends AbstractRowCountQuery implements } else if (add != null) { boolean multiAdd = REQUIRE_REPEAT_ADD_ON_MULTI_ALTER.contains(ctx.family()); - boolean parens = !multiAdd ; - boolean comma = true ; + boolean parens = !multiAdd; + boolean comma = true; ctx.start(ALTER_TABLE_ADD) .visit(K_ADD) diff --git a/jOOQ/src/main/java/org/jooq/impl/Array.java b/jOOQ/src/main/java/org/jooq/impl/Array.java index 78d41b9510..71ce5a81fb 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Array.java +++ b/jOOQ/src/main/java/org/jooq/impl/Array.java @@ -92,7 +92,7 @@ final class Array extends AbstractField { .visit(fields) .sql(']'); - if (fields.fields.length == 0 && ( ctx.family() == POSTGRES)) + if (fields.fields.length == 0 && ( ctx.family() == POSTGRES)) ctx.sql("::").visit(K_INT).sql("[]"); break; diff --git a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java index 1373ef9123..25ad99903c 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java @@ -188,7 +188,7 @@ implements else { boolean qualify = ctx.qualify(); - if (getQualifiedName() != AbstractName.NO_NAME ) { + if (getQualifiedName() != AbstractName.NO_NAME) { ctx.visit(K_CONSTRAINT) .sql(' ') .visit(getUnqualifiedName()) diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java index 431fc33bd4..7820114e82 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java @@ -276,7 +276,7 @@ final class CreateIndexImpl extends AbstractRowCountQuery implements ; - boolean supportsFieldsBeforeTable = false ; + boolean supportsFieldsBeforeTable = false; QueryPartList list = new QueryPartList<>(); if (fields != null) diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java index e24b9dd1d4..2cb2825ff5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java @@ -215,8 +215,8 @@ final class CreateViewImpl extends AbstractRowCountQuery imple // [#2059] MemSQL doesn't support column aliases at the view level boolean rename = f != null && f.length > 0; - boolean renameSupported = true ; - boolean replaceSupported = false ; + boolean renameSupported = true; + boolean replaceSupported = false; diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java index 8a7caffd68..7d6d9ae393 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java @@ -680,7 +680,7 @@ public class DefaultBinding implements Binding { // [#1130] TODO type can be null for ARRAY types, etc. // [#7351] UUID data types need to be cast too // [#7242] JSON(B) data types need to be cast too - else if (( POSTGRES == family) && + else if (( POSTGRES == family) && (sqlDataType == null || (!sqlDataType.isTemporal() && sqlDataType != SQLDataType.UUID @@ -700,7 +700,7 @@ public class DefaultBinding implements Binding { // [#7379] Most databases cannot cast a bind variable to an enum type - else if ( POSTGRES != family && EnumType.class.isAssignableFrom(type)) + else if ( POSTGRES != family && EnumType.class.isAssignableFrom(type)) sqlCast(ctx, converted, Tools.emulateEnumType((DataType) dataType), dataType.length(), dataType.precision(), dataType.scale()); // In all other cases, the bind variable can be cast normally @@ -987,7 +987,7 @@ public class DefaultBinding implements Binding { ctx.render().sql(')'); } - else if ( ctx.family() == POSTGRES) { + else if ( ctx.family() == POSTGRES) { // [#8933] In some cases, we cannot derive the cast type from // array type directly @@ -1013,7 +1013,7 @@ public class DefaultBinding implements Binding { ctx.render().sql(']'); // [#3214] Some PostgreSQL array type literals need explicit casting - if (( ctx.family() == POSTGRES) && EnumType.class.isAssignableFrom(type.getComponentType())) + if (( ctx.family() == POSTGRES) && EnumType.class.isAssignableFrom(type.getComponentType())) DefaultEnumTypeBinding.pgRenderEnumCast(ctx.render(), type); } } @@ -1783,7 +1783,7 @@ public class DefaultBinding implements Binding { - else if ( ctx.family() == POSTGRES) + else if ( ctx.family() == POSTGRES) ctx.render() .sql("E'") .sql(PostgresUtils.toPGString(value)) @@ -2122,7 +2122,7 @@ public class DefaultBinding implements Binding { final void set0(BindingSetStatementContext ctx, DayToSecond value) throws SQLException { // [#566] Interval data types are best bound as Strings - if ( ctx.family() == POSTGRES) + if ( ctx.family() == POSTGRES) ctx.statement().setObject(ctx.index(), toPGInterval(value)); else ctx.statement().setString(ctx.index(), value.toString()); @@ -2135,7 +2135,7 @@ public class DefaultBinding implements Binding { @Override final DayToSecond get0(BindingGetResultSetContext ctx) throws SQLException { - if ( ctx.family() == POSTGRES) { + if ( ctx.family() == POSTGRES) { Object object = ctx.resultSet().getObject(ctx.index()); return object == null ? null : PostgresUtils.toDayToSecond(object); } @@ -2147,7 +2147,7 @@ public class DefaultBinding implements Binding { @Override final DayToSecond get0(BindingGetStatementContext ctx) throws SQLException { - if ( ctx.family() == POSTGRES) { + if ( ctx.family() == POSTGRES) { Object object = ctx.statement().getObject(ctx.index()); return object == null ? null : PostgresUtils.toDayToSecond(object); } @@ -2185,7 +2185,7 @@ public class DefaultBinding implements Binding { // [#5249] [#6912] [#8063] Special inlining of special floating point values if (value.isNaN()) - if ( ctx.family() == POSTGRES) + if ( ctx.family() == POSTGRES) ctx.render().visit(inline("NaN")).sql("::float8"); else if (ctx.family() == HSQLDB) ctx.render().visit(sqrt(inline(-1))); @@ -2262,7 +2262,7 @@ public class DefaultBinding implements Binding { super.sqlBind0(ctx, value); // Postgres needs explicit casting for enum (array) types - if ( ctx.family() == POSTGRES) + if ( ctx.family() == POSTGRES) pgRenderEnumCast(ctx.render(), type); } @@ -2358,7 +2358,7 @@ public class DefaultBinding implements Binding { // [#5249] [#6912] [#8063] Special inlining of special floating point values if (value.isNaN()) - if ( ctx.family() == POSTGRES) + if ( ctx.family() == POSTGRES) ctx.render().visit(inline("NaN")).sql("::float4"); else if (ctx.family() == HSQLDB) ctx.render().visit(sqrt(inline(-1))); @@ -3171,13 +3171,13 @@ public class DefaultBinding implements Binding { void sqlBind0(BindingSQLContext ctx, Record value) throws SQLException { super.sqlBind0(ctx, value); - if (( ctx.family() == POSTGRES) && value != null) + if (( ctx.family() == POSTGRES) && value != null) pgRenderRecordCast(ctx.render(), value); } @Override final void sqlInline0(BindingSQLContext ctx, Record value) throws SQLException { - if ( ctx.family() == POSTGRES) { + if ( ctx.family() == POSTGRES) { ctx.render().visit(inline(PostgresUtils.toPGString(value))); pgRenderRecordCast(ctx.render(), value); } @@ -3200,7 +3200,7 @@ public class DefaultBinding implements Binding { @Override final void set0(BindingSetStatementContext ctx, Record value) throws SQLException { - if (( ctx.family() == POSTGRES) && value != null) + if (( ctx.family() == POSTGRES) && value != null) ctx.statement().setString(ctx.index(), PostgresUtils.toPGString(value)); else ctx.statement().setObject(ctx.index(), value); diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java index 1e06cd52d3..2082580232 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java +++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java @@ -859,7 +859,7 @@ public class DefaultDataType implements DataType { result = TYPES_BY_NAME[SQLDialect.DEFAULT.ordinal()].get(normalised); // [#4065] PostgreSQL reports array types as _typename, e.g. _varchar - if (result == null && ( family == POSTGRES) && normalised.charAt(0) == '_') + if (result == null && ( family == POSTGRES) && normalised.charAt(0) == '_') result = getDataType(dialect, normalised.substring(1)).getArrayDataType(); // [#6466] HSQLDB reports array types as XYZARRAY diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java index 2b3d58ae56..96be9fee1b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java @@ -202,7 +202,7 @@ final class DeleteQueryImpl extends AbstractDMLQuery implem // [#2059] MemSQL does not support DELETE ... ORDER BY - if (limit != null && NO_SUPPORT_LIMIT.contains(ctx.family()) ) { + if (limit != null && NO_SUPPORT_LIMIT.contains(ctx.family())) { Field[] keyFields = table().getKeys().isEmpty() ? new Field[] { table().rowid() } diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java b/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java index c8d1dda025..59cb281afe 100644 --- a/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java +++ b/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java @@ -111,7 +111,7 @@ final class FieldMapsForInsert extends AbstractQueryPart { - else if (rows == 1 ) { + else if (rows == 1) { ctx.formatSeparator() .start(INSERT_VALUES) .visit(K_VALUES) @@ -245,9 +245,9 @@ final class FieldMapsForInsert extends AbstractQueryPart { final void toSQL92Values(Context ctx, boolean emulateBulkInsertReturning) { boolean indent = (values.size() > 1); - boolean castFirstRowNumericValues = false ; + boolean castFirstRowNumericValues = false; - for (int row = 0; row < rows ; row++) { + for (int row = 0; row < rows; row++) { if (row > 0) ctx.sql(", "); diff --git a/jOOQ/src/main/java/org/jooq/impl/Function.java b/jOOQ/src/main/java/org/jooq/impl/Function.java index 089a167868..7499f9bce8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Function.java +++ b/jOOQ/src/main/java/org/jooq/impl/Function.java @@ -246,10 +246,10 @@ class Function extends AbstractField implements - else if (term == MODE && ( ctx.family() == H2 || ctx.family() == POSTGRES)) { + else if (term == MODE && ( ctx.family() == H2 || ctx.family() == POSTGRES)) { ctx.visit(mode().withinGroupOrderBy(DSL.field("{0}", arguments.get(0)))); } - else if (term == MEDIAN && ( ctx.family() == POSTGRES)) { + else if (term == MEDIAN && ( ctx.family() == POSTGRES)) { Field[] fields = new Field[arguments.size()]; for (int i = 0; i < fields.length; i++) fields[i] = DSL.field("{0}", arguments.get(i)); @@ -572,7 +572,7 @@ class Function extends AbstractField implements ctx.visit(K_DISTINCT); // [#2883] PostgreSQL can use the DISTINCT keyword with formal row value expressions. - if (( ctx.family() == POSTGRES) && args.size() > 1) + if (( ctx.family() == POSTGRES) && args.size() > 1) ctx.sql('('); else ctx.sql(' '); @@ -593,7 +593,7 @@ class Function extends AbstractField implements } if (distinct) - if (( ctx.family() == POSTGRES) && args.size() > 1) + if (( ctx.family() == POSTGRES) && args.size() > 1) ctx.sql(')'); if (ctx.family() != H2) { diff --git a/jOOQ/src/main/java/org/jooq/impl/Limit.java b/jOOQ/src/main/java/org/jooq/impl/Limit.java index 79a9f9b82b..9a5964ebb1 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Limit.java +++ b/jOOQ/src/main/java/org/jooq/impl/Limit.java @@ -315,7 +315,7 @@ final class Limit extends AbstractQueryPart { private final void acceptStandard(Context ctx, CastMode castMode) { ctx.castMode(NEVER); - if ( !offsetZero()) + if ( !offsetZero()) ctx.formatSeparator() .visit(K_OFFSET) .sql(' ').visit(offsetOrZero) diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java index 7bf72d5f28..0c0e739f05 100644 --- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java @@ -1510,7 +1510,7 @@ implements - boolean onParentheses = false ; + boolean onParentheses = false; ctx.end(MERGE_USING) .formatSeparator() .start(MERGE_ON) diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index 481a721016..3ef57e693b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -10543,7 +10543,7 @@ final class ParserImpl implements Parser { } final class ParserContext { - private static final boolean PRO_EDITION = false ; + private static final boolean PRO_EDITION = false; final DSLContext dsl; final Meta meta; diff --git a/jOOQ/src/main/java/org/jooq/impl/Tools.java b/jOOQ/src/main/java/org/jooq/impl/Tools.java index 47e6f7a4ee..e9d6c92f1d 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Tools.java +++ b/jOOQ/src/main/java/org/jooq/impl/Tools.java @@ -2288,7 +2288,7 @@ final class Tools { // [#6704] PostgreSQL supports additional quoted string literals, which we must skip: E'...' else if ((sqlChars[i] == 'e' || sqlChars[i] == 'E') - && ( ctx.family() == POSTGRES) + && ( ctx.family() == POSTGRES) && i + 1 < sqlChars.length && sqlChars[i + 1] == '\'') { diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java index 7591e90bff..30e09bd3dd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java @@ -201,7 +201,7 @@ public class UDTImpl> extends AbstractNamed implements UD @Override public final boolean isSQLUsable() { - return true ; + return true; } @Override diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java index 131fc69964..fe3dc1e2ef 100644 --- a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java @@ -585,7 +585,7 @@ final class UpdateQueryImpl extends AbstractStoreQuery impl // [#6763] Incompatible change in PostgreSQL 10 requires ROW() constructor for // single-degree rows. Let's just always render it, here. - if (ctx.family() == POSTGRES ) + if (ctx.family() == POSTGRES) ctx.visit(K_ROW).sql(" "); ctx.visit(multiValue); @@ -650,7 +650,7 @@ final class UpdateQueryImpl extends AbstractStoreQuery impl } // [#2059] MemSQL does not support UPDATE ... ORDER BY - if (limit != null && NO_SUPPORT_LIMIT.contains(ctx.family()) ) { + if (limit != null && NO_SUPPORT_LIMIT.contains(ctx.family())) { Field[] keyFields = table().getKeys().isEmpty() ? new Field[] { table().rowid() }