Refactored the JDBC packages for Java 9 compliance.

src/main/java/com/j256/ormlite/jdbc/DataSourceConnectionSource.java

@@ -8,7 +8,7 @@
 import javax.sql.DataSource;
 
 import com.j256.ormlite.db.DatabaseType;
-import com.j256.ormlite.db.DatabaseTypeUtils;
+import com.j256.ormlite.jdbc.db.DatabaseTypeUtils;
 import com.j256.ormlite.logger.Logger;
 import com.j256.ormlite.logger.LoggerFactory;
 import com.j256.ormlite.misc.IOUtils;

src/main/java/com/j256/ormlite/jdbc/JdbcConnectionSource.java

@@ -6,7 +6,7 @@
 import java.util.Properties;
 
 import com.j256.ormlite.db.DatabaseType;
-import com.j256.ormlite.db.DatabaseTypeUtils;
+import com.j256.ormlite.jdbc.db.DatabaseTypeUtils;
 import com.j256.ormlite.logger.Logger;
 import com.j256.ormlite.logger.LoggerFactory;
 import com.j256.ormlite.misc.IOUtils;

src/main/java/com/j256/ormlite/db/DatabaseTypeUtils.java → src/main/java/com/j256/ormlite/jdbc/db/DatabaseTypeUtils.java

@@ -1,8 +1,10 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import com.j256.ormlite.db.DatabaseType;
+
 /**
  * Utility class which helps with managing database specific classes.
  * 

src/main/java/com/j256/ormlite/db/Db2DatabaseType.java → src/main/java/com/j256/ormlite/jdbc/db/Db2DatabaseType.java

@@ -1,7 +1,8 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
 
 import java.util.List;
 
+import com.j256.ormlite.db.BaseDatabaseType;
 import com.j256.ormlite.field.FieldType;
 
 /**

src/main/java/com/j256/ormlite/db/DerbyClientServerDatabaseType.java → src/main/java/com/j256/ormlite/jdbc/db/DerbyClientServerDatabaseType.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
 
 /**
  * Derby database type information used to create the tables, etc.. This is for client connections to a remote Derby

src/main/java/com/j256/ormlite/db/DerbyEmbeddedDatabaseType.java → src/main/java/com/j256/ormlite/jdbc/db/DerbyEmbeddedDatabaseType.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -9,6 +9,7 @@
 
 import javax.sql.rowset.serial.SerialBlob;
 
+import com.j256.ormlite.db.BaseDatabaseType;
 import com.j256.ormlite.field.BaseFieldConverter;
 import com.j256.ormlite.field.DataPersister;
 import com.j256.ormlite.field.FieldConverter;
@@ -153,6 +154,11 @@ public void appendInsertNoColumns(StringBuilder sb) {
 		sb.append("VALUES(DEFAULT)");
 	}
 
+	@Override
+	protected void appendSerializableType(StringBuilder sb, FieldType fieldType, int fieldWidth) {
+		super.appendSerializableType(sb, fieldType, fieldWidth);
+	}
+
 	/**
 	 * Conversion from the Object Java field to the BLOB Jdbc type because the varbinary needs a size otherwise.
 	 */

src/main/java/com/j256/ormlite/db/GenericOdbcDatabaseType.java → src/main/java/com/j256/ormlite/jdbc/db/GenericOdbcDatabaseType.java

