diff --git a/jOOQ/src/main/java/org/jooq/Cursor.java b/jOOQ/src/main/java/org/jooq/Cursor.java
index 322ee5514e..04ab205d9b 100644
--- a/jOOQ/src/main/java/org/jooq/Cursor.java
+++ b/jOOQ/src/main/java/org/jooq/Cursor.java
@@ -74,7 +74,7 @@ import org.jooq.impl.DefaultRecordMapper;
  * @param <R> The cursor's record type
  * @author Lukas Eder
  */
-public interface Cursor<R extends Record> extends Iterable<R>, Formattable, AutoCloseable {
+public interface Cursor<R extends Record> extends Iterable<R>, Formattable , AutoCloseable {
 
     /**
      * Get this cursor's row type.
diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index 91f606043d..54eebdf8a1 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -139,7 +139,7 @@ import org.jooq.util.xml.jaxb.InformationSchema;
  * @see Configuration
  * @author Lukas Eder
  */
-public interface DSLContext extends Scope, AutoCloseable {
+public interface DSLContext extends Scope , AutoCloseable {
 
     // -------------------------------------------------------------------------
     // XXX AutoCloseable API
diff --git a/jOOQ/src/main/java/org/jooq/Query.java b/jOOQ/src/main/java/org/jooq/Query.java
index df1143bb0b..29fe011547 100644
--- a/jOOQ/src/main/java/org/jooq/Query.java
+++ b/jOOQ/src/main/java/org/jooq/Query.java
@@ -59,7 +59,7 @@ import org.jooq.impl.DSL;
  *
  * @author Lukas Eder
  */
-public interface Query extends Statement, Attachable, AutoCloseable {
+public interface Query extends Statement, Attachable , AutoCloseable {
 
     /**
      * Execute the query, if it has been created with a proper configuration.
diff --git a/jOOQ/src/main/java/org/jooq/RowCountQuery.java b/jOOQ/src/main/java/org/jooq/RowCountQuery.java
index 3f57438b34..afe85d1697 100644
--- a/jOOQ/src/main/java/org/jooq/RowCountQuery.java
+++ b/jOOQ/src/main/java/org/jooq/RowCountQuery.java
@@ -48,8 +48,8 @@ package org.jooq;
 public interface RowCountQuery
 extends
     Query
-   , org.reactivestreams.Publisher<Integer>
-   
+    , org.reactivestreams.Publisher<Integer>
+    
 {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
index b77af101e0..a6032881e8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
@@ -694,7 +694,7 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
         toSQLCall(context);
         context.sql(' ');
 
-//
+//        
 
 
         context.sql('(');
@@ -752,7 +752,7 @@ public abstract class AbstractRoutine<T> extends AbstractNamed implements Routin
         if (indent)
             context.formatIndentEnd().formatNewLine();
 
-//
+//        
 
 
         context.sql(')');
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
index 1fd0bbae61..34489ceb8d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
@@ -1138,7 +1138,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)
@@ -1292,8 +1292,8 @@ final class AlterTableImpl extends AbstractRowCountQuery implements
         else if (add != null) {
             boolean qualify = ctx.qualify();
             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/ConstraintImpl.java b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java
index 2b0e6826a9..89742bedb6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java
@@ -207,7 +207,7 @@ implements
         else {
             boolean qualify = ctx.qualify();
 
-            if (named) {
+            if (named ) {
                 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 aaaef340f6..6117d64d43 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
@@ -281,7 +281,7 @@ final class CreateIndexImpl extends AbstractRowCountQuery implements
                .sql(' ');
 
         boolean supportsInclude = SUPPORT_INCLUDE.contains(ctx.dialect());
-        boolean supportsFieldsBeforeTable = false;
+        boolean supportsFieldsBeforeTable = false ;
 
         QueryPartList<QueryPart> list = new QueryPartList<>();
         list.addAll(asList(sortFields));
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java
index 551950d62a..b8bd3c7fd2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java
@@ -222,8 +222,8 @@ final class CreateViewImpl<R extends Record> 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/DefaultDataType.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java
index 5c439ddbda..c1c731f04b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDataType.java
@@ -1046,7 +1046,7 @@ public class DefaultDataType<T> implements DataType<T> {
 
     @Override
     public final boolean isArray() {
-        return
+        return 
             (!isBinary() && tType.isArray());
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
index 234c15fd6e..4270a3c7f8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultRenderContext.java
@@ -327,7 +327,7 @@ class DefaultRenderContext extends AbstractContext<RenderContext> implements Ren
 
     @Override
     public final String render() {
-        String prepend = null;
+        String prepend = null; 
         String result = sql.toString();
         return prepend == null ? result : prepend + result;
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java
index ecff4218e3..648328d12d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java
@@ -231,7 +231,7 @@ final class DeleteQueryImpl<R extends Record> extends AbstractDMLQuery<R> 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 59cb281afe..b1e0adde08 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/InsertQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
index c1a1cfbfa4..bedfa1ca6f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
@@ -347,7 +347,7 @@ final class InsertQueryImpl<R extends Record> extends AbstractStoreQuery<R> impl
                        .visit(K_ON_CONFLICT)
                        .sql(' ');
 
-                    if (onConstraint != null) {
+                    if (onConstraint != null ) {
                         ctx.data(DATA_CONSTRAINT_REFERENCE, true);
                         ctx.visit(K_ON_CONSTRAINT)
                            .sql(' ')
@@ -483,7 +483,7 @@ final class InsertQueryImpl<R extends Record> extends AbstractStoreQuery<R> impl
                        .visit(K_ON_CONFLICT)
                        .sql(' ');
 
-                    if (onConstraint != null) {
+                    if (onConstraint != null ) {
                         ctx.data(DATA_CONSTRAINT_REFERENCE, true);
                         ctx.visit(K_ON_CONSTRAINT)
                            .sql(' ')
diff --git a/jOOQ/src/main/java/org/jooq/impl/Interpreter.java b/jOOQ/src/main/java/org/jooq/impl/Interpreter.java
index e5b96f6c8b..9ce0d38705 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Interpreter.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Interpreter.java
@@ -371,7 +371,7 @@ final class Interpreter {
         if (mu == null)
             throw primaryKeyNotExists();
 
-        boolean enforced = true;
+        boolean enforced = true ;
         mt.foreignKeys.add(new MutableForeignKey(
             (UnqualifiedName) impl.getUnqualifiedName(), mt, mfs, mu, impl.$onDelete(), impl.$onUpdate(), enforced
         ));
@@ -733,7 +733,7 @@ final class Interpreter {
     private final void addConstraint(Query query, ConstraintImpl impl, MutableTable existing) {
         if (!impl.getUnqualifiedName().empty() && existing.constraint(impl) != null)
             throw constraintAlreadyExists(impl);
-        boolean enforced = true;
+        boolean enforced = true ;
         if (impl.$primaryKey() != null)
             if (existing.primaryKey != null)
                 throw constraintAlreadyExists(impl);
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index d5a4208c3b..df2ae5627d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -10937,7 +10937,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 Locale                          locale;
diff --git a/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java
index b99b780e3b..08f38c14af 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java
@@ -95,7 +95,7 @@ final class QuantifiedSelectImpl<R extends Record> extends AbstractQueryPart imp
 
         ctx.visit(quantifier.toKeyword());
 
-        boolean extraParentheses = false;
+        boolean extraParentheses = false ;
 
         ctx.sql(extraParentheses ? " ((" : " (");
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java
index c1fd108e2e..b595703dd7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java
@@ -212,7 +212,7 @@ final class RowSubqueryCondition extends AbstractCondition {
             if (rightQuantified == null) {
 
                 // Some databases need extra parentheses around the RHS
-                boolean extraParentheses = false;
+                boolean extraParentheses = false ;
 
                 ctx.sql(extraParentheses ? "((" : "(");
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java
index b83d76e385..72fa2d2d0b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UDTImpl.java
@@ -206,7 +206,7 @@ public class UDTImpl<R extends UDTRecord<R>> 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 f671cbe8f7..a2121cf420 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
@@ -652,7 +652,7 @@ final class UpdateQueryImpl<R extends Record> extends AbstractStoreQuery<R> 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() }