[#923] Reduce the internal API leak by moving some utilities to org.jooq.tools

jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java

@@ -81,19 +81,19 @@ import org.jooq.impl.AbstractKeys;
 import org.jooq.impl.AbstractRoutine;
 import org.jooq.impl.ArrayRecordImpl;
 import org.jooq.impl.FieldTypeHelper;
-import org.jooq.impl.JooqLogger;
 import org.jooq.impl.PackageImpl;
 import org.jooq.impl.SQLDataType;
 import org.jooq.impl.SchemaImpl;
 import org.jooq.impl.SequenceImpl;
-import org.jooq.impl.StopWatch;
-import org.jooq.impl.StringUtils;
 import org.jooq.impl.TableImpl;
 import org.jooq.impl.TableRecordImpl;
 import org.jooq.impl.UDTImpl;
 import org.jooq.impl.UDTRecordImpl;
 import org.jooq.impl.UpdatableRecordImpl;
 import org.jooq.impl.UpdatableTableImpl;
+import org.jooq.tools.JooqLogger;
+import org.jooq.tools.StopWatch;
+import org.jooq.tools.StringUtils;
 
 
 /**

jOOQ-codegen/src/main/java/org/jooq/util/DefaultGeneratorStrategy.java

@@ -37,7 +37,7 @@ package org.jooq.util;
 
 import java.io.File;
 
-import org.jooq.impl.StringUtils;
+import org.jooq.tools.StringUtils;
 
 /**
  * The default naming strategy for the {@link DefaultGenerator}

jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java

@@ -36,14 +36,14 @@
 
 package org.jooq.util;
 
-import static org.jooq.impl.StringUtils.defaultString;
+import static org.jooq.tools.StringUtils.defaultString;
 
 import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.util.Properties;
 
-import org.jooq.impl.JooqLogger;
+import org.jooq.tools.JooqLogger;
 
 /**
  * The GenerationTool takes care of generating Java code from a database schema. It

jOOQ-codegen/src/main/java/org/jooq/util/GenerationWriter.java

@@ -18,7 +18,7 @@ import java.util.regex.Matcher;
 import org.jooq.EnumType;
 import org.jooq.MasterDataType;
 import org.jooq.UDTRecord;
-import org.jooq.impl.StringUtils;
+import org.jooq.tools.StringUtils;
 
 /**
  * A wrapper for a {@link PrintWriter}

jOOQ-meta/src/main/java/org/jooq/util/AbstractDatabase.java

@@ -43,7 +43,7 @@ import java.util.List;
 import java.util.Properties;
 
 import org.jooq.SQLDialect;
-import org.jooq.impl.JooqLogger;
+import org.jooq.tools.JooqLogger;
 
 /**
  * A base implementation for all types of databases.

jOOQ-meta/src/main/java/org/jooq/util/AbstractElementContainerDefinition.java

@@ -42,8 +42,8 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jooq.impl.JooqLogger;
-import org.jooq.impl.StringUtils;
+import org.jooq.tools.JooqLogger;
+import org.jooq.tools.StringUtils;
 
 /**
  * A base implementation for element container definitions

jOOQ-meta/src/main/java/org/jooq/util/AbstractPackageDefinition.java

@@ -39,7 +39,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jooq.impl.JooqLogger;
+import org.jooq.tools.JooqLogger;
 
 /**
  * @author Lukas Eder

jOOQ-meta/src/main/java/org/jooq/util/AbstractRoutineDefinition.java

@@ -41,7 +41,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import org.jooq.impl.JooqLogger;
+import org.jooq.tools.JooqLogger;
 
 /**
  * @author Lukas Eder

jOOQ-meta/src/main/java/org/jooq/util/AbstractTypedElementDefinition.java

@@ -35,8 +35,8 @@
  */
 package org.jooq.util;
 
-import org.jooq.impl.JooqLogger;
-import org.jooq.impl.StringUtils;
+import org.jooq.tools.JooqLogger;
+import org.jooq.tools.StringUtils;
 
 abstract class AbstractTypedElementDefinition<T extends Definition>
     extends AbstractDefinition

jOOQ-meta/src/main/java/org/jooq/util/DefaultMasterDataTableDefinition.java

@@ -43,7 +43,7 @@ import org.jooq.Record;
 import org.jooq.Result;
 import org.jooq.Table;
 import org.jooq.exception.DataAccessException;
-import org.jooq.impl.JooqLogger;
+import org.jooq.tools.JooqLogger;
 
 public class DefaultMasterDataTableDefinition extends AbstractDefinition implements MasterDataTableDefinition {
 

jOOQ-meta/src/main/java/org/jooq/util/DefaultRelations.java

@@ -42,7 +42,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.jooq.impl.JooqLogger;
+import org.jooq.tools.JooqLogger;
 
 public class DefaultRelations extends AbstractDefinition implements Relations {
 

jOOQ-meta/src/main/java/org/jooq/util/SchemaDefinition.java

@@ -36,7 +36,7 @@
 
 package org.jooq.util;
 
-import org.jooq.impl.StringUtils;
+import org.jooq.tools.StringUtils;
 
 /**
  * The definition of a database schema

jOOQ-meta/src/main/java/org/jooq/util/h2/H2RoutineDefinition.java

@@ -41,7 +41,7 @@ import static org.jooq.util.h2.information_schema.tables.FunctionColumns.FUNCTIO
 import java.sql.SQLException;
 
 import org.jooq.Record;
-import org.jooq.impl.StringUtils;
+import org.jooq.tools.StringUtils;
 import org.jooq.util.AbstractRoutineDefinition;
 import org.jooq.util.DataTypeDefinition;
 import org.jooq.util.Database;

jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBRoutineDefinition.java

@@ -43,7 +43,7 @@ import java.sql.SQLException;
 
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.impl.StringUtils;
+import org.jooq.tools.StringUtils;
 import org.jooq.util.AbstractRoutineDefinition;
 import org.jooq.util.DataTypeDefinition;
 import org.jooq.util.Database;

jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLRoutineDefinition.java

@@ -39,7 +39,7 @@ package org.jooq.util.mysql;
 import java.sql.SQLException;
 import java.util.regex.Matcher;
 
-import org.jooq.impl.StringUtils;
+import org.jooq.tools.StringUtils;
 import org.jooq.util.AbstractRoutineDefinition;
 import org.jooq.util.DataTypeDefinition;
 import org.jooq.util.Database;

jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleRoutineDefinition.java

@@ -43,7 +43,7 @@ import java.sql.SQLException;
 
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.impl.StringUtils;
+import org.jooq.tools.StringUtils;
 import org.jooq.util.AbstractRoutineDefinition;
 import org.jooq.util.DataTypeDefinition;
 import org.jooq.util.Database;

jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerRoutineDefinition.java

@@ -41,7 +41,7 @@ import java.sql.SQLException;
 
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.impl.StringUtils;
+import org.jooq.tools.StringUtils;
 import org.jooq.util.AbstractRoutineDefinition;
 import org.jooq.util.DataTypeDefinition;
 import org.jooq.util.Database;

jOOQ-spring/src/main/java/org/jooq/util/spring/FactoryProxy.java

@@ -80,7 +80,7 @@ import org.jooq.UpdateQuery;
 import org.jooq.UpdateSetStep;
 import org.jooq.exception.DataAccessException;
 import org.jooq.impl.Factory;
-import org.jooq.impl.JooqLogger;
+import org.jooq.tools.JooqLogger;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;

jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java

@@ -136,10 +136,10 @@ import org.jooq.exception.InvalidResultException;
 import org.jooq.impl.CustomCondition;
 import org.jooq.impl.CustomField;
 import org.jooq.impl.Factory;
-import org.jooq.impl.JooqLogger;
 import org.jooq.impl.SQLDataType;
-import org.jooq.impl.StopWatch;
-import org.jooq.impl.StringUtils;
+import org.jooq.tools.JooqLogger;
+import org.jooq.tools.StopWatch;
+import org.jooq.tools.StringUtils;
 import org.jooq.util.GenerationTool;
 
 import org.apache.commons.io.FileUtils;

jOOQ/src/main/java/org/jooq/ConfigurationRegistry.java

@@ -35,7 +35,7 @@
  */
 package org.jooq;
 
-import org.jooq.impl.JooqLogger;
+import org.jooq.tools.JooqLogger;
 
 
 /**

jOOQ/src/main/java/org/jooq/exception/SQLDialectNotSupportedException.java

@@ -37,7 +37,7 @@
 package org.jooq.exception;
 
 import org.jooq.Configuration;
-import org.jooq.impl.JooqLogger;
+import org.jooq.tools.JooqLogger;
 
 /**
  * An exception thrown if an SQL construct is used, which is not supported by

jOOQ/src/main/java/org/jooq/impl/AbstractQuery.java

@@ -44,6 +44,8 @@ import org.jooq.Configuration;
 import org.jooq.ConfigurationRegistry;
 import org.jooq.Query;
 import org.jooq.exception.DetachedException;
+import org.jooq.tools.JooqLogger;
+import org.jooq.tools.StopWatch;
 
 /**
  * @author Lukas Eder

jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java

@@ -64,6 +64,8 @@ import org.jooq.SQLDialect;
 import org.jooq.Schema;
 import org.jooq.UDTField;
 import org.jooq.UDTRecord;
+import org.jooq.tools.JooqLogger;
+import org.jooq.tools.StopWatch;
 
 /**
  * A common base class for stored procedures

jOOQ/src/main/java/org/jooq/impl/AbstractSubSelect.java

@@ -59,6 +59,7 @@ import org.jooq.SQLDialect;
 import org.jooq.SortField;
 import org.jooq.Table;
 import org.jooq.TableLike;
+import org.jooq.tools.StringUtils;
 
 /**
  * A sub-select is a <code>SELECT</code> statement that can be combined with

jOOQ/src/main/java/org/jooq/impl/ArrayTable.java

@@ -47,6 +47,7 @@ import org.jooq.Record;
 import org.jooq.RenderContext;
 import org.jooq.Table;
 import org.jooq.exception.SQLDialectNotSupportedException;
+import org.jooq.tools.StringUtils;
 import org.jooq.util.h2.H2DataType;
 
 /**

jOOQ/src/main/java/org/jooq/impl/AttachableImpl.java

@@ -45,6 +45,7 @@ import org.jooq.Configuration;
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
 import org.jooq.Store;
+import org.jooq.tools.JooqLogger;
 
 /**
  * A default implementation for mixin of the {@link Attachable} interface

jOOQ/src/main/java/org/jooq/impl/BatchMultiple.java

@@ -41,6 +41,8 @@ import java.sql.Statement;
 
 import org.jooq.Batch;
 import org.jooq.Query;
+import org.jooq.tools.JooqLogger;
+import org.jooq.tools.StopWatch;
 
 /**
  * @author Lukas Eder

jOOQ/src/main/java/org/jooq/impl/BatchSingle.java

@@ -43,6 +43,8 @@ import java.util.List;
 
 import org.jooq.BatchBindStep;
 import org.jooq.Query;
+import org.jooq.tools.JooqLogger;
+import org.jooq.tools.StopWatch;
 
 /**
  * @author Lukas Eder

jOOQ/src/main/java/org/jooq/impl/CursorImpl.java

@@ -50,6 +50,7 @@ import org.jooq.RecordHandler;
 import org.jooq.Result;
 import org.jooq.Table;
 import org.jooq.TableRecord;
+import org.jooq.tools.JooqLogger;
 
 /**
  * @author Lukas Eder

jOOQ/src/main/java/org/jooq/impl/DefaultBindContext.java

@@ -57,6 +57,7 @@ import org.jooq.QueryPart;
 import org.jooq.QueryPartInternal;
 import org.jooq.SQLDialect;
 import org.jooq.exception.SQLDialectNotSupportedException;
+import org.jooq.tools.JooqLogger;
 
 /**
  * @author Lukas Eder

jOOQ/src/main/java/org/jooq/impl/Factory.java

@@ -104,6 +104,7 @@ import org.jooq.WindowIgnoreNullsStep;
 import org.jooq.WindowOverStep;
 import org.jooq.exception.InvalidResultException;
 import org.jooq.exception.SQLDialectNotSupportedException;
+import org.jooq.tools.JooqLogger;
 
 /**
  * A factory providing implementations to the org.jooq interfaces

jOOQ/src/main/java/org/jooq/impl/FieldTypeHelper.java

@@ -72,6 +72,7 @@ import org.jooq.Result;
 import org.jooq.SQLDialect;
 import org.jooq.UDTRecord;
 import org.jooq.exception.SQLDialectNotSupportedException;
+import org.jooq.tools.JooqLogger;
 import org.jooq.util.ase.ASEDataType;
 import org.jooq.util.db2.DB2DataType;
 import org.jooq.util.derby.DerbyDataType;

jOOQ/src/main/java/org/jooq/impl/JooqUtil.java

@@ -57,6 +57,7 @@ import org.jooq.Record;
 import org.jooq.RenderContext;
 import org.jooq.Table;
 import org.jooq.exception.DataAccessException;
+import org.jooq.tools.StringUtils;
 
 /**
  * General jooq utilities

jOOQ/src/main/java/org/jooq/impl/MergeImpl.java

@@ -64,6 +64,7 @@ import org.jooq.Select;
 import org.jooq.Table;
 import org.jooq.TableLike;
 import org.jooq.TableRecord;
+import org.jooq.tools.StringUtils;
 
 /**
  * @author Lukas Eder

jOOQ/src/main/java/org/jooq/impl/MetaDataFieldProvider.java

@@ -47,6 +47,7 @@ import org.jooq.DataType;
 import org.jooq.Field;
 import org.jooq.FieldProvider;
 import org.jooq.exception.SQLDialectNotSupportedException;
+import org.jooq.tools.JooqLogger;
 
 /**
  * A <code>FieldProvider</code> providing fields for a JDBC

jOOQ/src/main/java/org/jooq/impl/ResultImpl.java

@@ -38,9 +38,9 @@ package org.jooq.impl;
 
 import static java.lang.Math.max;
 import static java.lang.Math.min;
-import static org.jooq.impl.StringUtils.abbreviate;
-import static org.jooq.impl.StringUtils.leftPad;
-import static org.jooq.impl.StringUtils.rightPad;
+import static org.jooq.tools.StringUtils.abbreviate;
+import static org.jooq.tools.StringUtils.leftPad;
+import static org.jooq.tools.StringUtils.rightPad;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -73,6 +73,7 @@ import org.jooq.Result;
 import org.jooq.Store;
 import org.jooq.Table;
 import org.jooq.TableRecord;
+import org.jooq.tools.StringUtils;
 import org.jooq.tools.json.JSONObject;
 
 import org.w3c.dom.Document;

jOOQ/src/main/java/org/jooq/tools/JooqLogger.java

@@ -33,12 +33,13 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.jooq.impl;
+package org.jooq.tools;
 
 import java.util.logging.Level;
 
 
 
+
 /**
  * The jOOQ logger abstraction
  *

jOOQ/src/main/java/org/jooq/tools/StopWatch.java

@@ -33,7 +33,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package org.jooq.impl;
+package org.jooq.tools;
+
 
 
 /**

jOOQ/src/main/java/org/jooq/tools/StringUtils.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jooq.impl;
+package org.jooq.tools;
 
 /**
  * <p>
@@ -106,7 +106,7 @@ package org.jooq.impl;
  * @since 1.0
  * @version $Id: StringUtils.java 911986 2010-02-19 21:19:05Z niallp $
  */
-public class StringUtils {
+public final class StringUtils {
 
     /**
      * <p>The maximum size to which the padding constant(s) can expand.</p>