@@ -1,4 +1,6 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
+
+import com.j256.ormlite.db.BaseDatabaseType;
 
 /**
  * Generic JdbcOdbcBridge database type information used to create the tables, etc..

src/main/java/com/j256/ormlite/db/H2DatabaseType.java → src/main/java/com/j256/ormlite/jdbc/db/H2DatabaseType.java

@@ -1,7 +1,8 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
 
 import java.util.List;
 
+import com.j256.ormlite.db.BaseDatabaseType;
 import com.j256.ormlite.field.FieldType;
 
 /**

src/main/java/com/j256/ormlite/db/HsqldbDatabaseType.java → src/main/java/com/j256/ormlite/jdbc/db/HsqldbDatabaseType.java

@@ -1,7 +1,8 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
 
 import java.util.List;
 
+import com.j256.ormlite.db.BaseDatabaseType;
 import com.j256.ormlite.field.FieldType;
 import com.j256.ormlite.field.SqlType;
 

src/main/java/com/j256/ormlite/db/MariaDbDatabaseType.java → src/main/java/com/j256/ormlite/jdbc/db/MariaDbDatabaseType.java

@@ -1,4 +1,6 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
+
+import com.j256.ormlite.field.FieldType;
 
 /**
  * MariaDB database type information used to create the tables, etc.. It is an extension of MySQL.
@@ -25,4 +27,14 @@ protected String[] getDriverClassNames() {
 	public String getDatabaseName() {
 		return DATABASE_NAME;
 	}
+
+	@Override
+	protected void appendByteArrayType(StringBuilder sb, FieldType fieldType, int fieldWidth) {
+		super.appendByteArrayType(sb, fieldType, fieldWidth);
+	}
+
+	@Override
+	protected void appendLongStringType(StringBuilder sb, FieldType fieldType, int fieldWidth) {
+		super.appendLongStringType(sb, fieldType, fieldWidth);
+	}
 }

src/main/java/com/j256/ormlite/db/MysqlDatabaseType.java → src/main/java/com/j256/ormlite/jdbc/db/MysqlDatabaseType.java

@@ -1,7 +1,8 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
 
 import java.util.List;
 
+import com.j256.ormlite.db.BaseDatabaseType;
 import com.j256.ormlite.field.FieldType;
 
 /**
@@ -94,4 +95,14 @@ public boolean isCreateIfNotExistsSupported() {
 	public boolean isCreateIndexIfNotExistsSupported() {
 		return false;
 	}
+
+	@Override
+	protected void appendByteArrayType(StringBuilder sb, FieldType fieldType, int fieldWidth) {
+		super.appendByteArrayType(sb, fieldType, fieldWidth);
+	}
+
+	@Override
+	protected void appendLongStringType(StringBuilder sb, FieldType fieldType, int fieldWidth) {
+		super.appendLongStringType(sb, fieldType, fieldWidth);
+	}
 }

src/main/java/com/j256/ormlite/db/NetezzaDatabaseType.java → src/main/java/com/j256/ormlite/jdbc/db/NetezzaDatabaseType.java

@@ -1,7 +1,8 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
 
 import java.util.List;
 
+import com.j256.ormlite.db.BaseDatabaseType;
 import com.j256.ormlite.field.FieldType;
 
 /**

src/main/java/com/j256/ormlite/db/OracleDatabaseType.java → src/main/java/com/j256/ormlite/jdbc/db/OracleDatabaseType.java

@@ -1,7 +1,8 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
 
 import java.util.List;
 
+import com.j256.ormlite.db.BaseDatabaseType;
 import com.j256.ormlite.field.DataPersister;
 import com.j256.ormlite.field.DataType;
 import com.j256.ormlite.field.FieldConverter;

src/main/java/com/j256/ormlite/db/PostgresDatabaseType.java → src/main/java/com/j256/ormlite/jdbc/db/PostgresDatabaseType.java

@@ -1,7 +1,8 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
 
 import java.util.List;
 
+import com.j256.ormlite.db.BaseDatabaseType;
 import com.j256.ormlite.field.FieldType;
 
 /**

src/main/java/com/j256/ormlite/db/SqlServerDatabaseType.java → src/main/java/com/j256/ormlite/jdbc/db/SqlServerDatabaseType.java

@@ -1,8 +1,9 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
 
 import java.sql.SQLException;
 import java.util.List;
 
+import com.j256.ormlite.db.BaseDatabaseType;
 import com.j256.ormlite.field.BaseFieldConverter;
 import com.j256.ormlite.field.DataPersister;
 import com.j256.ormlite.field.FieldConverter;

src/main/java/com/j256/ormlite/db/SqlServerJtdsDatabaseType.java → src/main/java/com/j256/ormlite/jdbc/db/SqlServerJtdsDatabaseType.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
 
 /**
  * Microsoft SQL server database type information connected through the JTDS JDBC driver.

src/main/java/com/j256/ormlite/db/SqliteDatabaseType.java → src/main/java/com/j256/ormlite/jdbc/db/SqliteDatabaseType.java

@@ -1,4 +1,6 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
+
+import com.j256.ormlite.db.BaseSqliteDatabaseType;
 
 /**
  * Sqlite database type information used to create the tables, etc..

src/main/java/com/j256/ormlite/logger/Log4j2Log.java → src/main/java/com/j256/ormlite/jdbc/logger/Log4j2Log.java

@@ -1,4 +1,6 @@
-package com.j256.ormlite.logger;
+package com.j256.ormlite.jdbc.logger;
+
+import com.j256.ormlite.logger.Log;
 
 /**
  * Class which implements our {@link com.j256.ormlite.logger.Log} interface by delegating to Apache Log4j2.

src/main/java/com/j256/ormlite/logger/Log4jLog.java → src/main/java/com/j256/ormlite/jdbc/logger/Log4jLog.java

@@ -1,4 +1,6 @@
-package com.j256.ormlite.logger;
+package com.j256.ormlite.jdbc.logger;
+
+import com.j256.ormlite.logger.Log;
 
 /**
  * Class which implements our {@link com.j256.ormlite.logger.Log} interface by delegating to Apache Log4j.

src/main/java/com/j256/ormlite/spring/DaoFactory.java → src/main/java/com/j256/ormlite/jdbc/spring/DaoFactory.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.spring;
+package com.j256.ormlite.jdbc.spring;
 
 import java.sql.SQLException;
 

src/main/java/com/j256/ormlite/spring/TableCreator.java → src/main/java/com/j256/ormlite/jdbc/spring/TableCreator.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.spring;
+package com.j256.ormlite.jdbc.spring;
 
 import java.sql.SQLException;
 import java.util.HashSet;

src/test/java/com/j256/ormlite/BaseJdbcTest.java → src/test/java/com/j256/ormlite/jdbc/BaseJdbcTest.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite;
+package com.j256.ormlite.jdbc;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

src/test/java/com/j256/ormlite/jdbc/DataSourceConnectionSourceTest.java

@@ -14,8 +14,7 @@
 
 import org.junit.Test;
 
-import com.j256.ormlite.BaseJdbcTest;
-import com.j256.ormlite.db.H2DatabaseType;
+import com.j256.ormlite.jdbc.db.H2DatabaseType;
 import com.j256.ormlite.support.DatabaseConnection;
 
 public class DataSourceConnectionSourceTest extends BaseJdbcTest {

src/test/java/com/j256/ormlite/jdbc/JdbcConnectionSourceTest.java

@@ -23,7 +23,7 @@
 import org.junit.Test;
 
 import com.j256.ormlite.BaseCoreTest;
-import com.j256.ormlite.db.H2DatabaseType;
+import com.j256.ormlite.jdbc.db.H2DatabaseType;
 import com.j256.ormlite.support.DatabaseConnection;
 
 public class JdbcConnectionSourceTest extends BaseCoreTest {

src/test/java/com/j256/ormlite/jdbc/JdbcDatabaseConnectionTest.java

@@ -18,7 +18,6 @@
 
 import org.junit.Test;
 
-import com.j256.ormlite.BaseJdbcTest;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.field.FieldType;

src/test/java/com/j256/ormlite/jdbc/JdbcPooledConnectionSourceTest.java

@@ -17,8 +17,8 @@
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.db.DatabaseType;
-import com.j256.ormlite.db.DatabaseTypeUtils;
 import com.j256.ormlite.field.DatabaseField;
+import com.j256.ormlite.jdbc.db.DatabaseTypeUtils;
 import com.j256.ormlite.misc.IOUtils;
 import com.j256.ormlite.support.DatabaseConnection;
 import com.j256.ormlite.table.TableUtils;

src/test/java/com/j256/ormlite/jdbc/JdbcRawResultsImplTest.java

@@ -9,7 +9,6 @@
 
 import org.junit.Test;
 
-import com.j256.ormlite.BaseJdbcTest;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.GenericRawResults;
 import com.j256.ormlite.dao.RawRowMapper;

src/test/java/com/j256/ormlite/WrappedJdbcConnectionSource.java → src/test/java/com/j256/ormlite/jdbc/WrappedJdbcConnectionSource.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite;
+package com.j256.ormlite.jdbc;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
@@ -9,6 +9,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.j256.ormlite.WrappedConnection;
+import com.j256.ormlite.WrappedConnectionSource;
 import com.j256.ormlite.jdbc.JdbcConnectionSource;
 import com.j256.ormlite.jdbc.JdbcDatabaseConnection;
 import com.j256.ormlite.support.DatabaseConnection;

src/test/java/com/j256/ormlite/dao/BulkJdbcDaoTest.java → src/test/java/com/j256/ormlite/jdbc/dao/BulkJdbcDaoTest.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.jdbc.dao;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -7,8 +7,9 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.j256.ormlite.BaseJdbcTest;
+import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.field.DatabaseField;
+import com.j256.ormlite.jdbc.BaseJdbcTest;
 
 public class BulkJdbcDaoTest extends BaseJdbcTest {
 

src/test/java/com/j256/ormlite/dao/DoubleDbOpenTest.java → src/test/java/com/j256/ormlite/jdbc/dao/DoubleDbOpenTest.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.jdbc.dao;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -10,6 +10,8 @@
 import org.junit.Test;
 
 import com.j256.ormlite.BaseCoreTest;
+import com.j256.ormlite.dao.Dao;
+import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.jdbc.JdbcConnectionSource;
 import com.j256.ormlite.support.ConnectionSource;
 import com.j256.ormlite.table.TableUtils;

src/test/java/com/j256/ormlite/dao/JdbcBaseDaoImplTest.java → src/test/java/com/j256/ormlite/jdbc/dao/JdbcBaseDaoImplTest.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.dao;
+package com.j256.ormlite.jdbc.dao;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -31,12 +31,18 @@
 
 import org.junit.Test;
 
-import com.j256.ormlite.BaseJdbcTest;
+import com.j256.ormlite.dao.BaseDaoImpl;
+import com.j256.ormlite.dao.CloseableIterator;
+import com.j256.ormlite.dao.Dao;
+import com.j256.ormlite.dao.DaoManager;
+import com.j256.ormlite.dao.GenericRawResults;
+import com.j256.ormlite.dao.RawRowMapper;
 import com.j256.ormlite.dao.Dao.CreateOrUpdateStatus;
 import com.j256.ormlite.field.DataType;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.field.DatabaseFieldConfig;
 import com.j256.ormlite.field.ForeignCollectionField;
+import com.j256.ormlite.jdbc.BaseJdbcTest;
 import com.j256.ormlite.misc.BaseDaoEnabled;
 import com.j256.ormlite.stmt.DeleteBuilder;
 import com.j256.ormlite.stmt.PreparedQuery;

src/test/java/com/j256/ormlite/db/BaseJdbcDatabaseTypeTest.java → src/test/java/com/j256/ormlite/jdbc/db/BaseJdbcDatabaseTypeTest.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -12,11 +12,12 @@
 
 import org.junit.Test;
 
-import com.j256.ormlite.BaseJdbcTest;
 import com.j256.ormlite.TestUtils;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.field.FieldType;
+import com.j256.ormlite.jdbc.BaseJdbcTest;
 import com.j256.ormlite.jdbc.JdbcConnectionSource;
+import com.j256.ormlite.jdbc.db.DatabaseTypeUtils;
 import com.j256.ormlite.stmt.QueryBuilder;
 import com.j256.ormlite.support.DatabaseConnection;
 import com.j256.ormlite.table.TableInfo;

src/test/java/com/j256/ormlite/db/DatabaseTypeUtilsTest.java → src/test/java/com/j256/ormlite/jdbc/db/DatabaseTypeUtilsTest.java

@@ -1,4 +1,4 @@
-package com.j256.ormlite.db;
+package com.j256.ormlite.jdbc.db;
 
 import static org.junit.Assert.assertEquals;
 
@@ -7,6 +7,8 @@
 import org.junit.Test;
 
 import com.j256.ormlite.jdbc.JdbcConnectionSource;
+import com.j256.ormlite.jdbc.db.DatabaseTypeUtils;
+import com.j256.ormlite.jdbc.db.H2DatabaseType;
 import com.j256.ormlite.support.ConnectionSource;
 
 public class DatabaseTypeUtilsTest {