diff --git a/jOOQ/src/main/java/org/jooq/impl/Acos.java b/jOOQ/src/main/java/org/jooq/impl/Acos.java
index 7500395844..4930863fc8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Acos.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Acos.java
@@ -53,7 +53,7 @@ import org.jooq.QueryPart;
 /**
  * @author Lukas Eder
  */
-class Acos extends AbstractFunction<BigDecimal> {
+final class Acos extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Alias.java b/jOOQ/src/main/java/org/jooq/impl/Alias.java
index 64bc2a05d4..537a3a3570 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Alias.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Alias.java
@@ -83,7 +83,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class Alias<Q extends QueryPart> extends AbstractQueryPart {
+final class Alias<Q extends QueryPart> extends AbstractQueryPart {
 
     private static final long     serialVersionUID        = -2456848365524191614L;
     private static final Clause[] CLAUSES_TABLE_REFERENCE = { TABLE, TABLE_REFERENCE };
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
index 1a970142de..44ae11052c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
@@ -58,7 +58,7 @@ import org.jooq.Sequence;
 /**
  * @author Lukas Eder
  */
-class AlterSequenceImpl<T extends Number> extends AbstractQuery implements
+final class AlterSequenceImpl<T extends Number> extends AbstractQuery implements
 
     // Cascading interface implementations for AlterSequence behaviour
     AlterSequenceRestartStep<T>,
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
index 242bc9b8b1..f14f1ae704 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
@@ -76,7 +76,7 @@ import org.jooq.Table;
  * @author Lukas Eder
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
-class AlterTableImpl extends AbstractQuery implements
+final class AlterTableImpl extends AbstractQuery implements
 
     // Cascading interface implementations for ALTER TABLE behaviour
     AlterTableStep,
diff --git a/jOOQ/src/main/java/org/jooq/impl/Array.java b/jOOQ/src/main/java/org/jooq/impl/Array.java
index f2c097c97b..92dde6d2ab 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Array.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Array.java
@@ -52,7 +52,7 @@ import org.jooq.Record;
 /**
  * @author Lukas Eder
  */
-class Array<T> extends AbstractField<T[]> {
+final class Array<T> extends AbstractField<T[]> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayDataType.java b/jOOQ/src/main/java/org/jooq/impl/ArrayDataType.java
index 8b547f120c..a804f3e178 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayDataType.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayDataType.java
@@ -48,7 +48,7 @@ import org.jooq.DataType;
  *
  * @author Lukas Eder
  */
-class ArrayDataType<T> extends DefaultDataType<T[]> {
+final class ArrayDataType<T> extends DefaultDataType<T[]> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java b/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java
index 6018c12eb2..f5562899bd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java
@@ -61,7 +61,7 @@ import org.jooq.util.h2.H2DataType;
  *
  * @author Lukas Eder
  */
-class ArrayTable extends AbstractTable<Record> {
+final class ArrayTable extends AbstractTable<Record> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayTableEmulation.java b/jOOQ/src/main/java/org/jooq/impl/ArrayTableEmulation.java
index fec63ee3f5..9cc0b3df4e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayTableEmulation.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayTableEmulation.java
@@ -58,7 +58,7 @@ import org.jooq.Table;
  *
  * @author Lukas Eder
  */
-class ArrayTableEmulation extends AbstractTable<Record> {
+final class ArrayTableEmulation extends AbstractTable<Record> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ascii.java b/jOOQ/src/main/java/org/jooq/impl/Ascii.java
index ee0fe9f166..1a3b6fc665 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ascii.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ascii.java
@@ -48,7 +48,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Ascii extends AbstractFunction<Integer> {
+final class Ascii extends AbstractFunction<Integer> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Asin.java b/jOOQ/src/main/java/org/jooq/impl/Asin.java
index 1eedbd61ea..a1d84be4d3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Asin.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Asin.java
@@ -52,7 +52,7 @@ import org.jooq.QueryPart;
 /**
  * @author Lukas Eder
  */
-class Asin extends AbstractFunction<BigDecimal> {
+final class Asin extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Atan.java b/jOOQ/src/main/java/org/jooq/impl/Atan.java
index eebb99c1e1..93f02bfbcb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Atan.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Atan.java
@@ -51,7 +51,7 @@ import org.jooq.QueryPart;
 /**
  * @author Lukas Eder
  */
-class Atan extends AbstractFunction<BigDecimal> {
+final class Atan extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java b/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java
index efe836ed64..def06de868 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java
@@ -64,7 +64,7 @@ import org.jooq.exception.DataAccessException;
 /**
  * @author Lukas Eder
  */
-class BatchCRUD implements Batch {
+final class BatchCRUD implements Batch {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchMultiple.java b/jOOQ/src/main/java/org/jooq/impl/BatchMultiple.java
index e7de312893..8de6b37de3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BatchMultiple.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BatchMultiple.java
@@ -53,7 +53,7 @@ import org.jooq.exception.ControlFlowSignal;
 /**
  * @author Lukas Eder
  */
-class BatchMultiple implements Batch {
+final class BatchMultiple implements Batch {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
index 4498d96bf8..2d80bb7663 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
@@ -69,7 +69,7 @@ import org.jooq.tools.JooqLogger;
 /**
  * @author Lukas Eder
  */
-class BatchSingle implements BatchBindStep {
+final class BatchSingle implements BatchBindStep {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java b/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java
index bcdf05a54b..67bf0001c6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java
@@ -77,7 +77,7 @@ import org.jooq.QueryPartInternal;
 /**
  * @author Lukas Eder
  */
-class BetweenCondition<T> extends AbstractCondition implements BetweenAndStep<T> {
+final class BetweenCondition<T> extends AbstractCondition implements BetweenAndStep<T> {
 
     private static final long     serialVersionUID              = -4666251100802237878L;
     private static final Clause[] CLAUSES_BETWEEN               = { CONDITION, CONDITION_BETWEEN };
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitCount.java b/jOOQ/src/main/java/org/jooq/impl/BitCount.java
index ac9ed9634b..7c24c7a800 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitCount.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitCount.java
@@ -49,7 +49,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class BitCount extends AbstractFunction<Integer> {
+final class BitCount extends AbstractFunction<Integer> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java b/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java
index 52e65e484c..2354faac9f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BoolAnd.java
@@ -51,7 +51,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class BoolAnd extends Function<Boolean> {
+final class BoolAnd extends Function<Boolean> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/BoolOr.java b/jOOQ/src/main/java/org/jooq/impl/BoolOr.java
index 2c5737cbc2..5306e60bf2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BoolOr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BoolOr.java
@@ -51,7 +51,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class BoolOr extends Function<Boolean> {
+final class BoolOr extends Function<Boolean> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java b/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java
index 17bd869180..98e1c641df 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CaseConditionStepImpl.java
@@ -53,7 +53,10 @@ import org.jooq.QueryPart;
 import org.jooq.Record1;
 import org.jooq.Select;
 
-class CaseConditionStepImpl<T> extends AbstractFunction<T> implements CaseConditionStep<T> {
+/**
+ * @author Lukas Eder
+ */
+final class CaseConditionStepImpl<T> extends AbstractFunction<T> implements CaseConditionStep<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/CaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/CaseImpl.java
index 77b1a60a63..c59eab4465 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CaseImpl.java
@@ -51,7 +51,7 @@ import org.jooq.Select;
 /**
  * @author Lukas Eder
  */
-class CaseImpl implements Case {
+final class CaseImpl implements Case {
 
     CaseImpl() {
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/CaseValueStepImpl.java b/jOOQ/src/main/java/org/jooq/impl/CaseValueStepImpl.java
index ad1a0e0e0a..d21a79410f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CaseValueStepImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CaseValueStepImpl.java
@@ -49,7 +49,7 @@ import org.jooq.Select;
 /**
  * @author Lukas Eder
  */
-class CaseValueStepImpl<V> implements CaseValueStep<V> {
+final class CaseValueStepImpl<V> implements CaseValueStep<V> {
 
     private final Field<V> value;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java b/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java
index 7d96f9770f..c839f91b0e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CaseWhenStepImpl.java
@@ -50,7 +50,7 @@ import org.jooq.Context;
 import org.jooq.Field;
 import org.jooq.QueryPart;
 
-class CaseWhenStepImpl<V, T> extends AbstractFunction<T> implements CaseWhenStep<V, T> {
+final class CaseWhenStepImpl<V, T> extends AbstractFunction<T> implements CaseWhenStep<V, T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cast.java b/jOOQ/src/main/java/org/jooq/impl/Cast.java
index 048a0cb0cb..36e7b27073 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cast.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cast.java
@@ -63,7 +63,7 @@ import org.jooq.RenderContext.CastMode;
 /**
  * @author Lukas Eder
  */
-class Cast<T> extends AbstractFunction<T> {
+final class Cast<T> extends AbstractFunction<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ceil.java b/jOOQ/src/main/java/org/jooq/impl/Ceil.java
index 383eda1bb3..abb61fcadb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ceil.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ceil.java
@@ -48,7 +48,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Ceil<T extends Number> extends AbstractFunction<T> {
+final class Ceil<T extends Number> extends AbstractFunction<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Coalesce.java b/jOOQ/src/main/java/org/jooq/impl/Coalesce.java
index a995c62b76..7c6d81e4f6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Coalesce.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Coalesce.java
@@ -47,7 +47,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Coalesce<T> extends AbstractField<T> {
+final class Coalesce<T> extends AbstractField<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Coerce.java b/jOOQ/src/main/java/org/jooq/impl/Coerce.java
index 796080028c..9ace5f41ff 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Coerce.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Coerce.java
@@ -47,7 +47,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Coerce<T> extends AbstractField<T> {
+final class Coerce<T> extends AbstractField<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java b/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java
index d96c311f6b..eb96f058c7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java
@@ -60,7 +60,7 @@ import org.jooq.Operator;
 /**
  * @author Lukas Eder
  */
-class CombinedCondition extends AbstractCondition {
+final class CombinedCondition extends AbstractCondition {
 
     private static final long     serialVersionUID = -7373293246207052549L;
     private static final Clause[] CLAUSES_AND      = { CONDITION, CONDITION_AND };
diff --git a/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java
index 8d72bbd9d4..bd92eb69e7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionImpl.java
@@ -52,7 +52,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class CommonTableExpressionImpl<R extends Record> extends AbstractTable<R> implements CommonTableExpression<R> {
+final class CommonTableExpressionImpl<R extends Record> extends AbstractTable<R> implements CommonTableExpression<R> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionList.java b/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionList.java
index 3e78d3291f..73c49a727f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionList.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CommonTableExpressionList.java
@@ -47,7 +47,7 @@ import org.jooq.CommonTableExpression;
  *
  * @author Lukas Eder
  */
-class CommonTableExpressionList extends QueryPartList<CommonTableExpression<?>> {
+final class CommonTableExpressionList extends QueryPartList<CommonTableExpression<?>> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/CompareCondition.java b/jOOQ/src/main/java/org/jooq/impl/CompareCondition.java
index c1f737a2c7..e9c2913905 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CompareCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CompareCondition.java
@@ -66,7 +66,7 @@ import org.jooq.conf.ParamType;
 /**
  * @author Lukas Eder
  */
-class CompareCondition extends AbstractCondition {
+final class CompareCondition extends AbstractCondition {
 
     private static final long     serialVersionUID = -747240442279619486L;
     private static final Clause[] CLAUSES          = { CONDITION, CONDITION_COMPARISON };
diff --git a/jOOQ/src/main/java/org/jooq/impl/Concat.java b/jOOQ/src/main/java/org/jooq/impl/Concat.java
index cd5c166a4c..a7cd846b9a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Concat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Concat.java
@@ -52,7 +52,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Concat extends AbstractFunction<String> {
+final class Concat extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
index cae33f9f39..84c5e62a15 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
@@ -50,7 +50,7 @@ import org.jooq.QueryPart;
 /**
  * @author Lukas Eder
  */
-class ConditionAsField extends AbstractFunction<Boolean> {
+final class ConditionAsField extends AbstractFunction<Boolean> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConditionProviderImpl.java b/jOOQ/src/main/java/org/jooq/impl/ConditionProviderImpl.java
index 42a7974f8b..d3db903162 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConditionProviderImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConditionProviderImpl.java
@@ -60,7 +60,7 @@ import org.jooq.Select;
  * @author Lukas Eder
  */
 @SuppressWarnings("deprecation")
-class ConditionProviderImpl extends AbstractQueryPart implements ConditionProvider, Condition {
+final class ConditionProviderImpl extends AbstractQueryPart implements ConditionProvider, Condition {
 
     private static final long serialVersionUID = 6073328960551062973L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java
index 9293c1745d..795fd6953a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConstraintImpl.java
@@ -89,7 +89,7 @@ import org.jooq.Table;
  * @author Lukas Eder
  */
 @SuppressWarnings("rawtypes")
-class ConstraintImpl extends AbstractQueryPart
+final class ConstraintImpl extends AbstractQueryPart
 implements
     ConstraintTypeStep
   , ConstraintForeignKeyOnStep
diff --git a/jOOQ/src/main/java/org/jooq/impl/Contains.java b/jOOQ/src/main/java/org/jooq/impl/Contains.java
index 34827675de..5cd2544a8c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Contains.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Contains.java
@@ -56,7 +56,7 @@ import org.jooq.Field;
  *
  * @author Lukas Eder
  */
-class Contains<T> extends AbstractCondition {
+final class Contains<T> extends AbstractCondition {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConvertedDataType.java b/jOOQ/src/main/java/org/jooq/impl/ConvertedDataType.java
index 65cbaae823..e067fbe72f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConvertedDataType.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConvertedDataType.java
@@ -53,7 +53,7 @@ import org.jooq.DataType;
  *             longer
  */
 @Deprecated
-class ConvertedDataType<T, U> extends DefaultDataType<U> {
+final class ConvertedDataType<T, U> extends DefaultDataType<U> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cosh.java b/jOOQ/src/main/java/org/jooq/impl/Cosh.java
index aff17f4672..188be99035 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cosh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cosh.java
@@ -52,7 +52,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Cosh extends AbstractFunction<BigDecimal> {
+final class Cosh extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cot.java b/jOOQ/src/main/java/org/jooq/impl/Cot.java
index c932ab7dc1..541cac9027 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cot.java
@@ -50,7 +50,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Cot extends AbstractFunction<BigDecimal> {
+final class Cot extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/CountTable.java b/jOOQ/src/main/java/org/jooq/impl/CountTable.java
index 72523b6a59..aa4a1a886c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CountTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CountTable.java
@@ -47,7 +47,7 @@ import org.jooq.UniqueKey;
 /**
  * @author Lukas Eder
  */
-class CountTable extends Function<Integer> {
+final class CountTable extends Function<Integer> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
index 387b589d7e..c99361da88 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
@@ -67,7 +67,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class CreateIndexImpl extends AbstractQuery implements
+final class CreateIndexImpl extends AbstractQuery implements
 
     // Cascading interface implementations for CREATE INDEX behaviour
     CreateIndexStep,
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
index df5d1dc354..d3303ad3bf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
@@ -62,7 +62,7 @@ import org.jooq.Sequence;
 /**
  * @author Lukas Eder
  */
-class CreateSequenceImpl extends AbstractQuery implements
+final class CreateSequenceImpl extends AbstractQuery implements
 
     // Cascading interface implementations for CREATE SEQUENCE behaviour
     CreateSequenceFinalStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
index 737bfe2aef..3838a1f6d1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTableImpl.java
@@ -86,7 +86,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class CreateTableImpl<R extends Record> extends AbstractQuery implements
+final class CreateTableImpl<R extends Record> extends AbstractQuery implements
 
     // Cascading interface implementations for CREATE TABLE behaviour
     CreateTableAsStep<R>,
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java
index 9607581cf0..9c622898c2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateViewImpl.java
@@ -71,7 +71,7 @@ import org.jooq.conf.ParamType;
 /**
  * @author Lukas Eder
  */
-class CreateViewImpl<R extends Record> extends AbstractQuery implements
+final class CreateViewImpl<R extends Record> extends AbstractQuery implements
 
     // Cascading interface implementations for CREATE VIEW behaviour
     CreateViewAsStep<R>,
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java b/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java
index fababa338e..9c4e4ac665 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java
@@ -51,7 +51,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class CurrentDate extends AbstractFunction<Date> {
+final class CurrentDate extends AbstractFunction<Date> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
index 2cb16cfc94..f78a0fe9dc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
@@ -50,7 +50,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class CurrentSchema extends AbstractFunction<String> {
+final class CurrentSchema extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java b/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java
index 4e729b3ce6..10462d557c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java
@@ -51,7 +51,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class CurrentTime extends AbstractFunction<Time> {
+final class CurrentTime extends AbstractFunction<Time> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java b/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java
index 0073744513..5421b23f51 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java
@@ -51,7 +51,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class CurrentTimestamp extends AbstractFunction<Timestamp> {
+final class CurrentTimestamp extends AbstractFunction<Timestamp> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
index c33503bd4a..0e3096a7c3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
@@ -50,7 +50,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class CurrentUser extends AbstractFunction<String> {
+final class CurrentUser extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java b/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java
index 0ce6d71821..a4178361f6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CursorImpl.java
@@ -98,7 +98,7 @@ import org.jooq.tools.jdbc.JDBCUtils;
 /**
  * @author Lukas Eder
  */
-class CursorImpl<R extends Record> implements Cursor<R> {
+final class CursorImpl<R extends Record> implements Cursor<R> {
 
     private static final JooqLogger                        log = JooqLogger.getLogger(CursorImpl.class);
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DDL.java b/jOOQ/src/main/java/org/jooq/impl/DDL.java
index efaef50805..ac93a9fa0c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DDL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DDL.java
@@ -63,7 +63,7 @@ import org.jooq.UniqueKey;
 /**
  * @author Lukas Eder
  */
-class DDL {
+final class DDL {
 
     private final DSLContext       ctx;
     private final EnumSet<DDLFlag> flags;
diff --git a/jOOQ/src/main/java/org/jooq/impl/DataMap.java b/jOOQ/src/main/java/org/jooq/impl/DataMap.java
index 3859c55410..d78bc11793 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DataMap.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DataMap.java
@@ -57,7 +57,7 @@ import org.jooq.impl.Utils.DataKey;
  *
  * @author Lukas Eder
  */
-class DataMap extends AbstractMap<Object, Object> {
+final class DataMap extends AbstractMap<Object, Object> {
 
     final EnumMap<DataKey, Object>   internal;
     Map<Object, Object>              external;
diff --git a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java
index 73edad3231..8e2610391c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java
@@ -55,7 +55,7 @@ import org.jooq.QueryPart;
 /**
  * @author Lukas Eder
  */
-class DateAdd<T extends java.util.Date> extends AbstractFunction<T> {
+final class DateAdd<T extends java.util.Date> extends AbstractFunction<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/DateDiff.java b/jOOQ/src/main/java/org/jooq/impl/DateDiff.java
index 786e6fb3bd..eb1da160c1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DateDiff.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DateDiff.java
@@ -51,7 +51,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class DateDiff extends AbstractFunction<Integer> {
+final class DateDiff extends AbstractFunction<Integer> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/DateOrTime.java b/jOOQ/src/main/java/org/jooq/impl/DateOrTime.java
index 8689a76dd6..c28e1e9770 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DateOrTime.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DateOrTime.java
@@ -54,7 +54,7 @@ import org.jooq.QueryPart;
 /**
  * @author Lukas Eder
  */
-class DateOrTime<T extends java.util.Date> extends AbstractFunction<T> {
+final class DateOrTime<T extends java.util.Date> extends AbstractFunction<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Decode.java b/jOOQ/src/main/java/org/jooq/impl/Decode.java
index 687c40e500..545511959b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Decode.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Decode.java
@@ -49,7 +49,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Decode<T, Z> extends AbstractFunction<Z> {
+final class Decode<T, Z> extends AbstractFunction<Z> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBindContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBindContext.java
index 26f5fa1552..640d8c3920 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultBindContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBindContext.java
@@ -50,7 +50,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class DefaultBindContext extends AbstractBindContext {
+final class DefaultBindContext extends AbstractBindContext {
 
     DefaultBindContext(Configuration configuration, PreparedStatement stmt) {
         super(configuration, stmt);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Degrees.java b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
index 04463cf3af..f9c8e6f439 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Degrees.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
@@ -52,7 +52,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Degrees extends AbstractFunction<BigDecimal> {
+final class Degrees extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
index e4570692e3..c3ebefc5d4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
@@ -64,7 +64,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class DeleteImpl<R extends Record>
+final class DeleteImpl<R extends Record>
     extends AbstractDelegatingQuery<DeleteQueryImpl<R>>
     implements
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java
index d4e0ec62b6..706346643f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DeleteQueryImpl.java
@@ -63,7 +63,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class DeleteQueryImpl<R extends Record> extends AbstractDMLQuery<R> implements DeleteQuery<R> {
+final class DeleteQueryImpl<R extends Record> extends AbstractDMLQuery<R> implements DeleteQuery<R> {
 
     private static final long           serialVersionUID = -1943687511774150929L;
     private static final Clause[]       CLAUSES          = { DELETE };
diff --git a/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java b/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java
index 1792ec4cdf..8841d59e9b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DerivedColumnListImpl.java
@@ -73,7 +73,7 @@ import org.jooq.Select;
 /**
  * @author Lukas Eder
  */
-class DerivedColumnListImpl extends AbstractQueryPart
+final class DerivedColumnListImpl extends AbstractQueryPart
 implements
 
     // [jooq-tools] START [implements-derived-column-list]
diff --git a/jOOQ/src/main/java/org/jooq/impl/DerivedTable.java b/jOOQ/src/main/java/org/jooq/impl/DerivedTable.java
index a443ab9464..66508372ad 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DerivedTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DerivedTable.java
@@ -50,7 +50,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class DerivedTable<R extends Record> extends AbstractTable<R> {
+final class DerivedTable<R extends Record> extends AbstractTable<R> {
 
     private static final long serialVersionUID = 6272398035926615668L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DivideBy.java b/jOOQ/src/main/java/org/jooq/impl/DivideBy.java
index f90bcc10aa..f8fddb518b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DivideBy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DivideBy.java
@@ -65,7 +65,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class DivideBy
+final class DivideBy
 implements
     DivideByOnStep,
     DivideByOnConditionStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
index ebf4886301..250bcdc0e4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
@@ -64,7 +64,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class DropIndexImpl extends AbstractQuery implements
+final class DropIndexImpl extends AbstractQuery implements
 
     // Cascading interface implementations for DROP INDEX behaviour
     DropIndexOnStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
index f8c2b91793..15d7f3c74e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
@@ -62,7 +62,7 @@ import org.jooq.Sequence;
 /**
  * @author Lukas Eder
  */
-class DropSequenceImpl extends AbstractQuery implements
+final class DropSequenceImpl extends AbstractQuery implements
 
     // Cascading interface implementations for DROP SEQUENCE behaviour
     DropSequenceFinalStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
index 6f1ee7d51e..f64432f84f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
@@ -61,7 +61,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class DropTableImpl extends AbstractQuery implements
+final class DropTableImpl extends AbstractQuery implements
 
     // Cascading interface implementations for DROP TABLE behaviour
     DropTableStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
index 717548b0f1..c3ed8fcb02 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
@@ -62,7 +62,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class DropViewImpl extends AbstractQuery implements
+final class DropViewImpl extends AbstractQuery implements
 
     // Cascading interface implementations for DROP VIEW behaviour
     DropViewFinalStep {
diff --git a/jOOQ/src/main/java/org/jooq/impl/Dual.java b/jOOQ/src/main/java/org/jooq/impl/Dual.java
index 6378e7cdf1..772c216c68 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Dual.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Dual.java
@@ -53,7 +53,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class Dual extends AbstractTable<Record> {
+final class Dual extends AbstractTable<Record> {
 
     private static final long          serialVersionUID = -7492790780048090156L;
     private static final Table<Record> FORCED_DUAL      = select(new Field[] { inline("X").as("DUMMY") }).asTable("DUAL");
diff --git a/jOOQ/src/main/java/org/jooq/impl/Euler.java b/jOOQ/src/main/java/org/jooq/impl/Euler.java
index 8456c4b52a..d73f74e19e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Euler.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Euler.java
@@ -52,7 +52,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Euler extends AbstractFunction<BigDecimal> {
+final class Euler extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/ExecuteListeners.java b/jOOQ/src/main/java/org/jooq/impl/ExecuteListeners.java
index 98f9d37244..d3692f213a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ExecuteListeners.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ExecuteListeners.java
@@ -58,7 +58,7 @@ import org.jooq.tools.StopWatchListener;
  *
  * @author Lukas Eder
  */
-class ExecuteListeners implements ExecuteListener {
+final class ExecuteListeners implements ExecuteListener {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/ExistsCondition.java b/jOOQ/src/main/java/org/jooq/impl/ExistsCondition.java
index 59d8201324..0415374222 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ExistsCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ExistsCondition.java
@@ -52,7 +52,7 @@ import org.jooq.Select;
 /**
  * @author Lukas Eder
  */
-class ExistsCondition extends AbstractCondition {
+final class ExistsCondition extends AbstractCondition {
 
     private static final long     serialVersionUID   = 5678338161136603292L;
     private static final Clause[] CLAUSES_EXISTS     = { CONDITION, CONDITION_EXISTS };
diff --git a/jOOQ/src/main/java/org/jooq/impl/Expression.java b/jOOQ/src/main/java/org/jooq/impl/Expression.java
index 8eefe8ec7c..d5a2badc9d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Expression.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Expression.java
@@ -89,7 +89,7 @@ import org.jooq.types.DayToSecond;
 import org.jooq.types.Interval;
 import org.jooq.types.YearToMonth;
 
-class Expression<T> extends AbstractFunction<T> {
+final class Expression<T> extends AbstractFunction<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Extract.java b/jOOQ/src/main/java/org/jooq/impl/Extract.java
index fcd001fc23..6949d496bf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Extract.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Extract.java
@@ -54,7 +54,7 @@ import org.jooq.exception.SQLDialectNotSupportedException;
 /**
  * @author Lukas Eder
  */
-class Extract extends AbstractFunction<Integer> {
+final class Extract extends AbstractFunction<Integer> {
 
     private static final long serialVersionUID = 3748640920856031034L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/FalseCondition.java b/jOOQ/src/main/java/org/jooq/impl/FalseCondition.java
index c9d0220418..9524c88a20 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FalseCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FalseCondition.java
@@ -50,7 +50,7 @@ import org.jooq.Context;
 /**
  * @author Lukas Eder
  */
-class FalseCondition extends AbstractCondition {
+final class FalseCondition extends AbstractCondition {
 
     private static final long     serialVersionUID = -3972466479081463547L;
     private static final Clause[] CLAUSES          = { CONDITION, CONDITION_COMPARISON };
diff --git a/jOOQ/src/main/java/org/jooq/impl/FetchCount.java b/jOOQ/src/main/java/org/jooq/impl/FetchCount.java
index fb3d25dc9e..472ed7b99e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FetchCount.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FetchCount.java
@@ -52,7 +52,7 @@ import org.jooq.Select;
 /**
  * @author Lukas Eder
  */
-class FetchCount extends AbstractResultQuery<Record1<Integer>> {
+final class FetchCount extends AbstractResultQuery<Record1<Integer>> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldAlias.java b/jOOQ/src/main/java/org/jooq/impl/FieldAlias.java
index a827e74313..3eecb800d2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldAlias.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldAlias.java
@@ -48,7 +48,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class FieldAlias<T> extends AbstractField<T> {
+final class FieldAlias<T> extends AbstractField<T> {
 
     private static final long     serialVersionUID = -85277321749681553L;
     private final Alias<Field<T>> alias;
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java b/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java
index 792270b083..841bdffb54 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldCondition.java
@@ -52,7 +52,7 @@ import org.jooq.QueryPartInternal;
 /**
  * @author Lukas Eder
  */
-class FieldCondition extends AbstractCondition {
+final class FieldCondition extends AbstractCondition {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldMapForInsert.java b/jOOQ/src/main/java/org/jooq/impl/FieldMapForInsert.java
index a85be45f60..77298cf0d3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldMapForInsert.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldMapForInsert.java
@@ -53,7 +53,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class FieldMapForInsert extends AbstractQueryPartMap<Field<?>, Field<?>> {
+final class FieldMapForInsert extends AbstractQueryPartMap<Field<?>, Field<?>> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java b/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java
index cc97bf00e1..f9a1d62a14 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldMapForUpdate.java
@@ -55,7 +55,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class FieldMapForUpdate extends AbstractQueryPartMap<Field<?>, Field<?>> {
+final class FieldMapForUpdate extends AbstractQueryPartMap<Field<?>, Field<?>> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java b/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java
index 2c84d6faa9..b6a6f2c250 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java
@@ -54,7 +54,7 @@ import org.jooq.Select;
 /**
  * @author Lukas Eder
  */
-class FieldMapsForInsert extends AbstractQueryPart {
+final class FieldMapsForInsert extends AbstractQueryPart {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Fields.java b/jOOQ/src/main/java/org/jooq/impl/Fields.java
index a25dcab600..52dca7c7c1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Fields.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Fields.java
@@ -63,7 +63,7 @@ import org.jooq.tools.JooqLogger;
  *
  * @author Lukas Eder
  */
-class Fields<R extends Record> extends AbstractQueryPart implements RecordType<R> {
+final class Fields<R extends Record> extends AbstractQueryPart implements RecordType<R> {
 
     private static final long       serialVersionUID = -6911012275707591576L;
     private static final JooqLogger log              = JooqLogger.getLogger(Fields.class);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Floor.java b/jOOQ/src/main/java/org/jooq/impl/Floor.java
index f7681fb4f8..00fea70a51 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Floor.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Floor.java
@@ -48,7 +48,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Floor<T extends Number> extends AbstractFunction<T> {
+final class Floor<T extends Number> extends AbstractFunction<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java b/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java
index 1ee2eae98e..9aa2decd6e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FunctionTable.java
@@ -49,7 +49,7 @@ import org.jooq.exception.SQLDialectNotSupportedException;
 /**
  * @author Lukas Eder
  */
-class FunctionTable<R extends Record> extends AbstractTable<R> {
+final class FunctionTable<R extends Record> extends AbstractTable<R> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/FutureResultImpl.java b/jOOQ/src/main/java/org/jooq/impl/FutureResultImpl.java
index 36483f53e8..7de2bf8839 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FutureResultImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FutureResultImpl.java
@@ -54,7 +54,7 @@ import org.jooq.Result;
  * @author Lukas Eder
  */
 @Deprecated
-class FutureResultImpl<R extends Record> implements FutureResult<R> {
+final class FutureResultImpl<R extends Record> implements FutureResult<R> {
 
     private final Future<Result<R>> future;
     private final ExecutorService executor;
diff --git a/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java b/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java
index c11eec0e5f..d909a30dd9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java
+++ b/jOOQ/src/main/java/org/jooq/impl/GenerateSeries.java
@@ -56,7 +56,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class GenerateSeries extends AbstractTable<Record1<Integer>> {
+final class GenerateSeries extends AbstractTable<Record1<Integer>> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Greatest.java b/jOOQ/src/main/java/org/jooq/impl/Greatest.java
index 01e5ccf7e0..670bc4abc2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Greatest.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Greatest.java
@@ -49,7 +49,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Greatest<T> extends AbstractFunction<T> {
+final class Greatest<T> extends AbstractFunction<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/GroupConcat.java b/jOOQ/src/main/java/org/jooq/impl/GroupConcat.java
index 880ba9aea9..30a5e57842 100644
--- a/jOOQ/src/main/java/org/jooq/impl/GroupConcat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/GroupConcat.java
@@ -64,7 +64,7 @@ import org.jooq.WindowSpecification;
 /**
  * @author Lukas Eder
  */
-class GroupConcat extends AbstractFunction<String> implements GroupConcatOrderByStep {
+final class GroupConcat extends AbstractFunction<String> implements GroupConcatOrderByStep {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/HintedTable.java b/jOOQ/src/main/java/org/jooq/impl/HintedTable.java
index d31aa378ef..e6c578c85e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/HintedTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/HintedTable.java
@@ -48,7 +48,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class HintedTable<R extends Record> extends AbstractTable<R> {
+final class HintedTable<R extends Record> extends AbstractTable<R> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Identifiers.java b/jOOQ/src/main/java/org/jooq/impl/Identifiers.java
index 481986f6be..603e59afab 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Identifiers.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Identifiers.java
@@ -49,7 +49,7 @@ import org.jooq.SQLDialect;
  *
  * @author Lukas Eder
  */
-class Identifiers {
+final class Identifiers {
 
     /**
      * The structure is:
diff --git a/jOOQ/src/main/java/org/jooq/impl/IdentityImpl.java b/jOOQ/src/main/java/org/jooq/impl/IdentityImpl.java
index f3a2800e31..8c218c9423 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IdentityImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IdentityImpl.java
@@ -48,7 +48,7 @@ import org.jooq.TableField;
 /**
  * @author Lukas Eder
  */
-class IdentityImpl<R extends Record, T> implements Identity<R, T> {
+final class IdentityImpl<R extends Record, T> implements Identity<R, T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/InCondition.java b/jOOQ/src/main/java/org/jooq/impl/InCondition.java
index 76c0890f61..9aba614aba 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InCondition.java
@@ -59,7 +59,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class InCondition<T> extends AbstractCondition {
+final class InCondition<T> extends AbstractCondition {
 
     private static final long     serialVersionUID = -1653924248576930761L;
     private static final int      IN_LIMIT         = 1000;
diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
index 16b1c2426f..cce83145ad 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InsertImpl.java
@@ -90,7 +90,7 @@ import org.jooq.Table;
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
 @Generated("This class was generated using jOOQ-tools")
-class InsertImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>
+final class InsertImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>
     extends AbstractDelegatingQuery<InsertQuery<R>>
     implements
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
index 787258d417..a17071eb22 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InsertQueryImpl.java
@@ -75,7 +75,7 @@ import org.jooq.exception.SQLDialectNotSupportedException;
 /**
  * @author Lukas Eder
  */
-class InsertQueryImpl<R extends Record> extends AbstractStoreQuery<R> implements InsertQuery<R> {
+final class InsertQueryImpl<R extends Record> extends AbstractStoreQuery<R> implements InsertQuery<R> {
 
     private static final long        serialVersionUID = 4466005417945353842L;
     private static final Clause[]    CLAUSES          = { INSERT };
diff --git a/jOOQ/src/main/java/org/jooq/impl/Intern.java b/jOOQ/src/main/java/org/jooq/impl/Intern.java
index 8124f45097..45a15a807f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Intern.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Intern.java
@@ -49,7 +49,7 @@ import org.jooq.Record;
 /**
  * @author Lukas Eder
  */
-class Intern implements Serializable {
+final class Intern implements Serializable {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/InternalVisitListener.java b/jOOQ/src/main/java/org/jooq/impl/InternalVisitListener.java
index e23daad5e4..60948fd5df 100644
--- a/jOOQ/src/main/java/org/jooq/impl/InternalVisitListener.java
+++ b/jOOQ/src/main/java/org/jooq/impl/InternalVisitListener.java
@@ -66,7 +66,7 @@ import org.jooq.VisitListener;
  *
  * @author Lukas Eder
  */
-class InternalVisitListener extends DefaultVisitListener {
+final class InternalVisitListener extends DefaultVisitListener {
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
index 20cf9d5198..e6eea3ae6e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
@@ -78,7 +78,7 @@ import org.jooq.SQLDialect;
 /**
  * @author Lukas Eder
  */
-class IsDistinctFrom<T> extends AbstractCondition {
+final class IsDistinctFrom<T> extends AbstractCondition {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNull.java b/jOOQ/src/main/java/org/jooq/impl/IsNull.java
index dc1eb1a909..0681e72a71 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsNull.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsNull.java
@@ -52,7 +52,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class IsNull extends AbstractCondition {
+final class IsNull extends AbstractCondition {
 
     private static final long     serialVersionUID = -747240442279619486L;
     private static final Clause[] CLAUSES_NULL     = { CONDITION, CONDITION_IS_NULL };
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONReader.java b/jOOQ/src/main/java/org/jooq/impl/JSONReader.java
index 1bd994c431..7a468819b4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONReader.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONReader.java
@@ -59,7 +59,7 @@ import org.jooq.tools.json.ParseException;
  * @author Johannes Bühler
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
-class JSONReader implements Closeable {
+final class JSONReader implements Closeable {
 
     private final BufferedReader br;
     private final JSONParser     parser;
diff --git a/jOOQ/src/main/java/org/jooq/impl/JoinTable.java b/jOOQ/src/main/java/org/jooq/impl/JoinTable.java
index 2f813f1b44..6a214adfbc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JoinTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JoinTable.java
@@ -115,7 +115,7 @@ import org.jooq.exception.DataAccessException;
  *
  * @author Lukas Eder
  */
-class JoinTable extends AbstractTable<Record> implements TableOptionalOnStep<Record>, TableOnConditionStep<Record> {
+final class JoinTable extends AbstractTable<Record> implements TableOptionalOnStep<Record>, TableOnConditionStep<Record> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/LTrim.java b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
index dd7a25b772..0a4c99456a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
@@ -49,7 +49,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class LTrim extends AbstractFunction<String> {
+final class LTrim extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Lateral.java b/jOOQ/src/main/java/org/jooq/impl/Lateral.java
index 2cb6ad4a93..292c970cce 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Lateral.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lateral.java
@@ -47,7 +47,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class Lateral<R extends Record> extends AbstractTable<R> {
+final class Lateral<R extends Record> extends AbstractTable<R> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/LeadLag.java b/jOOQ/src/main/java/org/jooq/impl/LeadLag.java
index 077833b4c9..28050be815 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LeadLag.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LeadLag.java
@@ -49,7 +49,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class LeadLag<T> extends Function<T> {
+final class LeadLag<T> extends Function<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Least.java b/jOOQ/src/main/java/org/jooq/impl/Least.java
index 6081d5e5b1..cfb8b98585 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Least.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Least.java
@@ -49,7 +49,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Least<T> extends AbstractFunction<T> {
+final class Least<T> extends AbstractFunction<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Left.java b/jOOQ/src/main/java/org/jooq/impl/Left.java
index 2439e5a188..56dfd282a0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Left.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Left.java
@@ -50,7 +50,7 @@ import org.jooq.QueryPart;
 /**
  * @author Lukas Eder
  */
-class Left extends AbstractFunction<String> {
+final class Left extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Limit.java b/jOOQ/src/main/java/org/jooq/impl/Limit.java
index d90acf7e06..21b700d5f0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Limit.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Limit.java
@@ -58,7 +58,7 @@ import org.jooq.exception.DataAccessException;
 /**
  * @author Lukas Eder
  */
-class Limit extends AbstractQueryPart {
+final class Limit extends AbstractQueryPart {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ln.java b/jOOQ/src/main/java/org/jooq/impl/Ln.java
index b0bed9aeba..7a32ad1049 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ln.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ln.java
@@ -51,7 +51,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Ln extends AbstractFunction<BigDecimal> {
+final class Ln extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/LoaderErrorImpl.java b/jOOQ/src/main/java/org/jooq/impl/LoaderErrorImpl.java
index a1528db450..4a704c6a11 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LoaderErrorImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LoaderErrorImpl.java
@@ -47,7 +47,7 @@ import org.jooq.exception.DataAccessException;
 /**
  * @author Lukas Eder
  */
-class LoaderErrorImpl implements LoaderError {
+final class LoaderErrorImpl implements LoaderError {
 
     private final DataAccessException exception;
     private final int                 rowIndex;
diff --git a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
index e908a6099f..48ba2b0c12 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
@@ -91,7 +91,7 @@ import org.xml.sax.InputSource;
  * @author Lukas Eder
  * @author Johannes Bühler
  */
-class LoaderImpl<R extends Record> implements
+final class LoaderImpl<R extends Record> implements
 
     // Cascading interface implementations for Loader behaviour
     LoaderOptionsStep<R>,
diff --git a/jOOQ/src/main/java/org/jooq/impl/Lower.java b/jOOQ/src/main/java/org/jooq/impl/Lower.java
index 6489974d74..dec38af71d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Lower.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lower.java
@@ -49,7 +49,7 @@ import org.jooq.QueryPart;
 /**
  * @author Lukas Eder
  */
-class Lower extends AbstractFunction<String> {
+final class Lower extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Lpad.java b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
index 59c495f403..1490efc07a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Lpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
@@ -50,7 +50,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Lpad extends AbstractFunction<String> {
+final class Lpad extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/MD5.java b/jOOQ/src/main/java/org/jooq/impl/MD5.java
index 93b86c7845..4cb9abc8fc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MD5.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MD5.java
@@ -48,7 +48,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class MD5 extends AbstractFunction<String> {
+final class MD5 extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/MapCondition.java b/jOOQ/src/main/java/org/jooq/impl/MapCondition.java
index 57af56f930..26293db19b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MapCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MapCondition.java
@@ -49,7 +49,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class MapCondition extends AbstractCondition {
+final class MapCondition extends AbstractCondition {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/MappingIterator.java b/jOOQ/src/main/java/org/jooq/impl/MappingIterator.java
index 4e84763aea..01c234a682 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MappingIterator.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MappingIterator.java
@@ -45,7 +45,7 @@ import java.util.Iterator;
 /**
  * @author Lukas Eder
  */
-class MappingIterator<T, U> implements Iterator<U> {
+final class MappingIterator<T, U> implements Iterator<U> {
 
     final Iterator<? extends T>            delegate;
     final Function<? super T, ? extends U> mapper;
diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
index f9447fb20b..7f52ab3ec7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
@@ -145,7 +145,7 @@ import org.jooq.tools.StringUtils;
  * @author Lukas Eder
  */
 @SuppressWarnings({ "unchecked", "rawtypes" })
-class MergeImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends AbstractQuery
+final class MergeImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends AbstractQuery
 implements
 
     // Cascading interface implementations for Merge behaviour
diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaDataFieldProvider.java b/jOOQ/src/main/java/org/jooq/impl/MetaDataFieldProvider.java
index 7118c104a9..937bcede13 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MetaDataFieldProvider.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MetaDataFieldProvider.java
@@ -72,7 +72,7 @@ import org.jooq.tools.JooqLogger;
  *
  * @author Lukas Eder
  */
-class MetaDataFieldProvider implements Serializable {
+final class MetaDataFieldProvider implements Serializable {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
index d58bd8b68b..8a5c180043 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
@@ -131,7 +131,7 @@ import org.jooq.exception.SQLDialectNotSupportedException;
  *
  * @author Lukas Eder
  */
-class MetaImpl implements Meta, Serializable {
+final class MetaImpl implements Meta, Serializable {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Mod.java b/jOOQ/src/main/java/org/jooq/impl/Mod.java
index 4f8c899a0b..ba0d475da9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Mod.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Mod.java
@@ -50,7 +50,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Mod<T> extends AbstractFunction<T> {
+final class Mod<T> extends AbstractFunction<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Mode.java b/jOOQ/src/main/java/org/jooq/impl/Mode.java
index c87dda324e..81893f3074 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Mode.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Mode.java
@@ -48,7 +48,7 @@ import org.jooq.SortField;
 /**
  * @author Lukas Eder
  */
-class Mode implements OrderedAggregateFunctionOfDeferredType {
+final class Mode implements OrderedAggregateFunctionOfDeferredType {
 
     @Override
     public final <T> AggregateFilterStep<T> withinGroupOrderBy(Field<T> field) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/NameImpl.java b/jOOQ/src/main/java/org/jooq/impl/NameImpl.java
index 1d15b008e3..79cac5b6a8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NameImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NameImpl.java
@@ -59,7 +59,7 @@ import org.jooq.tools.StringUtils;
  *
  * @author Lukas Eder
  */
-class NameImpl extends AbstractQueryPart implements Name {
+final class NameImpl extends AbstractQueryPart implements Name {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Neg.java b/jOOQ/src/main/java/org/jooq/impl/Neg.java
index c0bd3909c4..4028d7890c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Neg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Neg.java
@@ -57,7 +57,7 @@ import org.jooq.SQLDialect;
 /**
  * @author Lukas Eder
  */
-class Neg<T> extends AbstractField<T> {
+final class Neg<T> extends AbstractField<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/NotCondition.java b/jOOQ/src/main/java/org/jooq/impl/NotCondition.java
index 3c50dd8252..b77943164e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NotCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NotCondition.java
@@ -47,7 +47,7 @@ import org.jooq.Clause;
 import org.jooq.Condition;
 import org.jooq.Context;
 
-class NotCondition extends AbstractCondition {
+final class NotCondition extends AbstractCondition {
 
     private static final long     serialVersionUID = 2921001862882237932L;
     private static final Clause[] CLAUSES          = { CONDITION, CONDITION_NOT };
diff --git a/jOOQ/src/main/java/org/jooq/impl/NotField.java b/jOOQ/src/main/java/org/jooq/impl/NotField.java
index 865f5e05ef..6c26c602ce 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NotField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NotField.java
@@ -50,7 +50,7 @@ import org.jooq.Clause;
 import org.jooq.Context;
 import org.jooq.Field;
 
-class NotField extends AbstractField<Boolean> {
+final class NotField extends AbstractField<Boolean> {
 
     private static final long     serialVersionUID = 2921001862882237932L;
     private static final Clause[] CLAUSES          = { CONDITION, CONDITION_NOT };
diff --git a/jOOQ/src/main/java/org/jooq/impl/Nvl.java b/jOOQ/src/main/java/org/jooq/impl/Nvl.java
index 80c6550c45..2d00325eff 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Nvl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Nvl.java
@@ -48,7 +48,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Nvl<T> extends AbstractFunction<T> {
+final class Nvl<T> extends AbstractFunction<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Nvl2.java b/jOOQ/src/main/java/org/jooq/impl/Nvl2.java
index af8f474b96..d228f5de11 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Nvl2.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Nvl2.java
@@ -48,7 +48,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Nvl2<T> extends AbstractFunction<T> {
+final class Nvl2<T> extends AbstractFunction<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParamCollector.java b/jOOQ/src/main/java/org/jooq/impl/ParamCollector.java
index cc54726d25..4737d7bc6b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParamCollector.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParamCollector.java
@@ -62,7 +62,7 @@ import org.jooq.tools.StringUtils;
  *
  * @author Lukas Eder
  */
-class ParamCollector extends AbstractBindContext {
+final class ParamCollector extends AbstractBindContext {
 
     final Map<String, Param<?>>         resultFlat = new LinkedHashMap<String, Param<?>>();
     final Map<String, List<Param<?>>>   result     = new LinkedHashMap<String, List<Param<?>>>();
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParameterImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParameterImpl.java
index 871c048ab5..29a456d80c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParameterImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParameterImpl.java
@@ -55,7 +55,7 @@ import org.jooq.tools.StringUtils;
  *
  * @author Lukas Eder
  */
-class ParameterImpl<T> extends AbstractQueryPart implements Parameter<T> {
+final class ParameterImpl<T> extends AbstractQueryPart implements Parameter<T> {
 
     private static final long serialVersionUID = -5277225593751085577L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Pi.java b/jOOQ/src/main/java/org/jooq/impl/Pi.java
index 655b546606..5e34841d3e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Pi.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Pi.java
@@ -53,7 +53,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Pi extends AbstractFunction<BigDecimal> {
+final class Pi extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Pivot.java b/jOOQ/src/main/java/org/jooq/impl/Pivot.java
index 7b2bdd5864..4c68d117a0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Pivot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Pivot.java
@@ -68,7 +68,7 @@ import org.jooq.conf.ParamType;
  *
  * @author Lukas Eder
  */
-class Pivot<T>
+final class Pivot<T>
 extends AbstractTable<Record>
 implements
     PivotForStep,
diff --git a/jOOQ/src/main/java/org/jooq/impl/Position.java b/jOOQ/src/main/java/org/jooq/impl/Position.java
index 9cb502c400..62773987ec 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Position.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Position.java
@@ -49,7 +49,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Position extends AbstractFunction<Integer> {
+final class Position extends AbstractFunction<Integer> {
 
     private static final long   serialVersionUID = 3544690069533526544L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Power.java b/jOOQ/src/main/java/org/jooq/impl/Power.java
index bde157c386..53caf640c3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Power.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Power.java
@@ -50,7 +50,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Power extends AbstractFunction<BigDecimal> {
+final class Power extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Prior.java b/jOOQ/src/main/java/org/jooq/impl/Prior.java
index 3bde1f1b6a..bbd4dbb531 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Prior.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Prior.java
@@ -52,7 +52,7 @@ import org.jooq.conf.RenderNameStyle;
 /**
  * @author Lukas Eder
  */
-class Prior<T> extends AbstractField<T> {
+final class Prior<T> extends AbstractField<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledCallableStatement.java b/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledCallableStatement.java
index ece21fcbc3..54bf7532a7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledCallableStatement.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledCallableStatement.java
@@ -51,7 +51,7 @@ import org.jooq.tools.jdbc.DefaultCallableStatement;
  *
  * @author Lukas Eder
  */
-class ProviderEnabledCallableStatement extends DefaultCallableStatement {
+final class ProviderEnabledCallableStatement extends DefaultCallableStatement {
 
     private final ProviderEnabledConnection connection;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledConnection.java b/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledConnection.java
index d8eb514ed2..83868ce535 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledConnection.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledConnection.java
@@ -60,7 +60,7 @@ import org.jooq.tools.jdbc.DefaultConnection;
  *
  * @author Lukas Eder
  */
-class ProviderEnabledConnection extends DefaultConnection {
+final class ProviderEnabledConnection extends DefaultConnection {
 
     private final ConnectionProvider connectionProvider;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledPreparedStatement.java b/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledPreparedStatement.java
index 0a5dc557b8..a1112133fc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledPreparedStatement.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledPreparedStatement.java
@@ -51,7 +51,7 @@ import org.jooq.tools.jdbc.DefaultPreparedStatement;
  *
  * @author Lukas Eder
  */
-class ProviderEnabledPreparedStatement extends DefaultPreparedStatement {
+final class ProviderEnabledPreparedStatement extends DefaultPreparedStatement {
 
     private final ProviderEnabledConnection connection;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledStatement.java b/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledStatement.java
index 6d2e62e421..c8935b0895 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledStatement.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ProviderEnabledStatement.java
@@ -51,7 +51,7 @@ import org.jooq.tools.jdbc.DefaultStatement;
  *
  * @author Lukas Eder
  */
-class ProviderEnabledStatement extends DefaultStatement {
+final class ProviderEnabledStatement extends DefaultStatement {
 
     private final ProviderEnabledConnection connection;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/QualifiedField.java b/jOOQ/src/main/java/org/jooq/impl/QualifiedField.java
index 5396928cc8..ab4794a27d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QualifiedField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QualifiedField.java
@@ -57,7 +57,7 @@ import org.jooq.TableField;
  *
  * @author Lukas Eder
  */
-class QualifiedField<T> extends AbstractField<T> implements TableField<Record, T> {
+final class QualifiedField<T> extends AbstractField<T> implements TableField<Record, T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/QualifiedTable.java b/jOOQ/src/main/java/org/jooq/impl/QualifiedTable.java
index b993b0cca8..24565dfca0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QualifiedTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QualifiedTable.java
@@ -56,7 +56,7 @@ import org.jooq.Table;
  *
  * @author Lukas Eder
  */
-class QualifiedTable extends AbstractTable<Record> {
+final class QualifiedTable extends AbstractTable<Record> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/QuantifiedComparisonCondition.java b/jOOQ/src/main/java/org/jooq/impl/QuantifiedComparisonCondition.java
index 1ccf83df5a..7a56d6e315 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QuantifiedComparisonCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QuantifiedComparisonCondition.java
@@ -54,7 +54,7 @@ import org.jooq.QuantifiedSelect;
 /**
  * @author Lukas Eder
  */
-class QuantifiedComparisonCondition extends AbstractCondition {
+final class QuantifiedComparisonCondition extends AbstractCondition {
 
     private static final long         serialVersionUID = -402776705884329740L;
     private static final Clause[]     CLAUSES          = { CONDITION, CONDITION_BETWEEN };
diff --git a/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java
index 27908b3b03..a992f2535e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java
@@ -61,7 +61,7 @@ import org.jooq.Select;
 /**
  * @author Lukas Eder
  */
-class QuantifiedSelectImpl<R extends Record> extends AbstractQueryPart implements QuantifiedSelect<R> {
+final class QuantifiedSelectImpl<R extends Record> extends AbstractQueryPart implements QuantifiedSelect<R> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/QueriesImpl.java b/jOOQ/src/main/java/org/jooq/impl/QueriesImpl.java
index f7f6430ed4..3fa7c7e491 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QueriesImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QueriesImpl.java
@@ -48,7 +48,7 @@ import org.jooq.Query;
 /**
  * @author Lukas Eder
  */
-class QueriesImpl implements Queries {
+final class QueriesImpl implements Queries {
 
     private final Collection<? extends Query> queries;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RTrim.java b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
index 264bf149e6..0c8bf16872 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
@@ -49,7 +49,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class RTrim extends AbstractFunction<String> {
+final class RTrim extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Radians.java b/jOOQ/src/main/java/org/jooq/impl/Radians.java
index 6cf1e9f479..32bc72138d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Radians.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Radians.java
@@ -52,7 +52,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Radians extends AbstractFunction<BigDecimal> {
+final class Radians extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rand.java b/jOOQ/src/main/java/org/jooq/impl/Rand.java
index 9f3c188ae2..3e3fddcc85 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rand.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rand.java
@@ -51,7 +51,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Rand extends AbstractFunction<BigDecimal> {
+final class Rand extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordCondition.java b/jOOQ/src/main/java/org/jooq/impl/RecordCondition.java
index fb1cd9b2ee..f98281a4f5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordCondition.java
@@ -47,7 +47,7 @@ import org.jooq.Record;
 /**
  * @author Lukas Eder
  */
-class RecordCondition extends AbstractCondition {
+final class RecordCondition extends AbstractCondition {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordDelegate.java b/jOOQ/src/main/java/org/jooq/impl/RecordDelegate.java
index 9b90fb314b..d26d9e1c31 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordDelegate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordDelegate.java
@@ -59,7 +59,7 @@ import org.jooq.exception.ControlFlowSignal;
  *
  * @author Lukas Eder
  */
-class RecordDelegate<R extends Record> {
+final class RecordDelegate<R extends Record> {
 
     private final Configuration       configuration;
     private final R                   record;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RecordImpl.java b/jOOQ/src/main/java/org/jooq/impl/RecordImpl.java
index d7dc86330e..bcbb2b460f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RecordImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RecordImpl.java
@@ -80,7 +80,7 @@ import org.jooq.Record22;
  */
 @Generated("This class was generated using jOOQ-tools")
 @SuppressWarnings({ "unchecked", "rawtypes" })
-class RecordImpl<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends AbstractRecord
+final class RecordImpl<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends AbstractRecord
 implements
 
     // This record implementation implements all record types. Type-safety is
diff --git a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
index 203798c516..90a209f9f1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
@@ -65,7 +65,7 @@ import org.jooq.exception.DetachedException;
 /**
  * @author Lukas Eder
  */
-class ReferenceImpl<R extends Record, O extends Record> extends AbstractKey<R> implements ForeignKey<R, O> {
+final class ReferenceImpl<R extends Record, O extends Record> extends AbstractKey<R> implements ForeignKey<R, O> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java b/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java
index d3b033083a..423dc7b76d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java
@@ -50,7 +50,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class RegexpLike extends AbstractCondition {
+final class RegexpLike extends AbstractCondition {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Repeat.java b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
index 9dae3ba409..7e22da920e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Repeat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
@@ -48,7 +48,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Repeat extends AbstractFunction<String> {
+final class Repeat extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java
index 24bb345f4c..fdb7ec1405 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Replace.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java
@@ -50,7 +50,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Replace extends AbstractFunction<String> {
+final class Replace extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
index 60d7c1fbac..95efb63c21 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ResultImpl.java
@@ -137,7 +137,7 @@ import org.xml.sax.helpers.AttributesImpl;
  * @author Ivan Dugic
  */
 @SuppressWarnings({"rawtypes", "unchecked" })
-class ResultImpl<R extends Record> implements Result<R>, AttachableInternal {
+final class ResultImpl<R extends Record> implements Result<R>, AttachableInternal {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/ResultsImpl.java b/jOOQ/src/main/java/org/jooq/impl/ResultsImpl.java
index 660bc25998..916c638ecf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ResultsImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ResultsImpl.java
@@ -54,7 +54,7 @@ import org.jooq.Results;
 /**
  * @author Lukas Eder
  */
-class ResultsImpl extends AbstractList<Result<Record>> implements Results, AttachableInternal {
+final class ResultsImpl extends AbstractList<Result<Record>> implements Results, AttachableInternal {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Reverse.java b/jOOQ/src/main/java/org/jooq/impl/Reverse.java
index a3563ca5f2..fc0a0c04f1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Reverse.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Reverse.java
@@ -47,7 +47,7 @@ import org.jooq.QueryPart;
 /**
  * @author Lukas Eder
  */
-class Reverse extends AbstractFunction<String> {
+final class Reverse extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Right.java b/jOOQ/src/main/java/org/jooq/impl/Right.java
index 5dff0f9ab9..47198e5160 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Right.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Right.java
@@ -50,7 +50,7 @@ import org.jooq.QueryPart;
 /**
  * @author Lukas Eder
  */
-class Right extends AbstractFunction<String> {
+final class Right extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rollup.java b/jOOQ/src/main/java/org/jooq/impl/Rollup.java
index 18ccf9c0ba..7d0c7b0de7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rollup.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rollup.java
@@ -51,7 +51,7 @@ import org.jooq.QueryPart;
 /**
  * @author Lukas Eder
  */
-class Rollup extends AbstractField<Object> {
+final class Rollup extends AbstractField<Object> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Round.java b/jOOQ/src/main/java/org/jooq/impl/Round.java
index 4056a18cd9..17de972bee 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Round.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Round.java
@@ -51,7 +51,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Round<T extends Number> extends AbstractFunction<T> {
+final class Round<T extends Number> extends AbstractFunction<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java
index 0583f7a4d9..8f890773fd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java
@@ -152,7 +152,7 @@ import org.jooq.RowN;
  */
 @Generated("This class was generated using jOOQ-tools")
 @SuppressWarnings({ "rawtypes", "unchecked" })
-class RowBetweenCondition<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends AbstractCondition
+final class RowBetweenCondition<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends AbstractCondition
 implements
 
     // This BetweenAndStep implementation implements all types. Type-safety is
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowCondition.java
index 79a1849e5c..e5a022df68 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowCondition.java
@@ -81,7 +81,7 @@ import org.jooq.SQLDialect;
  * @author Lukas Eder
  */
 @SuppressWarnings({ "unchecked", "rawtypes" })
-class RowCondition extends AbstractCondition {
+final class RowCondition extends AbstractCondition {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowField.java b/jOOQ/src/main/java/org/jooq/impl/RowField.java
index 9361e67603..da66b67183 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowField.java
@@ -52,7 +52,7 @@ import org.jooq.Row;
 /**
  * @author Lukas Eder
  */
-class RowField<ROW extends Row, REC extends Record> extends AbstractField<REC> {
+final class RowField<ROW extends Row, REC extends Record> extends AbstractField<REC> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl.java
index 170623ca50..56aed075e5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl.java
@@ -135,7 +135,7 @@ import org.jooq.Select;
  */
 @Generated("This class was generated using jOOQ-tools")
 @SuppressWarnings({ "rawtypes", "unchecked" })
-class RowImpl<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends AbstractQueryPart
+final class RowImpl<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends AbstractQueryPart
 implements
 
     // This row implementation implements all row types. Type-safety is
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java
index d5d38c59d2..fd6a3f3f50 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowInCondition.java
@@ -74,7 +74,7 @@ import org.jooq.Row;
 /**
  * @author Lukas Eder
  */
-class RowInCondition extends AbstractCondition {
+final class RowInCondition extends AbstractCondition {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowIsNull.java b/jOOQ/src/main/java/org/jooq/impl/RowIsNull.java
index 748cdd8120..d2b937e39d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowIsNull.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowIsNull.java
@@ -75,7 +75,7 @@ import org.jooq.Row;
 /**
  * @author Lukas Eder
  */
-class RowIsNull extends AbstractCondition {
+final class RowIsNull extends AbstractCondition {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowOverlapsCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowOverlapsCondition.java
index a5fda761ec..431d04ff24 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowOverlapsCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowOverlapsCondition.java
@@ -71,7 +71,7 @@ import org.jooq.Row2;
 /**
  * @author Lukas Eder
  */
-class RowOverlapsCondition<T1, T2> extends AbstractCondition {
+final class RowOverlapsCondition<T1, T2> extends AbstractCondition {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java
index 9ad260465e..d3ce48f527 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowSubqueryCondition.java
@@ -83,7 +83,7 @@ import org.jooq.Select;
 /**
  * @author Lukas Eder
  */
-class RowSubqueryCondition extends AbstractCondition {
+final class RowSubqueryCondition extends AbstractCondition {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowsFrom.java b/jOOQ/src/main/java/org/jooq/impl/RowsFrom.java
index d4f0f71686..8347b66784 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowsFrom.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowsFrom.java
@@ -52,7 +52,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class RowsFrom extends AbstractTable<Record> {
+final class RowsFrom extends AbstractTable<Record> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rpad.java b/jOOQ/src/main/java/org/jooq/impl/Rpad.java
index 3c959e284f..cf07a2f6d7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rpad.java
@@ -50,7 +50,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Rpad extends AbstractFunction<String> {
+final class Rpad extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLCondition.java b/jOOQ/src/main/java/org/jooq/impl/SQLCondition.java
index ccf1031262..7f3acc7a5a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SQLCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SQLCondition.java
@@ -43,7 +43,7 @@ package org.jooq.impl;
 import org.jooq.Context;
 import org.jooq.QueryPart;
 
-class SQLCondition extends AbstractCondition {
+final class SQLCondition extends AbstractCondition {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLField.java b/jOOQ/src/main/java/org/jooq/impl/SQLField.java
index 132d937da6..2fc0f42f24 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SQLField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SQLField.java
@@ -44,7 +44,7 @@ import org.jooq.Context;
 import org.jooq.DataType;
 import org.jooq.QueryPart;
 
-class SQLField<T> extends AbstractField<T> {
+final class SQLField<T> extends AbstractField<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLImpl.java b/jOOQ/src/main/java/org/jooq/impl/SQLImpl.java
index d73e82becc..621ea4146b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SQLImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SQLImpl.java
@@ -49,7 +49,7 @@ import org.jooq.Context;
 import org.jooq.QueryPart;
 import org.jooq.SQL;
 
-class SQLImpl extends AbstractQueryPart implements SQL {
+final class SQLImpl extends AbstractQueryPart implements SQL {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLInline.java b/jOOQ/src/main/java/org/jooq/impl/SQLInline.java
index 6af716d62e..203cfcc806 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SQLInline.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SQLInline.java
@@ -52,7 +52,7 @@ import org.jooq.conf.ParamType;
 /**
  * @author Lukas Eder
  */
-class SQLInline extends AbstractQueryPart implements SQL {
+final class SQLInline extends AbstractQueryPart implements SQL {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLQuery.java b/jOOQ/src/main/java/org/jooq/impl/SQLQuery.java
index 415041e26a..31c9888143 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SQLQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SQLQuery.java
@@ -49,7 +49,7 @@ import org.jooq.QueryPartInternal;
 /**
  * @author Lukas Eder
  */
-class SQLQuery extends AbstractQuery {
+final class SQLQuery extends AbstractQuery {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/SQLResultQuery.java
index 1719ab611d..c3f5628212 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SQLResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SQLResultQuery.java
@@ -55,7 +55,7 @@ import org.jooq.Record;
  *
  * @author Lukas Eder
  */
-class SQLResultQuery extends AbstractResultQuery<Record> {
+final class SQLResultQuery extends AbstractResultQuery<Record> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/SQLTable.java b/jOOQ/src/main/java/org/jooq/impl/SQLTable.java
index 7eb8e05997..dbae4000f3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SQLTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SQLTable.java
@@ -48,7 +48,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class SQLTable extends AbstractTable<Record> {
+final class SQLTable extends AbstractTable<Record> {
 
     private static final long serialVersionUID = -5122023013463718796L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ScalarSubquery.java b/jOOQ/src/main/java/org/jooq/impl/ScalarSubquery.java
index 3a7d7f6e0a..bebd4f1ea4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ScalarSubquery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ScalarSubquery.java
@@ -49,7 +49,7 @@ import org.jooq.Select;
 /**
  * @author Lukas Eder
  */
-class ScalarSubquery<T> extends AbstractField<T> {
+final class ScalarSubquery<T> extends AbstractField<T> {
 
     private static final long serialVersionUID = 3463144434073231750L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectFieldList.java b/jOOQ/src/main/java/org/jooq/impl/SelectFieldList.java
index 99227f207b..50dc8f18bc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectFieldList.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectFieldList.java
@@ -50,7 +50,7 @@ import org.jooq.SelectField;
 /**
  * @author Lukas Eder
  */
-class SelectFieldList extends QueryPartList<Field<?>> {
+final class SelectFieldList extends QueryPartList<Field<?>> {
 
     private static final long serialVersionUID = 8850104968428500798L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
index d1810626b0..059fa2968c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
@@ -134,7 +134,7 @@ import org.jooq.exception.MappingException;
  * @author Lukas Eder
  */
 @SuppressWarnings({ "unchecked", "rawtypes" })
-class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends AbstractDelegatingQuery<Select<R>> implements
+final class SelectImpl<R extends Record, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends AbstractDelegatingQuery<Select<R>> implements
 
     // Cascading interface implementations for Select behaviour
     SelectSelectStep<R>,
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index c82ebf75ca..c364c5e067 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -153,7 +153,7 @@ import org.jooq.tools.StringUtils;
  *
  * @author Lukas Eder
  */
-class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> implements SelectQuery<R> {
+final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> implements SelectQuery<R> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/SettingsEnabledConnection.java b/jOOQ/src/main/java/org/jooq/impl/SettingsEnabledConnection.java
index 58cc7660d4..53bbdecd77 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SettingsEnabledConnection.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SettingsEnabledConnection.java
@@ -56,7 +56,7 @@ import org.jooq.tools.jdbc.DefaultConnection;
  *
  * @author Lukas Eder
  */
-class SettingsEnabledConnection extends DefaultConnection {
+final class SettingsEnabledConnection extends DefaultConnection {
 
     private final Settings settings;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/SettingsEnabledPreparedStatement.java b/jOOQ/src/main/java/org/jooq/impl/SettingsEnabledPreparedStatement.java
index f7f83f3015..39e5e05e8d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SettingsEnabledPreparedStatement.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SettingsEnabledPreparedStatement.java
@@ -71,7 +71,7 @@ import org.jooq.tools.jdbc.DefaultStatement;
  *
  * @author Lukas Eder
  */
-class SettingsEnabledPreparedStatement extends DefaultStatement implements PreparedStatement {
+final class SettingsEnabledPreparedStatement extends DefaultStatement implements PreparedStatement {
 
     private final Connection connection;
     private final MethodType methodType;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sign.java b/jOOQ/src/main/java/org/jooq/impl/Sign.java
index 878eb3c44a..725f08d684 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sign.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sign.java
@@ -51,7 +51,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Sign extends AbstractFunction<Integer> {
+final class Sign extends AbstractFunction<Integer> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sinh.java b/jOOQ/src/main/java/org/jooq/impl/Sinh.java
index 8e1cda1f19..d458e7b537 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sinh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sinh.java
@@ -52,7 +52,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Sinh extends AbstractFunction<BigDecimal> {
+final class Sinh extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java
index 5606b6b7e8..6a47b4591e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java
@@ -50,7 +50,7 @@ import org.jooq.Field;
 import org.jooq.SortField;
 import org.jooq.SortOrder;
 
-class SortFieldImpl<T> extends AbstractQueryPart implements SortField<T> {
+final class SortFieldImpl<T> extends AbstractQueryPart implements SortField<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/SortFieldList.java b/jOOQ/src/main/java/org/jooq/impl/SortFieldList.java
index 30cb72e7c7..f920be5008 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SortFieldList.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SortFieldList.java
@@ -53,7 +53,7 @@ import org.jooq.SortOrder;
 /**
  * @author Lukas Eder
  */
-class SortFieldList extends QueryPartList<SortField<?>> {
+final class SortFieldList extends QueryPartList<SortField<?>> {
 
     private static final long serialVersionUID = -1825164005148183725L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Space.java b/jOOQ/src/main/java/org/jooq/impl/Space.java
index eeee70b121..2faa672602 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Space.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Space.java
@@ -44,7 +44,7 @@ import org.jooq.Configuration;
 import org.jooq.Field;
 import org.jooq.QueryPart;
 
-class Space extends AbstractFunction<String> {
+final class Space extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
index 95d637f593..9201cb0040 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
@@ -50,7 +50,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Sqrt extends AbstractFunction<BigDecimal> {
+final class Sqrt extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Substring.java b/jOOQ/src/main/java/org/jooq/impl/Substring.java
index 2991d88599..ac0b4836fc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Substring.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Substring.java
@@ -50,7 +50,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Substring extends AbstractFunction<String> {
+final class Substring extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableAlias.java b/jOOQ/src/main/java/org/jooq/impl/TableAlias.java
index 0ff1014135..1263554ddb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableAlias.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableAlias.java
@@ -59,7 +59,7 @@ import org.jooq.UniqueKey;
 /**
  * @author Lukas Eder
  */
-class TableAlias<R extends Record> extends AbstractTable<R> {
+final class TableAlias<R extends Record> extends AbstractTable<R> {
 
     private static final long serialVersionUID = -8417114874567698325L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableComparison.java b/jOOQ/src/main/java/org/jooq/impl/TableComparison.java
index fb2717f763..c2fac45b1e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableComparison.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableComparison.java
@@ -52,7 +52,7 @@ import org.jooq.UniqueKey;
 /**
  * @author Lukas Eder
  */
-class TableComparison<R extends Record> extends AbstractCondition {
+final class TableComparison<R extends Record> extends AbstractCondition {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
index 14821e7f0b..5dc26aabbb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableFieldImpl.java
@@ -59,7 +59,7 @@ import org.jooq.tools.StringUtils;
  *
  * @author Lukas Eder
  */
-class TableFieldImpl<R extends Record, T> extends AbstractField<T> implements TableField<R, T> {
+final class TableFieldImpl<R extends Record, T> extends AbstractField<T> implements TableField<R, T> {
 
     private static final long     serialVersionUID = -2211214195583539735L;
     private static final Clause[] CLAUSES          = { FIELD, FIELD_REFERENCE };
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableList.java b/jOOQ/src/main/java/org/jooq/impl/TableList.java
index 5894ca31c3..1ecd1a2065 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableList.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableList.java
@@ -57,7 +57,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class TableList extends QueryPartList<Table<?>> {
+final class TableList extends QueryPartList<Table<?>> {
 
     private static final long serialVersionUID = -8545559185481762229L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tanh.java b/jOOQ/src/main/java/org/jooq/impl/Tanh.java
index 41d16dff3e..405027cebd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tanh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tanh.java
@@ -52,7 +52,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Tanh extends AbstractFunction<BigDecimal> {
+final class Tanh extends AbstractFunction<BigDecimal> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java b/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java
index 684c6829f7..fdf953de97 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java
@@ -53,7 +53,7 @@ import org.jooq.types.DayToSecond;
 /**
  * @author Lukas Eder
  */
-class TimestampDiff extends AbstractFunction<DayToSecond> {
+final class TimestampDiff extends AbstractFunction<DayToSecond> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Trim.java b/jOOQ/src/main/java/org/jooq/impl/Trim.java
index a8da7ea332..312d29ee70 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Trim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Trim.java
@@ -48,7 +48,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Trim extends AbstractFunction<String> {
+final class Trim extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/TrueCondition.java b/jOOQ/src/main/java/org/jooq/impl/TrueCondition.java
index 96ad04a213..c10b1cb14c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TrueCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TrueCondition.java
@@ -50,7 +50,7 @@ import org.jooq.Context;
 /**
  * @author Lukas Eder
  */
-class TrueCondition extends AbstractCondition {
+final class TrueCondition extends AbstractCondition {
 
     private static final long     serialVersionUID = 775364624704563687L;
     private static final Clause[] CLAUSES          = { CONDITION, CONDITION_COMPARISON };
diff --git a/jOOQ/src/main/java/org/jooq/impl/Trunc.java b/jOOQ/src/main/java/org/jooq/impl/Trunc.java
index c4233a365a..6438e72e5a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Trunc.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Trunc.java
@@ -57,7 +57,7 @@ import org.jooq.Field;
 /**
  * @author Lukas Eder
  */
-class Trunc<T> extends AbstractFunction<T> {
+final class Trunc<T> extends AbstractFunction<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/TruncDate.java b/jOOQ/src/main/java/org/jooq/impl/TruncDate.java
index f088a876dd..5efefd61da 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TruncDate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TruncDate.java
@@ -53,7 +53,7 @@ import org.jooq.QueryPart;
 /**
  * @author Lukas Eder
  */
-class TruncDate<T extends java.util.Date> extends AbstractFunction<T> {
+final class TruncDate<T extends java.util.Date> extends AbstractFunction<T> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
index f08014e646..a28ed7b1db 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
@@ -56,7 +56,7 @@ import org.jooq.TruncateIdentityStep;
 /**
  * @author Lukas Eder
  */
-class TruncateImpl<R extends Record> extends AbstractQuery implements
+final class TruncateImpl<R extends Record> extends AbstractQuery implements
 
     // Cascading interface implementations for Truncate behaviour
     TruncateIdentityStep<R> {
diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTConstant.java b/jOOQ/src/main/java/org/jooq/impl/UDTConstant.java
index b4ea7b85c9..07c68cdd7e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UDTConstant.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UDTConstant.java
@@ -54,7 +54,7 @@ import org.jooq.exception.SQLDialectNotSupportedException;
 /**
  * @author Lukas Eder
  */
-class UDTConstant<R extends UDTRecord<R>> extends AbstractParam<R> {
+final class UDTConstant<R extends UDTRecord<R>> extends AbstractParam<R> {
 
     private static final long serialVersionUID = 6807729087019209084L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTDataType.java b/jOOQ/src/main/java/org/jooq/impl/UDTDataType.java
index cb602ce162..2250e96b16 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UDTDataType.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UDTDataType.java
@@ -47,7 +47,7 @@ import org.jooq.UDTRecord;
 /**
  * @author Lukas Eder
  */
-class UDTDataType<R extends UDTRecord<R>> extends DefaultDataType<R> {
+final class UDTDataType<R extends UDTRecord<R>> extends DefaultDataType<R> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java
index 421ec8e505..58a19a99dd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UDTFieldImpl.java
@@ -53,7 +53,7 @@ import org.jooq.UDTRecord;
  *
  * @author Lukas Eder
  */
-class UDTFieldImpl<R extends UDTRecord<R>, T> extends AbstractField<T> implements UDTField<R, T> {
+final class UDTFieldImpl<R extends UDTRecord<R>, T> extends AbstractField<T> implements UDTField<R, T> {
 
     private static final long serialVersionUID = -2211214195583539735L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/UniqueKeyImpl.java b/jOOQ/src/main/java/org/jooq/impl/UniqueKeyImpl.java
index c629ea2ec3..02700c5261 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UniqueKeyImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UniqueKeyImpl.java
@@ -54,7 +54,7 @@ import org.jooq.UniqueKey;
 /**
  * @author Lukas Eder
  */
-class UniqueKeyImpl<R extends Record> extends AbstractKey<R> implements UniqueKey<R> {
+final class UniqueKeyImpl<R extends Record> extends AbstractKey<R> implements UniqueKey<R> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
index 75a1869282..b67f9d8652 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
@@ -121,7 +121,7 @@ import org.jooq.UpdateQuery;
 /**
  * @author Lukas Eder
  */
-class UpdateQueryImpl<R extends Record> extends AbstractStoreQuery<R> implements UpdateQuery<R> {
+final class UpdateQueryImpl<R extends Record> extends AbstractStoreQuery<R> implements UpdateQuery<R> {
 
     private static final long           serialVersionUID = -660460731970074719L;
     private static final Clause[]       CLAUSES          = { UPDATE };
diff --git a/jOOQ/src/main/java/org/jooq/impl/Upper.java b/jOOQ/src/main/java/org/jooq/impl/Upper.java
index 4bfef883e6..a9dce02858 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Upper.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Upper.java
@@ -49,7 +49,7 @@ import org.jooq.QueryPart;
 /**
  * @author Lukas Eder
  */
-class Upper extends AbstractFunction<String> {
+final class Upper extends AbstractFunction<String> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/Val.java b/jOOQ/src/main/java/org/jooq/impl/Val.java
index a214bbb8bf..0e5be04fbc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Val.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Val.java
@@ -55,7 +55,7 @@ import org.jooq.tools.StringUtils;
 /**
  * @author Lukas Eder
  */
-class Val<T> extends AbstractParam<T> {
+final class Val<T> extends AbstractParam<T> {
 
     private static final long   serialVersionUID = 6807729087019209084L;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Values.java b/jOOQ/src/main/java/org/jooq/impl/Values.java
index 4fcc030817..0add80831b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Values.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Values.java
@@ -53,7 +53,7 @@ import org.jooq.Table;
  *
  * @author Lukas Eder
  */
-class Values<R extends Record> extends AbstractTable<R> {
+final class Values<R extends Record> extends AbstractTable<R> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java b/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java
index 3782e05002..f03ad367fb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/WindowDefinitionImpl.java
@@ -52,7 +52,7 @@ import org.jooq.WindowSpecification;
 /**
  * @author Lukas Eder
  */
-class WindowDefinitionImpl extends AbstractQueryPart implements WindowDefinition {
+final class WindowDefinitionImpl extends AbstractQueryPart implements WindowDefinition {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/WindowList.java b/jOOQ/src/main/java/org/jooq/impl/WindowList.java
index 1062a3c002..8236f208b8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/WindowList.java
+++ b/jOOQ/src/main/java/org/jooq/impl/WindowList.java
@@ -47,7 +47,7 @@ import org.jooq.WindowDefinition;
  *
  * @author Lukas Eder
  */
-class WindowList extends QueryPartList<WindowDefinition> {
+final class WindowList extends QueryPartList<WindowDefinition> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java b/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java
index 2f0774f4f6..108b2e1215 100644
--- a/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/WindowSpecificationImpl.java
@@ -63,7 +63,7 @@ import org.jooq.WindowSpecificationRowsAndStep;
 /**
  * @author Lukas Eder
  */
-class WindowSpecificationImpl extends AbstractQueryPart implements
+final class WindowSpecificationImpl extends AbstractQueryPart implements
 
     // Cascading interface implementations for window specification behaviour
     WindowSpecificationPartitionByStep,
diff --git a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
index 0cc8e276c8..786eff8fde 100644
--- a/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/WithImpl.java
@@ -122,7 +122,7 @@ import org.jooq.WithStep;
  * @author Lukas Eder
  */
 @SuppressWarnings({ "rawtypes", "unchecked" })
-class WithImpl extends AbstractQueryPart
+final class WithImpl extends AbstractQueryPart
 implements
     WithAsStep,
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/WithTable.java b/jOOQ/src/main/java/org/jooq/impl/WithTable.java
index 142ca03d67..c6ed8fdd43 100644
--- a/jOOQ/src/main/java/org/jooq/impl/WithTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/WithTable.java
@@ -47,7 +47,7 @@ import org.jooq.Table;
 /**
  * @author Lukas Eder
  */
-class WithTable<R extends Record> extends AbstractTable<R> {
+final class WithTable<R extends Record> extends AbstractTable<R> {
 
     /**
      * Generated UID
diff --git a/jOOQ/src/main/java/org/jooq/impl/WrappedList.java b/jOOQ/src/main/java/org/jooq/impl/WrappedList.java
index 7691911570..c2994d6a8b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/WrappedList.java
+++ b/jOOQ/src/main/java/org/jooq/impl/WrappedList.java
@@ -46,7 +46,7 @@ import org.jooq.Context;
 /**
  * @author Lukas Eder
  */
-class WrappedList extends AbstractQueryPart {
+final class WrappedList extends AbstractQueryPart {
 
     /**
      * Generated UID