diff --git a/jOOQ/src/main/java/org/jooq/impl/Abs.java b/jOOQ/src/main/java/org/jooq/impl/Abs.java
index 438a577d15..e02603cb43 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Abs.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Abs.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Acos.java b/jOOQ/src/main/java/org/jooq/impl/Acos.java
index 6450d30059..1cc19dc079 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Acos.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Acos.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
index 63031d89c9..66b71e9c03 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDatabaseImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
index 9e4ad20001..8b9cacf0c2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterDomainImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
index 3eb29c8e8e..7cb413fc46 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterIndexImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
index 6d6316a3d6..b8580b048c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterSchemaImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
index 018d49b782..25b1581143 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterSequenceImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java
index 0cc1d1d3df..ceb48966ed 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterTypeImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
index fd957cb29f..d7223149e0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterViewImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/And.java b/jOOQ/src/main/java/org/jooq/impl/And.java
index ce2f57a9ca..f35290fe05 100644
--- a/jOOQ/src/main/java/org/jooq/impl/And.java
+++ b/jOOQ/src/main/java/org/jooq/impl/And.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
@@ -118,7 +120,7 @@ extends
      * @deprecated - This will be implemented using QOM.replace, instead.
      */
     @Deprecated
-    final Condition transform(java.util.function.Function<? super Condition, ? extends Condition> function) {
+    final Condition transform(Function<? super Condition, ? extends Condition> function) {
         Condition t1 = arg1 instanceof And
             ? ((And) arg1).transform(function)
             : arg1 instanceof Or
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java b/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java
index 36d62fe350..3086a4217b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayGet.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ascii.java b/jOOQ/src/main/java/org/jooq/impl/Ascii.java
index 3538a013a2..aabfc547e6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ascii.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ascii.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Asin.java b/jOOQ/src/main/java/org/jooq/impl/Asin.java
index cabeab1ece..50c0b14cae 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Asin.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Asin.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Atan.java b/jOOQ/src/main/java/org/jooq/impl/Atan.java
index 9b818c155d..5041f830d9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Atan.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Atan.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Atan2.java b/jOOQ/src/main/java/org/jooq/impl/Atan2.java
index e58d98d4e9..3d1b31f7ed 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Atan2.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Atan2.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitAnd.java b/jOOQ/src/main/java/org/jooq/impl/BitAnd.java
index 40cb5ba309..8713751d0e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitAnd.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitAnd.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java
index 2274fbc64e..861293582c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitAndAgg.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitCount.java b/jOOQ/src/main/java/org/jooq/impl/BitCount.java
index c8ab292136..ac7aa20026 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitCount.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitCount.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitLength.java b/jOOQ/src/main/java/org/jooq/impl/BitLength.java
index c434d8ff7f..72b66024b9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitLength.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNand.java b/jOOQ/src/main/java/org/jooq/impl/BitNand.java
index cf13d67796..57d3f65249 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitNand.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitNand.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNor.java b/jOOQ/src/main/java/org/jooq/impl/BitNor.java
index 9372aa7f8a..9a085a0891 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitNor.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitNor.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitNot.java b/jOOQ/src/main/java/org/jooq/impl/BitNot.java
index 7b8ea26d9b..86056fc958 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitNot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitNot.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitOr.java b/jOOQ/src/main/java/org/jooq/impl/BitOr.java
index 9ee3948a99..24e17ee75c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitOr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitOr.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java
index f3e3940361..37443d4f74 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitOrAgg.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXNor.java b/jOOQ/src/main/java/org/jooq/impl/BitXNor.java
index dc9130c2e1..6d4b6cd153 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitXNor.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitXNor.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXor.java b/jOOQ/src/main/java/org/jooq/impl/BitXor.java
index 9234e192a9..678183ffca 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitXor.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitXor.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java b/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java
index caf9b2d325..89d65a4d04 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitXorAgg.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Call.java b/jOOQ/src/main/java/org/jooq/impl/Call.java
index bdcbdba8fd..83cf23b4d9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Call.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Call.java
@@ -155,6 +155,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cardinality.java b/jOOQ/src/main/java/org/jooq/impl/Cardinality.java
index 7958f01606..738bd7d53f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cardinality.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cardinality.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ceil.java b/jOOQ/src/main/java/org/jooq/impl/Ceil.java
index c0ac41130d..ae87ad9aec 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ceil.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ceil.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CharLength.java b/jOOQ/src/main/java/org/jooq/impl/CharLength.java
index e6951cfa5b..5fe1e522ad 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CharLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CharLength.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Chr.java b/jOOQ/src/main/java/org/jooq/impl/Chr.java
index 99d3c80e00..1ceae229d6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Chr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Chr.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
index ea91165d83..8f03e6b05d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CommentOnImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
index c628e24f40..07fdf9832f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java
index 92a67ac8bc..37f3e645b7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsCycle.java
@@ -114,6 +114,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java
index 92a67ac8bc..37f3e645b7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByIsLeaf.java
@@ -114,6 +114,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java b/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java
index 37f3e645b7..2d870d65b2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConnectByRoot.java
@@ -116,6 +116,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Corr.java b/jOOQ/src/main/java/org/jooq/impl/Corr.java
index 2e03c25afd..078a344401 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Corr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Corr.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cos.java b/jOOQ/src/main/java/org/jooq/impl/Cos.java
index 12ba029f9f..0914f8069e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cos.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cos.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cosh.java b/jOOQ/src/main/java/org/jooq/impl/Cosh.java
index ba0a560423..91d04d76c6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cosh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cosh.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cot.java b/jOOQ/src/main/java/org/jooq/impl/Cot.java
index af82db80c6..ccf6860918 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cot.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Coth.java b/jOOQ/src/main/java/org/jooq/impl/Coth.java
index faf5177480..fe3aeee326 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Coth.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Coth.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java
index bb3c1e58ac..85597d8a76 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CovarPop.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CovarPop.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java
index cc00b4e132..a7cb308f9a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CovarSamp.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
index f78e5224be..f8f1c2ba06 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDatabaseImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
index ab6bc091ec..ad4a77f4b0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateDomainImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java
index ed4ca49aad..ccd805424f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateFunctionImpl.java
@@ -321,6 +321,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
index 2e3c141918..6b107c5271 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateIndexImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java
index e780c9a9e0..9748e7b057 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateProcedureImpl.java
@@ -306,6 +306,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
index 028c819117..d369d7661f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSchemaImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
index 57f2721511..04cbdb505f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateSequenceImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java
index 71cc2d7f86..7407a6f77d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CreateTriggerImpl.java
@@ -527,6 +527,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java b/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java
index a3d23dc840..6b6d63062c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentCatalog.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
index 788ef5c49d..592c80ab03 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentSchema.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
index e026076f9f..9ef33cb2c7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java
index be84fd3634..c61904f1e4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DateAdd.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DateAdd.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/DateToLocalDateConverter.java b/jOOQ/src/main/java/org/jooq/impl/DateToLocalDateConverter.java
index f5d8d599d3..feebcdc9a2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DateToLocalDateConverter.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DateToLocalDateConverter.java
@@ -39,13 +39,14 @@ package org.jooq.impl;
 
 import java.sql.Date;
 import java.time.LocalDate;
+import java.util.function.Function;
 
 import org.jooq.Converter;
 
 /**
  * @author Lukas Eder
  * @deprecated - 3.15.0 - [#11505] - Use
- *             {@link Converter#ofNullable(Class, Class, java.util.function.Function, java.util.function.Function)}
+ *             {@link Converter#ofNullable(Class, Class, Function, Function)}
  *             instead, e.g.
  *             <code>Converter.ofNullable(Date.class, LocalDate.class, Date::toLocalDate, Date::valueOf)</code>.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/Degrees.java b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
index 6fd37583f9..e41980f947 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Degrees.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Deleting.java b/jOOQ/src/main/java/org/jooq/impl/Deleting.java
index 31ef6d5a9e..2f9021ae84 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Deleting.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Deleting.java
@@ -110,6 +110,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Digits.java b/jOOQ/src/main/java/org/jooq/impl/Digits.java
index 792e29dbc5..3f672cd278 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Digits.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Digits.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
index c9d6bc770e..5598c270fc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDatabaseImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
index 520d9d98d1..42b5bc71d8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropDomainImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java
index 37f3e645b7..2d870d65b2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropFunctionImpl.java
@@ -116,6 +116,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
index 27e18dd467..42accb64fd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropIndexImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java
index 37f3e645b7..2d870d65b2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropProcedureImpl.java
@@ -116,6 +116,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
index a25ab0516c..b415fda2a0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSchemaImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
index 8f6fa46a95..0251236bff 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropSequenceImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
index 130a5fc89b..182b2ce34e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropTableImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java
index d856dc4531..b9aa59cabe 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropTriggerImpl.java
@@ -117,6 +117,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
index b7db456ed9..94f1d1b48d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DropViewImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Euler.java b/jOOQ/src/main/java/org/jooq/impl/Euler.java
index 2d61bc8914..450011e77d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Euler.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Euler.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Exists.java b/jOOQ/src/main/java/org/jooq/impl/Exists.java
index 2e8752a3df..dab60b6ec9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Exists.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Exists.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Exp.java b/jOOQ/src/main/java/org/jooq/impl/Exp.java
index da998762cb..17626b9070 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Exp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Exp.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Floor.java b/jOOQ/src/main/java/org/jooq/impl/Floor.java
index 9faa8bc2f5..b23f00cc49 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Floor.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Floor.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
index 00ea232af2..54355debe7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Inserting.java b/jOOQ/src/main/java/org/jooq/impl/Inserting.java
index 31ef6d5a9e..2f9021ae84 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Inserting.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Inserting.java
@@ -110,6 +110,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
index da1db325f0..303970040b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsDocument.java b/jOOQ/src/main/java/org/jooq/impl/IsDocument.java
index 80a6f99039..9ef72e9b8b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsDocument.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsDocument.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsJson.java b/jOOQ/src/main/java/org/jooq/impl/IsJson.java
index 6735d1e5df..f6f44aa149 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsJson.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsJson.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java b/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java
index 4b670a194d..431e003b4c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsNotDistinctFrom.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNotDocument.java b/jOOQ/src/main/java/org/jooq/impl/IsNotDocument.java
index f781784ba5..54bf7dc8d9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsNotDocument.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsNotDocument.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNotJson.java b/jOOQ/src/main/java/org/jooq/impl/IsNotJson.java
index 08f5293c25..9848103a8c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsNotJson.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsNotJson.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNotNull.java b/jOOQ/src/main/java/org/jooq/impl/IsNotNull.java
index b2ea21ebec..87e9791842 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsNotNull.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsNotNull.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsNull.java b/jOOQ/src/main/java/org/jooq/impl/IsNull.java
index 0da2070fd8..bd40f18bcf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsNull.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsNull.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java
index 7e72f01583..928489fbdd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONArray.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONArray.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java
index b2b234f283..d4d19ee895 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONObject.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONObject.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/LTrim.java b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
index 1b1cfd79af..ea8295bb2b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Left.java b/jOOQ/src/main/java/org/jooq/impl/Left.java
index a9075db77a..d9bf6d6557 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Left.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Left.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Level.java b/jOOQ/src/main/java/org/jooq/impl/Level.java
index 9fd03cbd74..676ad0d4e7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Level.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Level.java
@@ -109,6 +109,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Log.java b/jOOQ/src/main/java/org/jooq/impl/Log.java
index b67145181f..f046577626 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Log.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Log.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Log10.java b/jOOQ/src/main/java/org/jooq/impl/Log10.java
index d11a8aacb1..db2a265faf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Log10.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Log10.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Lower.java b/jOOQ/src/main/java/org/jooq/impl/Lower.java
index 742a92d65d..f085c0d883 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Lower.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lower.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Lpad.java b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
index edb9e0f48c..3b9cc778ce 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Lpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/MD5.java b/jOOQ/src/main/java/org/jooq/impl/MD5.java
index 52b019c2af..f80bd3b019 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MD5.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MD5.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Median.java b/jOOQ/src/main/java/org/jooq/impl/Median.java
index 16de993a35..6c71a950d5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Median.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Median.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Mod.java b/jOOQ/src/main/java/org/jooq/impl/Mod.java
index bd389a1642..d1a8403b55 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Mod.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Mod.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Not.java b/jOOQ/src/main/java/org/jooq/impl/Not.java
index 61de9808f3..69503f9f31 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Not.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Not.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/NotField.java b/jOOQ/src/main/java/org/jooq/impl/NotField.java
index 731ee3c525..6cb80c42e3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NotField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NotField.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Nullif.java b/jOOQ/src/main/java/org/jooq/impl/Nullif.java
index efac1fd42d..aabcb2f917 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Nullif.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Nullif.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Nvl.java b/jOOQ/src/main/java/org/jooq/impl/Nvl.java
index ae4b9987e6..8a048d5439 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Nvl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Nvl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java
index 3e23cb7003..97feef9bda 100644
--- a/jOOQ/src/main/java/org/jooq/impl/OctetLength.java
+++ b/jOOQ/src/main/java/org/jooq/impl/OctetLength.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Or.java b/jOOQ/src/main/java/org/jooq/impl/Or.java
index 19fa2c93ca..54aacc2a3e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Or.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Or.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
@@ -118,7 +120,7 @@ extends
      * @deprecated - This will be implemented using QOM.replace, instead.
      */
     @Deprecated
-    final Condition transform(java.util.function.Function<? super Condition, ? extends Condition> function) {
+    final Condition transform(Function<? super Condition, ? extends Condition> function) {
         Condition t1 = arg1 instanceof And
             ? ((And) arg1).transform(function)
             : arg1 instanceof Or
diff --git a/jOOQ/src/main/java/org/jooq/impl/Overlay.java b/jOOQ/src/main/java/org/jooq/impl/Overlay.java
index c6ae22b98c..cfcb84efb0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Overlay.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Overlay.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Pi.java b/jOOQ/src/main/java/org/jooq/impl/Pi.java
index 5f7f904892..f2167019af 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Pi.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Pi.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Plus.java b/jOOQ/src/main/java/org/jooq/impl/Plus.java
index d856dc4531..b9aa59cabe 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Plus.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Plus.java
@@ -117,6 +117,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Position.java b/jOOQ/src/main/java/org/jooq/impl/Position.java
index d06f0823e3..a6970bd792 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Position.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Position.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Power.java b/jOOQ/src/main/java/org/jooq/impl/Power.java
index 3e9033346b..193e4564aa 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Power.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Power.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Prior.java b/jOOQ/src/main/java/org/jooq/impl/Prior.java
index a788bdb5ab..10d5c40fbd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Prior.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Prior.java
@@ -138,6 +138,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RTrim.java b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
index fe667580b9..444f0b718f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Radians.java b/jOOQ/src/main/java/org/jooq/impl/Radians.java
index 8329a473ca..70903b9a62 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Radians.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Radians.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rand.java b/jOOQ/src/main/java/org/jooq/impl/Rand.java
index d6aa6b5fff..f47b119c53 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rand.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rand.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java
index 4c53b76434..ec8549a456 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgx.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java b/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java
index bc84283663..1ad482a0d6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrAvgy.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java
index 8703fc2ded..3eb7f8fbe3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrCount.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrCount.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java
index f7e5d65bb9..61f7313268 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrIntercept.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java
index 49b12b73be..be3d413356 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrR2.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrR2.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java
index 45050a0a31..70e14bc7a6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSlope.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java
index ab68a5b0f4..4c7454044d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxx.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java
index 1e2943bbf2..d6ed7c7d23 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSxy.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java
index fbafefced2..1a4febd256 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegrSyy.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Repeat.java b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
index b50c5accaf..c8ac64face 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Repeat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java
index 200bc92a3d..b9135a8d9f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Replace.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Return.java b/jOOQ/src/main/java/org/jooq/impl/Return.java
index 83d3dab8f2..1f9ef36ac2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Return.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Return.java
@@ -143,6 +143,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Reverse.java b/jOOQ/src/main/java/org/jooq/impl/Reverse.java
index b6f2dff382..cfa88cb828 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Reverse.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Reverse.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
index 7b77d56a04..f1bc1ccb5a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RevokeImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Right.java b/jOOQ/src/main/java/org/jooq/impl/Right.java
index 2b00832e48..43097aa635 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Right.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Right.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Round.java b/jOOQ/src/main/java/org/jooq/impl/Round.java
index be607e4ea0..a287f342e2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Round.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Round.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rownum.java b/jOOQ/src/main/java/org/jooq/impl/Rownum.java
index f7bc570ad1..1dfd20a351 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rownum.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rownum.java
@@ -113,6 +113,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rpad.java b/jOOQ/src/main/java/org/jooq/impl/Rpad.java
index d24b2f051a..4de3fc2af0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rpad.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java
index e77b240bb4..7ab296b953 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SetCatalog.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/SetCommand.java b/jOOQ/src/main/java/org/jooq/impl/SetCommand.java
index 752ef2e012..e256e643d5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SetCommand.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SetCommand.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
index c404c84b2d..7a5cb31f0d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SetSchema.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Shl.java b/jOOQ/src/main/java/org/jooq/impl/Shl.java
index 8d27553623..a243a636e2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Shl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Shl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Shr.java b/jOOQ/src/main/java/org/jooq/impl/Shr.java
index cd98d3ce0d..bbd526db58 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Shr.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Shr.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sign.java b/jOOQ/src/main/java/org/jooq/impl/Sign.java
index b90d99c517..03066cd434 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sign.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sign.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Signal.java b/jOOQ/src/main/java/org/jooq/impl/Signal.java
index 871c3d59aa..7a6937b26f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Signal.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Signal.java
@@ -188,6 +188,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sin.java b/jOOQ/src/main/java/org/jooq/impl/Sin.java
index 7950395470..68d561c1a2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sin.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sin.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sinh.java b/jOOQ/src/main/java/org/jooq/impl/Sinh.java
index ce0cc9c06d..cfb85ba041 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sinh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sinh.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Space.java b/jOOQ/src/main/java/org/jooq/impl/Space.java
index 2d38d23f49..9349bbd107 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Space.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Space.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/SplitPart.java b/jOOQ/src/main/java/org/jooq/impl/SplitPart.java
index 39bb0004f0..03b933869c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SplitPart.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SplitPart.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
index 5fac5bdc53..6f4b20e509 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Square.java b/jOOQ/src/main/java/org/jooq/impl/Square.java
index 45c1fa9e65..e7707a39d1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Square.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Square.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java
index fc5ac558b3..df4b4f1e8b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StddevPop.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StddevPop.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java b/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java
index 37f1693d25..ee720b1e34 100644
--- a/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/StddevSamp.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Substring.java b/jOOQ/src/main/java/org/jooq/impl/Substring.java
index a3c43bab94..eac4cb689d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Substring.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Substring.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java b/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java
index 46e23dbc58..6fc98b482c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SubstringIndex.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java b/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java
index c6c64ce0e1..86dabacded 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SysConnectByPath.java
@@ -125,6 +125,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableEq.java b/jOOQ/src/main/java/org/jooq/impl/TableEq.java
index 2831a91063..b3d24124ac 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableEq.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableEq.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/TableNe.java b/jOOQ/src/main/java/org/jooq/impl/TableNe.java
index b63cbbdc74..6e2d2ab57a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TableNe.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TableNe.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tan.java b/jOOQ/src/main/java/org/jooq/impl/Tan.java
index 1f768ff1c1..8934e63a83 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tan.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tan.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tanh.java b/jOOQ/src/main/java/org/jooq/impl/Tanh.java
index 4dd842174d..f737061eca 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tanh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tanh.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tau.java b/jOOQ/src/main/java/org/jooq/impl/Tau.java
index 2b88bee980..63948e2403 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tau.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tau.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/TimeToLocalTimeConverter.java b/jOOQ/src/main/java/org/jooq/impl/TimeToLocalTimeConverter.java
index 10b6925304..82c0f10c28 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TimeToLocalTimeConverter.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TimeToLocalTimeConverter.java
@@ -39,13 +39,14 @@ package org.jooq.impl;
 
 import java.sql.Time;
 import java.time.LocalTime;
+import java.util.function.Function;
 
 import org.jooq.Converter;
 
 /**
  * @author Lukas Eder
  * @deprecated - 3.15.0 - [#11505] - Use
- *             {@link Converter#ofNullable(Class, Class, java.util.function.Function, java.util.function.Function)}
+ *             {@link Converter#ofNullable(Class, Class, Function, Function)}
  *             instead, e.g.
  *             <code>Converter.ofNullable(Time.class, LocalTime.class, Time::toLocalTime, Time::valueOf)</code>.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/TimestampToLocalDateTimeConverter.java b/jOOQ/src/main/java/org/jooq/impl/TimestampToLocalDateTimeConverter.java
index e5022242cd..c88f80685c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TimestampToLocalDateTimeConverter.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TimestampToLocalDateTimeConverter.java
@@ -39,13 +39,14 @@ package org.jooq.impl;
 
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
+import java.util.function.Function;
 
 import org.jooq.Converter;
 
 /**
  * @author Lukas Eder
  * @deprecated - 3.15.0 - [#11505] - Use
- *             {@link Converter#ofNullable(Class, Class, java.util.function.Function, java.util.function.Function)}
+ *             {@link Converter#ofNullable(Class, Class, Function, Function)}
  *             instead, e.g.
  *             <code>Converter.ofNullable(Timestamp.class, LocalDateTime.class, Timestamp::toLocalDateTime, Timestamp::valueOf)</code>.
  */
diff --git a/jOOQ/src/main/java/org/jooq/impl/ToChar.java b/jOOQ/src/main/java/org/jooq/impl/ToChar.java
index 64e3ec3919..421d43e145 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ToChar.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ToChar.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/ToDate.java b/jOOQ/src/main/java/org/jooq/impl/ToDate.java
index 85468da426..d2fca369e5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ToDate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ToDate.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.sql.Date;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ToHex.java b/jOOQ/src/main/java/org/jooq/impl/ToHex.java
index 0128b9e682..f9eec4d12a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ToHex.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ToHex.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java b/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java
index 9091c8b87c..53509fca05 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ToTimestamp.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.sql.Timestamp;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Translate.java b/jOOQ/src/main/java/org/jooq/impl/Translate.java
index 687d678581..f455aaf7e3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Translate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Translate.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Trim.java b/jOOQ/src/main/java/org/jooq/impl/Trim.java
index e672b89cd4..b0ab175903 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Trim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Trim.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Trunc.java b/jOOQ/src/main/java/org/jooq/impl/Trunc.java
index f5a03c2ac5..eb794594f9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Trunc.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Trunc.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
index 1cfe846771..09965a5883 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TruncateImpl.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Unique.java b/jOOQ/src/main/java/org/jooq/impl/Unique.java
index 63c2ef44ab..f5b1c8bfff 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Unique.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Unique.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Updating.java b/jOOQ/src/main/java/org/jooq/impl/Updating.java
index 31ef6d5a9e..2f9021ae84 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Updating.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Updating.java
@@ -110,6 +110,8 @@ package org.jooq.impl;
 
 
 
+
+
 
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Upper.java b/jOOQ/src/main/java/org/jooq/impl/Upper.java
index 7c3f1be278..0fb6118000 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Upper.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Upper.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Uuid.java b/jOOQ/src/main/java/org/jooq/impl/Uuid.java
index 9f862f38ab..7ef17f4ebf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Uuid.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Uuid.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.util.UUID;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/VarPop.java b/jOOQ/src/main/java/org/jooq/impl/VarPop.java
index fb5dd538bb..52877c075a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/VarPop.java
+++ b/jOOQ/src/main/java/org/jooq/impl/VarPop.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/VarSamp.java b/jOOQ/src/main/java/org/jooq/impl/VarSamp.java
index 1d86925a38..1a1a310581 100644
--- a/jOOQ/src/main/java/org/jooq/impl/VarSamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/VarSamp.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 import java.math.BigDecimal;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java b/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java
index 7d70000873..c992b640cf 100644
--- a/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java
+++ b/jOOQ/src/main/java/org/jooq/impl/WidthBucket.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLComment.java b/jOOQ/src/main/java/org/jooq/impl/XMLComment.java
index 5ea2243ce8..a436a26e36 100644
--- a/jOOQ/src/main/java/org/jooq/impl/XMLComment.java
+++ b/jOOQ/src/main/java/org/jooq/impl/XMLComment.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/XMLForest.java b/jOOQ/src/main/java/org/jooq/impl/XMLForest.java
index 805af65422..5abc14758e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/XMLForest.java
+++ b/jOOQ/src/main/java/org/jooq/impl/XMLForest.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java b/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java
index 953b7b7ebe..4396521ed2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Xmlserialize.java
@@ -55,6 +55,8 @@ import org.jooq.impl.*;
 import org.jooq.tools.*;
 
 import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
 
 
 /**