diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java
index 2ddb44b7c9..4a058bc23b 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/AbstractLoaderTests.java
@@ -1,14 +1,23 @@
 package org.jooq.test._.testcases;
 
-import org.jooq.*;
-import org.jooq.test.BaseTest;
-import org.jooq.test.jOOQAbstractTest;
-import org.junit.Test;
-
 import java.sql.Date;
 import java.sql.SQLException;
 import java.util.Arrays;
 
+import org.jooq.Field;
+import org.jooq.Loader;
+import org.jooq.Record1;
+import org.jooq.Record2;
+import org.jooq.Record3;
+import org.jooq.Record6;
+import org.jooq.Result;
+import org.jooq.TableRecord;
+import org.jooq.UpdatableRecord;
+import org.jooq.test.BaseTest;
+import org.jooq.test.jOOQAbstractTest;
+
+import org.junit.Test;
+
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;
diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/JsonLoaderTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/JsonLoaderTests.java
index 19ae31b6ad..823b3b1f2b 100644
--- a/jOOQ-test/src/org/jooq/test/_/testcases/JsonLoaderTests.java
+++ b/jOOQ-test/src/org/jooq/test/_/testcases/JsonLoaderTests.java
@@ -40,11 +40,17 @@
  */
 package org.jooq.test._.testcases;
 
-import org.jooq.*;
-import org.jooq.test.jOOQAbstractTest;
-
 import java.sql.Date;
 
+import org.jooq.Loader;
+import org.jooq.Record1;
+import org.jooq.Record2;
+import org.jooq.Record3;
+import org.jooq.Record6;
+import org.jooq.TableRecord;
+import org.jooq.UpdatableRecord;
+import org.jooq.test.jOOQAbstractTest;
+
 // ...
 
 public class JsonLoaderTests<
diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
index 7ce3330805..ee7b896c2d 100644
--- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
+++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
@@ -40,19 +40,104 @@
  */
 package org.jooq.test;
 
-import org.apache.commons.io.FileUtils;
-import org.jooq.*;
+import java.io.File;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.SQLSyntaxErrorException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+
+import org.jooq.DAO;
+import org.jooq.DSLContext;
+import org.jooq.DataType;
+import org.jooq.ExecuteListener;
+import org.jooq.ExecuteListenerProvider;
+import org.jooq.ExecuteType;
+import org.jooq.Field;
+import org.jooq.ForeignKey;
+import org.jooq.Query;
+import org.jooq.Record;
+import org.jooq.Record1;
+import org.jooq.Record3;
+import org.jooq.Record6;
+import org.jooq.Result;
+import org.jooq.SQLDialect;
+import org.jooq.Schema;
+import org.jooq.Table;
+import org.jooq.TableField;
+import org.jooq.TableRecord;
+import org.jooq.UDTRecord;
+import org.jooq.UpdatableRecord;
 import org.jooq.conf.RenderMapping;
 import org.jooq.conf.Settings;
 import org.jooq.conf.SettingsTools;
 import org.jooq.impl.DSL;
 import org.jooq.impl.DefaultExecuteListenerProvider;
-import org.jooq.test._.converters.*;
+import org.jooq.test._.converters.Boolean_10;
+import org.jooq.test._.converters.Boolean_TF_LC;
+import org.jooq.test._.converters.Boolean_TF_UC;
+import org.jooq.test._.converters.Boolean_YES_NO_LC;
+import org.jooq.test._.converters.Boolean_YES_NO_UC;
+import org.jooq.test._.converters.Boolean_YN_LC;
+import org.jooq.test._.converters.Boolean_YN_UC;
 import org.jooq.test._.listeners.JDBCLifecycleListener;
 import org.jooq.test._.listeners.LifecycleWatcherListener;
 import org.jooq.test._.listeners.PrettyPrinter;
 import org.jooq.test._.listeners.TestStatisticsListener;
-import org.jooq.test._.testcases.*;
+import org.jooq.test._.testcases.AggregateWindowFunctionTests;
+import org.jooq.test._.testcases.AliasTests;
+import org.jooq.test._.testcases.BatchTests;
+import org.jooq.test._.testcases.BenchmarkTests;
+import org.jooq.test._.testcases.CRUDTests;
+import org.jooq.test._.testcases.CsvLoaderTests;
+import org.jooq.test._.testcases.DaoTests;
+import org.jooq.test._.testcases.DataTypeTests;
+import org.jooq.test._.testcases.EnumTests;
+import org.jooq.test._.testcases.ExecuteListenerTests;
+import org.jooq.test._.testcases.ExoticTests;
+import org.jooq.test._.testcases.FetchTests;
+import org.jooq.test._.testcases.FormatTests;
+import org.jooq.test._.testcases.FunctionTests;
+import org.jooq.test._.testcases.GeneralTests;
+import org.jooq.test._.testcases.GroupByTests;
+import org.jooq.test._.testcases.InsertUpdateTests;
+import org.jooq.test._.testcases.JDBCTests;
+import org.jooq.test._.testcases.JoinTests;
+import org.jooq.test._.testcases.JsonLoaderTests;
+import org.jooq.test._.testcases.MetaDataTests;
+import org.jooq.test._.testcases.OrderByTests;
+import org.jooq.test._.testcases.PlainSQLTests;
+import org.jooq.test._.testcases.PredicateTests;
+import org.jooq.test._.testcases.RecordListenerTests;
+import org.jooq.test._.testcases.RecordTests;
+import org.jooq.test._.testcases.ReferentialTests;
+import org.jooq.test._.testcases.RenderAndBindTests;
+import org.jooq.test._.testcases.ResultSetTests;
+import org.jooq.test._.testcases.ResultTests;
+import org.jooq.test._.testcases.RoutineAndUDTTests;
+import org.jooq.test._.testcases.RowValueExpressionTests;
+import org.jooq.test._.testcases.SchemaAndMappingTests;
+import org.jooq.test._.testcases.SelectTests;
+import org.jooq.test._.testcases.StatementTests;
+import org.jooq.test._.testcases.TableFunctionTests;
+import org.jooq.test._.testcases.ThreadSafetyTests;
+import org.jooq.test._.testcases.TruncateTests;
+import org.jooq.test._.testcases.ValuesConstructorTests;
+import org.jooq.test._.testcases.VisitListenerTests;
 import org.jooq.tools.JooqLogger;
 import org.jooq.tools.StopWatch;
 import org.jooq.tools.StringUtils;
