diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultRelations.java b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultRelations.java
index b544689a45..b67211e5f7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/DefaultRelations.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/DefaultRelations.java
@@ -438,51 +438,5 @@ public class DefaultRelations implements Relations {
     /**
      * A simple local wrapper for a key definition (table + key name)
      */
-    private static class Key {
-        final TableDefinition table;
-        final String keyName;
-
-        Key(TableDefinition table, String keyName) {
-            this.table = table;
-            this.keyName = keyName;
-        }
-
-        @Override
-        public String toString() {
-            return "Key [table=" + table + ", keyName=" + keyName + "]";
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((keyName == null) ? 0 : keyName.hashCode());
-            result = prime * result + ((table == null) ? 0 : table.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj)
-                return true;
-            if (obj == null)
-                return false;
-            if (getClass() != obj.getClass())
-                return false;
-            Key other = (Key) obj;
-            if (keyName == null) {
-                if (other.keyName != null)
-                    return false;
-            }
-            else if (!keyName.equals(other.keyName))
-                return false;
-            if (table == null) {
-                if (other.table != null)
-                    return false;
-            }
-            else if (!table.equals(other.table))
-                return false;
-            return true;
-        }
-    }
+    private static final /* record */ class Key { private final TableDefinition table; private final String keyName; public Key(TableDefinition table, String keyName) { this.table = table; this.keyName = keyName; } public TableDefinition table() { return table; } public String keyName() { return keyName; } @Override public boolean equals(Object o) { if (!(o instanceof Key)) return false; Key other = (Key) o; if (!java.util.Objects.equals(this.table, other.table)) return false; if (!java.util.Objects.equals(this.keyName, other.keyName)) return false; return true; } @Override public int hashCode() { return java.util.Objects.hash(this.table, this.keyName); } @Override public String toString() { return new StringBuilder("Key[").append("table=").append(this.table).append(", keyName=").append(this.keyName).append("]").toString(); } }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java b/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java
index 8c5c893e29..75ca60f16d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractDataType.java
@@ -38,6 +38,7 @@
 package org.jooq.impl;
 
 import static org.jooq.SQLDialect.DERBY;
+// ...
 import static org.jooq.SQLDialect.FIREBIRD;
 // ...
 // ...
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
index e4fabce117..4e9aa9f3bb 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
@@ -56,6 +56,7 @@ import static org.jooq.SQLDialect.CUBRID;
 // ...
 import static org.jooq.SQLDialect.DEFAULT;
 import static org.jooq.SQLDialect.DERBY;
+// ...
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
 // ...
@@ -1836,6 +1837,9 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
 
 
 
+
+
+
             return Types.TINYINT;
         }
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
index 238ab2fedc..61836691e5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
@@ -46,6 +46,7 @@ import static java.lang.Boolean.TRUE;
 // ...
 // ...
 import static org.jooq.SQLDialect.DERBY;
+// ...
 import static org.jooq.SQLDialect.FIREBIRD;
 import static org.jooq.SQLDialect.H2;
 import static org.jooq.SQLDialect.HSQLDB;