@@ -69,22 +154,23 @@ import org.jooq.util.GenerationTool;
 import org.jooq.util.jaxb.Configuration;
 import org.jooq.util.jaxb.Jdbc;
 import org.jooq.util.jaxb.Property;
-import org.junit.*;
-import org.postgresql.util.PSQLException;
 
-import java.io.File;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.sql.*;
-import java.sql.Date;
-import java.util.*;
+import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.postgresql.util.PSQLException;
 
 import static java.util.Arrays.asList;
 import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.FIREBIRD;
-import static org.jooq.test._.listeners.JDBCLifecycleListener.*;
+import static org.jooq.test._.listeners.JDBCLifecycleListener.RS_CLOSE_COUNT;
+import static org.jooq.test._.listeners.JDBCLifecycleListener.RS_START_COUNT;
+import static org.jooq.test._.listeners.JDBCLifecycleListener.STMT_CLOSE_COUNT;
+import static org.jooq.test._.listeners.JDBCLifecycleListener.STMT_START_COUNT;
 import static org.jooq.test._.listeners.LifecycleWatcherListener.LISTENER_END_COUNT;
 import static org.jooq.test._.listeners.LifecycleWatcherListener.LISTENER_START_COUNT;
 import static org.jooq.tools.reflect.Reflect.on;
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
index b280af9133..ca1f393b1c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
@@ -41,15 +41,8 @@
 
 package org.jooq.impl;
 
-import static org.jooq.conf.ParamType.INLINED;
-import static org.jooq.conf.ParamType.NAMED;
-import static org.jooq.impl.DSL.field;
-import static org.jooq.impl.DSL.fieldByName;
-import static org.jooq.impl.DSL.queryPart;
-import static org.jooq.impl.DSL.template;
-import static org.jooq.impl.DSL.trueCondition;
-import static org.jooq.impl.Utils.list;
-
+import javax.annotation.Generated;
+import javax.sql.DataSource;
 import java.io.IOException;
 import java.io.Serializable;
 import java.io.StringReader;
@@ -67,9 +60,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Generated;
-import javax.sql.DataSource;
-
 import org.jooq.Attachable;
 import org.jooq.Batch;
 import org.jooq.BatchBindStep;
@@ -189,6 +179,15 @@ import org.jooq.impl.BatchCRUD.Action;
 import org.jooq.tools.csv.CSVReader;
 import org.jooq.tools.json.JSONReader;
 
+import static org.jooq.conf.ParamType.INLINED;
+import static org.jooq.conf.ParamType.NAMED;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.fieldByName;
+import static org.jooq.impl.DSL.queryPart;
+import static org.jooq.impl.DSL.template;
+import static org.jooq.impl.DSL.trueCondition;
+import static org.jooq.impl.Utils.list;
+
 /**
  * A default implementation for {@link DSLContext}.
  * <p>
diff --git a/jOOQ/src/main/java/org/jooq/tools/json/JSONParser.java b/jOOQ/src/main/java/org/jooq/tools/json/JSONParser.java
index 69319eaf23..4a597f443d 100644
--- a/jOOQ/src/main/java/org/jooq/tools/json/JSONParser.java
+++ b/jOOQ/src/main/java/org/jooq/tools/json/JSONParser.java
@@ -524,4 +524,4 @@ public class JSONParser {
         status = S_IN_ERROR;
         throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
     }
-}
\ No newline at end of file
+}
diff --git a/jOOQ/src/main/java/org/jooq/tools/json/JSONReader.java b/jOOQ/src/main/java/org/jooq/tools/json/JSONReader.java
index 912d2b3afb..f97072a8fe 100644
--- a/jOOQ/src/main/java/org/jooq/tools/json/JSONReader.java
+++ b/jOOQ/src/main/java/org/jooq/tools/json/JSONReader.java
@@ -8,6 +8,10 @@ import java.util.*;
 
 /**
  * A very simple JSON reader based on Simple JSON.
+ *
+ * @author Johannes Bühler
+ *
+ * @since 3.3.0
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class JSONReader implements Closeable {