From 3fbbe84f068a0f38296e352eff754f7ec701e76a Mon Sep 17 00:00:00 2001 From: Gray Watson Date: Tue, 29 Sep 2020 20:00:53 -0700 Subject: [PATCH] Refactored the JDBC packages for Java 9 compliance. --- .../ormlite/jdbc/DataSourceConnectionSource.java | 2 +- .../j256/ormlite/jdbc/JdbcConnectionSource.java | 2 +- .../ormlite/{ => jdbc}/db/DatabaseTypeUtils.java | 4 +++- .../ormlite/{ => jdbc}/db/Db2DatabaseType.java | 3 ++- .../db/DerbyClientServerDatabaseType.java | 2 +- .../{ => jdbc}/db/DerbyEmbeddedDatabaseType.java | 8 +++++++- .../{ => jdbc}/db/GenericOdbcDatabaseType.java | 4 +++- .../j256/ormlite/{ => jdbc}/db/H2DatabaseType.java | 3 ++- .../ormlite/{ => jdbc}/db/HsqldbDatabaseType.java | 3 ++- .../ormlite/{ => jdbc}/db/MariaDbDatabaseType.java | 14 +++++++++++++- .../ormlite/{ => jdbc}/db/MysqlDatabaseType.java | 13 ++++++++++++- .../ormlite/{ => jdbc}/db/NetezzaDatabaseType.java | 3 ++- .../ormlite/{ => jdbc}/db/OracleDatabaseType.java | 3 ++- .../{ => jdbc}/db/PostgresDatabaseType.java | 3 ++- .../{ => jdbc}/db/SqlServerDatabaseType.java | 3 ++- .../{ => jdbc}/db/SqlServerJtdsDatabaseType.java | 2 +- .../ormlite/{ => jdbc}/db/SqliteDatabaseType.java | 4 +++- .../j256/ormlite/{ => jdbc}/logger/Log4j2Log.java | 4 +++- .../j256/ormlite/{ => jdbc}/logger/Log4jLog.java | 4 +++- .../j256/ormlite/{ => jdbc}/spring/DaoFactory.java | 2 +- .../ormlite/{ => jdbc}/spring/TableCreator.java | 2 +- .../com/j256/ormlite/{ => jdbc}/BaseJdbcTest.java | 2 +- .../jdbc/DataSourceConnectionSourceTest.java | 3 +-- .../ormlite/jdbc/JdbcConnectionSourceTest.java | 2 +- .../ormlite/jdbc/JdbcDatabaseConnectionTest.java | 1 - .../jdbc/JdbcPooledConnectionSourceTest.java | 2 +- .../j256/ormlite/jdbc/JdbcRawResultsImplTest.java | 1 - .../{ => jdbc}/WrappedJdbcConnectionSource.java | 4 +++- .../ormlite/{ => jdbc}/dao/BulkJdbcDaoTest.java | 5 +++-- .../ormlite/{ => jdbc}/dao/DoubleDbOpenTest.java | 4 +++- .../{ => jdbc}/dao/JdbcBaseDaoImplTest.java | 10 ++++++++-- .../{ => jdbc}/db/BaseJdbcDatabaseTypeTest.java | 5 +++-- .../{ => jdbc}/db/DatabaseTypeUtilsTest.java | 4 +++- .../ormlite/{ => jdbc}/db/Db2DatabaseTypeTest.java | 3 ++- .../db/DerbyClientServerDatabaseTypeTest.java | 4 +++- .../db/DerbyEmbeddedDatabaseTypeTest.java | 3 ++- .../ormlite/{ => jdbc}/db/H2DatabaseTypeTest.java | 5 ++++- .../{ => jdbc}/db/HsqldbDatabaseTypeTest.java | 4 +++- .../{ => jdbc}/db/MariaDbDatabaseTypeTest.java | 3 ++- .../{ => jdbc}/db/MysqlDatabaseTypeTest.java | 3 ++- .../{ => jdbc}/db/OracleDatabaseTypeTest.java | 4 +++- .../{ => jdbc}/db/PostgresDatabaseTypeTest.java | 4 +++- .../{ => jdbc}/db/SqlServerDatabaseTypeTest.java | 4 +++- .../db/SqlServerJtdsDatabaseConnectTypeTest.java | 3 ++- .../{ => jdbc}/db/SqliteDatabaseTypeTest.java | 3 ++- .../examples/datapersister/DataPersisterMain.java | 2 +- .../examples/datapersister/DateTimePersister.java | 2 +- .../examples/datapersister/MyDatePersister.java | 2 +- .../{ => jdbc}/examples/datapersister/README.txt | 0 .../{ => jdbc}/examples/datapersister/User.java | 2 +- .../{ => jdbc}/examples/fieldConfig/Account.java | 2 +- .../{ => jdbc}/examples/fieldConfig/Delivery.java | 2 +- .../examples/fieldConfig/FieldConfigMain.java | 2 +- .../{ => jdbc}/examples/fieldConfig/README.txt | 0 .../{ => jdbc}/examples/foreign/Account.java | 2 +- .../{ => jdbc}/examples/foreign/ForeignMain.java | 2 +- .../ormlite/{ => jdbc}/examples/foreign/Order.java | 2 +- .../ormlite/{ => jdbc}/examples/foreign/README.txt | 0 .../examples/foreignCollection/Account.java | 2 +- .../foreignCollection/ForeignCollectionMain.java | 2 +- .../examples/foreignCollection/Order.java | 2 +- .../examples/foreignCollection/README.txt | 0 .../examples/manytomany/ManyToManyMain.java | 2 +- .../{ => jdbc}/examples/manytomany/Post.java | 2 +- .../{ => jdbc}/examples/manytomany/README.txt | 0 .../{ => jdbc}/examples/manytomany/User.java | 2 +- .../{ => jdbc}/examples/manytomany/UserPost.java | 2 +- .../{ => jdbc}/examples/simple/Account.java | 2 +- .../ormlite/{ => jdbc}/examples/simple/README.txt | 0 .../{ => jdbc}/examples/simple/SimpleMain.java | 2 +- .../com/j256/ormlite/jdbc/logger/Log4jLogTest.java | 11 +++++++++++ .../misc/JdbcTransactionManagerTest.java | 5 +++-- .../ormlite/{ => jdbc}/spring/DaoFactoryTest.java | 3 ++- .../{ => jdbc}/spring/TableCreatorTest.java | 5 +++-- .../{ => jdbc}/stmt/JdbcQueryBuilderTest.java | 8 ++++++-- .../java/com/j256/ormlite/logger/Log4jLogTest.java | 8 -------- 76 files changed, 169 insertions(+), 83 deletions(-) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/DatabaseTypeUtils.java (96%) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/Db2DatabaseType.java (96%) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/DerbyClientServerDatabaseType.java (96%) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/DerbyEmbeddedDatabaseType.java (96%) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/GenericOdbcDatabaseType.java (88%) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/H2DatabaseType.java (95%) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/HsqldbDatabaseType.java (98%) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/MariaDbDatabaseType.java (63%) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/MysqlDatabaseType.java (87%) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/NetezzaDatabaseType.java (96%) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/OracleDatabaseType.java (98%) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/PostgresDatabaseType.java (97%) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/SqlServerDatabaseType.java (98%) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/SqlServerJtdsDatabaseType.java (97%) rename src/main/java/com/j256/ormlite/{ => jdbc}/db/SqliteDatabaseType.java (93%) rename src/main/java/com/j256/ormlite/{ => jdbc}/logger/Log4j2Log.java (95%) rename src/main/java/com/j256/ormlite/{ => jdbc}/logger/Log4jLog.java (94%) rename src/main/java/com/j256/ormlite/{ => jdbc}/spring/DaoFactory.java (97%) rename src/main/java/com/j256/ormlite/{ => jdbc}/spring/TableCreator.java (99%) rename src/test/java/com/j256/ormlite/{ => jdbc}/BaseJdbcTest.java (99%) rename src/test/java/com/j256/ormlite/{ => jdbc}/WrappedJdbcConnectionSource.java (97%) rename src/test/java/com/j256/ormlite/{ => jdbc}/dao/BulkJdbcDaoTest.java (93%) rename src/test/java/com/j256/ormlite/{ => jdbc}/dao/DoubleDbOpenTest.java (94%) rename src/test/java/com/j256/ormlite/{ => jdbc}/dao/JdbcBaseDaoImplTest.java (99%) rename src/test/java/com/j256/ormlite/{ => jdbc}/db/BaseJdbcDatabaseTypeTest.java (98%) rename src/test/java/com/j256/ormlite/{ => jdbc}/db/DatabaseTypeUtilsTest.java (91%) rename src/test/java/com/j256/ormlite/{ => jdbc}/db/Db2DatabaseTypeTest.java (97%) rename src/test/java/com/j256/ormlite/{ => jdbc}/db/DerbyClientServerDatabaseTypeTest.java (88%) rename src/test/java/com/j256/ormlite/{ => jdbc}/db/DerbyEmbeddedDatabaseTypeTest.java (98%) rename src/test/java/com/j256/ormlite/{ => jdbc}/db/H2DatabaseTypeTest.java (91%) rename src/test/java/com/j256/ormlite/{ => jdbc}/db/HsqldbDatabaseTypeTest.java (98%) rename src/test/java/com/j256/ormlite/{ => jdbc}/db/MariaDbDatabaseTypeTest.java (97%) rename src/test/java/com/j256/ormlite/{ => jdbc}/db/MysqlDatabaseTypeTest.java (97%) rename src/test/java/com/j256/ormlite/{ => jdbc}/db/OracleDatabaseTypeTest.java (98%) rename src/test/java/com/j256/ormlite/{ => jdbc}/db/PostgresDatabaseTypeTest.java (98%) rename src/test/java/com/j256/ormlite/{ => jdbc}/db/SqlServerDatabaseTypeTest.java (97%) rename src/test/java/com/j256/ormlite/{ => jdbc}/db/SqlServerJtdsDatabaseConnectTypeTest.java (82%) rename src/test/java/com/j256/ormlite/{ => jdbc}/db/SqliteDatabaseTypeTest.java (98%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/datapersister/DataPersisterMain.java (98%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/datapersister/DateTimePersister.java (96%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/datapersister/MyDatePersister.java (97%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/datapersister/README.txt (100%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/datapersister/User.java (96%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/fieldConfig/Account.java (95%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/fieldConfig/Delivery.java (94%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/fieldConfig/FieldConfigMain.java (98%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/fieldConfig/README.txt (100%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/foreign/Account.java (96%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/foreign/ForeignMain.java (98%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/foreign/Order.java (96%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/foreign/README.txt (100%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/foreignCollection/Account.java (96%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/foreignCollection/ForeignCollectionMain.java (98%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/foreignCollection/Order.java (96%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/foreignCollection/README.txt (100%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/manytomany/ManyToManyMain.java (99%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/manytomany/Post.java (91%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/manytomany/README.txt (100%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/manytomany/User.java (91%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/manytomany/UserPost.java (95%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/simple/Account.java (96%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/simple/README.txt (100%) rename src/test/java/com/j256/ormlite/{ => jdbc}/examples/simple/SimpleMain.java (99%) create mode 100644 src/test/java/com/j256/ormlite/jdbc/logger/Log4jLogTest.java rename src/test/java/com/j256/ormlite/{ => jdbc}/misc/JdbcTransactionManagerTest.java (97%) rename src/test/java/com/j256/ormlite/{ => jdbc}/spring/DaoFactoryTest.java (92%) rename src/test/java/com/j256/ormlite/{ => jdbc}/spring/TableCreatorTest.java (96%) rename src/test/java/com/j256/ormlite/{ => jdbc}/stmt/JdbcQueryBuilderTest.java (99%) delete mode 100644 src/test/java/com/j256/ormlite/logger/Log4jLogTest.java diff --git a/src/main/java/com/j256/ormlite/jdbc/DataSourceConnectionSource.java b/src/main/java/com/j256/ormlite/jdbc/DataSourceConnectionSource.java index 70c80720..4a85e374 100644 --- a/src/main/java/com/j256/ormlite/jdbc/DataSourceConnectionSource.java +++ b/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; diff --git a/src/main/java/com/j256/ormlite/jdbc/JdbcConnectionSource.java b/src/main/java/com/j256/ormlite/jdbc/JdbcConnectionSource.java index 90ed2a36..2fece2f6 100644 --- a/src/main/java/com/j256/ormlite/jdbc/JdbcConnectionSource.java +++ b/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; diff --git a/src/main/java/com/j256/ormlite/db/DatabaseTypeUtils.java b/src/main/java/com/j256/ormlite/jdbc/db/DatabaseTypeUtils.java similarity index 96% rename from src/main/java/com/j256/ormlite/db/DatabaseTypeUtils.java rename to src/main/java/com/j256/ormlite/jdbc/db/DatabaseTypeUtils.java index 891692e2..b44c7bb5 100644 --- a/src/main/java/com/j256/ormlite/db/DatabaseTypeUtils.java +++ b/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. * diff --git a/src/main/java/com/j256/ormlite/db/Db2DatabaseType.java b/src/main/java/com/j256/ormlite/jdbc/db/Db2DatabaseType.java similarity index 96% rename from src/main/java/com/j256/ormlite/db/Db2DatabaseType.java rename to src/main/java/com/j256/ormlite/jdbc/db/Db2DatabaseType.java index 4d5ced0e..eae31dd8 100644 --- a/src/main/java/com/j256/ormlite/db/Db2DatabaseType.java +++ b/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; /** diff --git a/src/main/java/com/j256/ormlite/db/DerbyClientServerDatabaseType.java b/src/main/java/com/j256/ormlite/jdbc/db/DerbyClientServerDatabaseType.java similarity index 96% rename from src/main/java/com/j256/ormlite/db/DerbyClientServerDatabaseType.java rename to src/main/java/com/j256/ormlite/jdbc/db/DerbyClientServerDatabaseType.java index 0a5d1723..00fbe65a 100644 --- a/src/main/java/com/j256/ormlite/db/DerbyClientServerDatabaseType.java +++ b/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 diff --git a/src/main/java/com/j256/ormlite/db/DerbyEmbeddedDatabaseType.java b/src/main/java/com/j256/ormlite/jdbc/db/DerbyEmbeddedDatabaseType.java similarity index 96% rename from src/main/java/com/j256/ormlite/db/DerbyEmbeddedDatabaseType.java rename to src/main/java/com/j256/ormlite/jdbc/db/DerbyEmbeddedDatabaseType.java index e55a1e33..95aeafdb 100644 --- a/src/main/java/com/j256/ormlite/db/DerbyEmbeddedDatabaseType.java +++ b/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. */ diff --git a/src/main/java/com/j256/ormlite/db/GenericOdbcDatabaseType.java b/src/main/java/com/j256/ormlite/jdbc/db/GenericOdbcDatabaseType.java similarity index 88% rename from src/main/java/com/j256/ormlite/db/GenericOdbcDatabaseType.java rename to src/main/java/com/j256/ormlite/jdbc/db/GenericOdbcDatabaseType.java index a1c13ab0..20ec4de5 100644 --- a/src/main/java/com/j256/ormlite/db/GenericOdbcDatabaseType.java +++ b/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.. diff --git a/src/main/java/com/j256/ormlite/db/H2DatabaseType.java b/src/main/java/com/j256/ormlite/jdbc/db/H2DatabaseType.java similarity index 95% rename from src/main/java/com/j256/ormlite/db/H2DatabaseType.java rename to src/main/java/com/j256/ormlite/jdbc/db/H2DatabaseType.java index d3f6158f..f946d719 100644 --- a/src/main/java/com/j256/ormlite/db/H2DatabaseType.java +++ b/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; /** diff --git a/src/main/java/com/j256/ormlite/db/HsqldbDatabaseType.java b/src/main/java/com/j256/ormlite/jdbc/db/HsqldbDatabaseType.java similarity index 98% rename from src/main/java/com/j256/ormlite/db/HsqldbDatabaseType.java rename to src/main/java/com/j256/ormlite/jdbc/db/HsqldbDatabaseType.java index a84913d9..e4d621b5 100644 --- a/src/main/java/com/j256/ormlite/db/HsqldbDatabaseType.java +++ b/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; diff --git a/src/main/java/com/j256/ormlite/db/MariaDbDatabaseType.java b/src/main/java/com/j256/ormlite/jdbc/db/MariaDbDatabaseType.java similarity index 63% rename from src/main/java/com/j256/ormlite/db/MariaDbDatabaseType.java rename to src/main/java/com/j256/ormlite/jdbc/db/MariaDbDatabaseType.java index 293a9eaa..441b93a4 100644 --- a/src/main/java/com/j256/ormlite/db/MariaDbDatabaseType.java +++ b/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); + } } diff --git a/src/main/java/com/j256/ormlite/db/MysqlDatabaseType.java b/src/main/java/com/j256/ormlite/jdbc/db/MysqlDatabaseType.java similarity index 87% rename from src/main/java/com/j256/ormlite/db/MysqlDatabaseType.java rename to src/main/java/com/j256/ormlite/jdbc/db/MysqlDatabaseType.java index 80e8e256..1a7535a3 100644 --- a/src/main/java/com/j256/ormlite/db/MysqlDatabaseType.java +++ b/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); + } } diff --git a/src/main/java/com/j256/ormlite/db/NetezzaDatabaseType.java b/src/main/java/com/j256/ormlite/jdbc/db/NetezzaDatabaseType.java similarity index 96% rename from src/main/java/com/j256/ormlite/db/NetezzaDatabaseType.java rename to src/main/java/com/j256/ormlite/jdbc/db/NetezzaDatabaseType.java index 0c35d88c..a5396a88 100644 --- a/src/main/java/com/j256/ormlite/db/NetezzaDatabaseType.java +++ b/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; /** diff --git a/src/main/java/com/j256/ormlite/db/OracleDatabaseType.java b/src/main/java/com/j256/ormlite/jdbc/db/OracleDatabaseType.java similarity index 98% rename from src/main/java/com/j256/ormlite/db/OracleDatabaseType.java rename to src/main/java/com/j256/ormlite/jdbc/db/OracleDatabaseType.java index 6c0278b7..c85115ef 100644 --- a/src/main/java/com/j256/ormlite/db/OracleDatabaseType.java +++ b/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; diff --git a/src/main/java/com/j256/ormlite/db/PostgresDatabaseType.java b/src/main/java/com/j256/ormlite/jdbc/db/PostgresDatabaseType.java similarity index 97% rename from src/main/java/com/j256/ormlite/db/PostgresDatabaseType.java rename to src/main/java/com/j256/ormlite/jdbc/db/PostgresDatabaseType.java index 7c870825..55b24e6f 100644 --- a/src/main/java/com/j256/ormlite/db/PostgresDatabaseType.java +++ b/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; /** diff --git a/src/main/java/com/j256/ormlite/db/SqlServerDatabaseType.java b/src/main/java/com/j256/ormlite/jdbc/db/SqlServerDatabaseType.java similarity index 98% rename from src/main/java/com/j256/ormlite/db/SqlServerDatabaseType.java rename to src/main/java/com/j256/ormlite/jdbc/db/SqlServerDatabaseType.java index 3682ae9c..578d1fcf 100644 --- a/src/main/java/com/j256/ormlite/db/SqlServerDatabaseType.java +++ b/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; diff --git a/src/main/java/com/j256/ormlite/db/SqlServerJtdsDatabaseType.java b/src/main/java/com/j256/ormlite/jdbc/db/SqlServerJtdsDatabaseType.java similarity index 97% rename from src/main/java/com/j256/ormlite/db/SqlServerJtdsDatabaseType.java rename to src/main/java/com/j256/ormlite/jdbc/db/SqlServerJtdsDatabaseType.java index 25706ead..4d28eca0 100644 --- a/src/main/java/com/j256/ormlite/db/SqlServerJtdsDatabaseType.java +++ b/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. diff --git a/src/main/java/com/j256/ormlite/db/SqliteDatabaseType.java b/src/main/java/com/j256/ormlite/jdbc/db/SqliteDatabaseType.java similarity index 93% rename from src/main/java/com/j256/ormlite/db/SqliteDatabaseType.java rename to src/main/java/com/j256/ormlite/jdbc/db/SqliteDatabaseType.java index 695ceb9a..b602d4f7 100644 --- a/src/main/java/com/j256/ormlite/db/SqliteDatabaseType.java +++ b/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.. diff --git a/src/main/java/com/j256/ormlite/logger/Log4j2Log.java b/src/main/java/com/j256/ormlite/jdbc/logger/Log4j2Log.java similarity index 95% rename from src/main/java/com/j256/ormlite/logger/Log4j2Log.java rename to src/main/java/com/j256/ormlite/jdbc/logger/Log4j2Log.java index e37a50c4..3ae0b04f 100644 --- a/src/main/java/com/j256/ormlite/logger/Log4j2Log.java +++ b/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. diff --git a/src/main/java/com/j256/ormlite/logger/Log4jLog.java b/src/main/java/com/j256/ormlite/jdbc/logger/Log4jLog.java similarity index 94% rename from src/main/java/com/j256/ormlite/logger/Log4jLog.java rename to src/main/java/com/j256/ormlite/jdbc/logger/Log4jLog.java index c89579ed..2ce84b57 100644 --- a/src/main/java/com/j256/ormlite/logger/Log4jLog.java +++ b/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. diff --git a/src/main/java/com/j256/ormlite/spring/DaoFactory.java b/src/main/java/com/j256/ormlite/jdbc/spring/DaoFactory.java similarity index 97% rename from src/main/java/com/j256/ormlite/spring/DaoFactory.java rename to src/main/java/com/j256/ormlite/jdbc/spring/DaoFactory.java index 951e8a7f..73a8f312 100644 --- a/src/main/java/com/j256/ormlite/spring/DaoFactory.java +++ b/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; diff --git a/src/main/java/com/j256/ormlite/spring/TableCreator.java b/src/main/java/com/j256/ormlite/jdbc/spring/TableCreator.java similarity index 99% rename from src/main/java/com/j256/ormlite/spring/TableCreator.java rename to src/main/java/com/j256/ormlite/jdbc/spring/TableCreator.java index 78d04a5b..e800c7b1 100644 --- a/src/main/java/com/j256/ormlite/spring/TableCreator.java +++ b/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; diff --git a/src/test/java/com/j256/ormlite/BaseJdbcTest.java b/src/test/java/com/j256/ormlite/jdbc/BaseJdbcTest.java similarity index 99% rename from src/test/java/com/j256/ormlite/BaseJdbcTest.java rename to src/test/java/com/j256/ormlite/jdbc/BaseJdbcTest.java index c45474fd..17c78f12 100644 --- a/src/test/java/com/j256/ormlite/BaseJdbcTest.java +++ b/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; diff --git a/src/test/java/com/j256/ormlite/jdbc/DataSourceConnectionSourceTest.java b/src/test/java/com/j256/ormlite/jdbc/DataSourceConnectionSourceTest.java index d4a1e70f..8ce486b8 100644 --- a/src/test/java/com/j256/ormlite/jdbc/DataSourceConnectionSourceTest.java +++ b/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 { diff --git a/src/test/java/com/j256/ormlite/jdbc/JdbcConnectionSourceTest.java b/src/test/java/com/j256/ormlite/jdbc/JdbcConnectionSourceTest.java index 106d0724..1bda5561 100644 --- a/src/test/java/com/j256/ormlite/jdbc/JdbcConnectionSourceTest.java +++ b/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 { diff --git a/src/test/java/com/j256/ormlite/jdbc/JdbcDatabaseConnectionTest.java b/src/test/java/com/j256/ormlite/jdbc/JdbcDatabaseConnectionTest.java index e43a56fd..e12f3ad3 100644 --- a/src/test/java/com/j256/ormlite/jdbc/JdbcDatabaseConnectionTest.java +++ b/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; diff --git a/src/test/java/com/j256/ormlite/jdbc/JdbcPooledConnectionSourceTest.java b/src/test/java/com/j256/ormlite/jdbc/JdbcPooledConnectionSourceTest.java index 3acc2c61..1200ac44 100644 --- a/src/test/java/com/j256/ormlite/jdbc/JdbcPooledConnectionSourceTest.java +++ b/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; diff --git a/src/test/java/com/j256/ormlite/jdbc/JdbcRawResultsImplTest.java b/src/test/java/com/j256/ormlite/jdbc/JdbcRawResultsImplTest.java index 3f535316..b9f17a65 100644 --- a/src/test/java/com/j256/ormlite/jdbc/JdbcRawResultsImplTest.java +++ b/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; diff --git a/src/test/java/com/j256/ormlite/WrappedJdbcConnectionSource.java b/src/test/java/com/j256/ormlite/jdbc/WrappedJdbcConnectionSource.java similarity index 97% rename from src/test/java/com/j256/ormlite/WrappedJdbcConnectionSource.java rename to src/test/java/com/j256/ormlite/jdbc/WrappedJdbcConnectionSource.java index 9151bfd1..652a0d71 100644 --- a/src/test/java/com/j256/ormlite/WrappedJdbcConnectionSource.java +++ b/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; diff --git a/src/test/java/com/j256/ormlite/dao/BulkJdbcDaoTest.java b/src/test/java/com/j256/ormlite/jdbc/dao/BulkJdbcDaoTest.java similarity index 93% rename from src/test/java/com/j256/ormlite/dao/BulkJdbcDaoTest.java rename to src/test/java/com/j256/ormlite/jdbc/dao/BulkJdbcDaoTest.java index febd9fd9..57c8f332 100644 --- a/src/test/java/com/j256/ormlite/dao/BulkJdbcDaoTest.java +++ b/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 { diff --git a/src/test/java/com/j256/ormlite/dao/DoubleDbOpenTest.java b/src/test/java/com/j256/ormlite/jdbc/dao/DoubleDbOpenTest.java similarity index 94% rename from src/test/java/com/j256/ormlite/dao/DoubleDbOpenTest.java rename to src/test/java/com/j256/ormlite/jdbc/dao/DoubleDbOpenTest.java index add151d6..8443a0d9 100644 --- a/src/test/java/com/j256/ormlite/dao/DoubleDbOpenTest.java +++ b/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; diff --git a/src/test/java/com/j256/ormlite/dao/JdbcBaseDaoImplTest.java b/src/test/java/com/j256/ormlite/jdbc/dao/JdbcBaseDaoImplTest.java similarity index 99% rename from src/test/java/com/j256/ormlite/dao/JdbcBaseDaoImplTest.java rename to src/test/java/com/j256/ormlite/jdbc/dao/JdbcBaseDaoImplTest.java index 1ccf0c04..d5ac1faa 100644 --- a/src/test/java/com/j256/ormlite/dao/JdbcBaseDaoImplTest.java +++ b/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; diff --git a/src/test/java/com/j256/ormlite/db/BaseJdbcDatabaseTypeTest.java b/src/test/java/com/j256/ormlite/jdbc/db/BaseJdbcDatabaseTypeTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/db/BaseJdbcDatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/jdbc/db/BaseJdbcDatabaseTypeTest.java index c9b1cce2..735b0744 100644 --- a/src/test/java/com/j256/ormlite/db/BaseJdbcDatabaseTypeTest.java +++ b/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; diff --git a/src/test/java/com/j256/ormlite/db/DatabaseTypeUtilsTest.java b/src/test/java/com/j256/ormlite/jdbc/db/DatabaseTypeUtilsTest.java similarity index 91% rename from src/test/java/com/j256/ormlite/db/DatabaseTypeUtilsTest.java rename to src/test/java/com/j256/ormlite/jdbc/db/DatabaseTypeUtilsTest.java index 0aad7b72..0d4ec941 100644 --- a/src/test/java/com/j256/ormlite/db/DatabaseTypeUtilsTest.java +++ b/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 { diff --git a/src/test/java/com/j256/ormlite/db/Db2DatabaseTypeTest.java b/src/test/java/com/j256/ormlite/jdbc/db/Db2DatabaseTypeTest.java similarity index 97% rename from src/test/java/com/j256/ormlite/db/Db2DatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/jdbc/db/Db2DatabaseTypeTest.java index 2cf1bd4d..8d32d9e9 100644 --- a/src/test/java/com/j256/ormlite/db/Db2DatabaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/db/Db2DatabaseTypeTest.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; @@ -13,6 +13,7 @@ import com.j256.ormlite.TestUtils; import com.j256.ormlite.field.FieldType; import com.j256.ormlite.jdbc.JdbcConnectionSource; +import com.j256.ormlite.jdbc.db.Db2DatabaseType; import com.j256.ormlite.table.TableInfo; public class Db2DatabaseTypeTest extends BaseJdbcDatabaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/db/DerbyClientServerDatabaseTypeTest.java b/src/test/java/com/j256/ormlite/jdbc/db/DerbyClientServerDatabaseTypeTest.java similarity index 88% rename from src/test/java/com/j256/ormlite/db/DerbyClientServerDatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/jdbc/db/DerbyClientServerDatabaseTypeTest.java index 53b4cfba..2abce13b 100644 --- a/src/test/java/com/j256/ormlite/db/DerbyClientServerDatabaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/db/DerbyClientServerDatabaseTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.db; +package com.j256.ormlite.jdbc.db; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertFalse; @@ -6,6 +6,8 @@ import org.junit.Test; +import com.j256.ormlite.jdbc.db.DerbyClientServerDatabaseType; + public class DerbyClientServerDatabaseTypeTest extends DerbyEmbeddedDatabaseTypeTest { @Test diff --git a/src/test/java/com/j256/ormlite/db/DerbyEmbeddedDatabaseTypeTest.java b/src/test/java/com/j256/ormlite/jdbc/db/DerbyEmbeddedDatabaseTypeTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/db/DerbyEmbeddedDatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/jdbc/db/DerbyEmbeddedDatabaseTypeTest.java index 3020b71c..843ab898 100644 --- a/src/test/java/com/j256/ormlite/db/DerbyEmbeddedDatabaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/db/DerbyEmbeddedDatabaseTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.db; +package com.j256.ormlite.jdbc.db; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -23,6 +23,7 @@ import com.j256.ormlite.field.FieldType; import com.j256.ormlite.field.SqlType; import com.j256.ormlite.jdbc.JdbcConnectionSource; +import com.j256.ormlite.jdbc.db.DerbyEmbeddedDatabaseType; import com.j256.ormlite.support.DatabaseResults; import com.j256.ormlite.table.TableInfo; diff --git a/src/test/java/com/j256/ormlite/db/H2DatabaseTypeTest.java b/src/test/java/com/j256/ormlite/jdbc/db/H2DatabaseTypeTest.java similarity index 91% rename from src/test/java/com/j256/ormlite/db/H2DatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/jdbc/db/H2DatabaseTypeTest.java index 636ae4d3..50ce67d8 100644 --- a/src/test/java/com/j256/ormlite/db/H2DatabaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/db/H2DatabaseTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.db; +package com.j256.ormlite.jdbc.db; import static org.junit.Assert.assertEquals; @@ -10,6 +10,9 @@ import com.j256.ormlite.TestUtils; import com.j256.ormlite.jdbc.JdbcConnectionSource; +import com.j256.ormlite.jdbc.db.DatabaseTypeUtils; +import com.j256.ormlite.jdbc.db.DerbyEmbeddedDatabaseType; +import com.j256.ormlite.jdbc.db.H2DatabaseType; import com.j256.ormlite.support.DatabaseConnection; import com.j256.ormlite.table.TableInfo; diff --git a/src/test/java/com/j256/ormlite/db/HsqldbDatabaseTypeTest.java b/src/test/java/com/j256/ormlite/jdbc/db/HsqldbDatabaseTypeTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/db/HsqldbDatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/jdbc/db/HsqldbDatabaseTypeTest.java index ad2e1346..4cb335c3 100644 --- a/src/test/java/com/j256/ormlite/db/HsqldbDatabaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/db/HsqldbDatabaseTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.db; +package com.j256.ormlite.jdbc.db; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -18,10 +18,12 @@ import com.j256.ormlite.TestUtils; import com.j256.ormlite.dao.BaseDaoImpl; +import com.j256.ormlite.db.DatabaseType; import com.j256.ormlite.field.DataPersister; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.field.FieldType; import com.j256.ormlite.jdbc.JdbcConnectionSource; +import com.j256.ormlite.jdbc.db.HsqldbDatabaseType; import com.j256.ormlite.stmt.QueryBuilder; import com.j256.ormlite.table.TableInfo; diff --git a/src/test/java/com/j256/ormlite/db/MariaDbDatabaseTypeTest.java b/src/test/java/com/j256/ormlite/jdbc/db/MariaDbDatabaseTypeTest.java similarity index 97% rename from src/test/java/com/j256/ormlite/db/MariaDbDatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/jdbc/db/MariaDbDatabaseTypeTest.java index 9e38e6f0..d160052a 100644 --- a/src/test/java/com/j256/ormlite/db/MariaDbDatabaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/db/MariaDbDatabaseTypeTest.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.assertTrue; @@ -11,6 +11,7 @@ import com.j256.ormlite.field.FieldType; import com.j256.ormlite.jdbc.JdbcConnectionSource; +import com.j256.ormlite.jdbc.db.MariaDbDatabaseType; import com.j256.ormlite.table.TableInfo; public class MariaDbDatabaseTypeTest extends BaseJdbcDatabaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/db/MysqlDatabaseTypeTest.java b/src/test/java/com/j256/ormlite/jdbc/db/MysqlDatabaseTypeTest.java similarity index 97% rename from src/test/java/com/j256/ormlite/db/MysqlDatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/jdbc/db/MysqlDatabaseTypeTest.java index f67ee646..7293f826 100644 --- a/src/test/java/com/j256/ormlite/db/MysqlDatabaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/db/MysqlDatabaseTypeTest.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.assertTrue; @@ -11,6 +11,7 @@ import com.j256.ormlite.field.FieldType; import com.j256.ormlite.jdbc.JdbcConnectionSource; +import com.j256.ormlite.jdbc.db.MysqlDatabaseType; import com.j256.ormlite.table.TableInfo; public class MysqlDatabaseTypeTest extends BaseJdbcDatabaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/db/OracleDatabaseTypeTest.java b/src/test/java/com/j256/ormlite/jdbc/db/OracleDatabaseTypeTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/db/OracleDatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/jdbc/db/OracleDatabaseTypeTest.java index 1e18f952..4743fdde 100644 --- a/src/test/java/com/j256/ormlite/db/OracleDatabaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/db/OracleDatabaseTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.db; +package com.j256.ormlite.jdbc.db; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -17,9 +17,11 @@ import org.junit.Test; import com.j256.ormlite.TestUtils; +import com.j256.ormlite.db.DatabaseType; import com.j256.ormlite.field.DataPersister; import com.j256.ormlite.field.FieldType; import com.j256.ormlite.jdbc.JdbcConnectionSource; +import com.j256.ormlite.jdbc.db.OracleDatabaseType; import com.j256.ormlite.table.TableInfo; public class OracleDatabaseTypeTest extends BaseJdbcDatabaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/db/PostgresDatabaseTypeTest.java b/src/test/java/com/j256/ormlite/jdbc/db/PostgresDatabaseTypeTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/db/PostgresDatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/jdbc/db/PostgresDatabaseTypeTest.java index a8a634d9..68f66b94 100644 --- a/src/test/java/com/j256/ormlite/db/PostgresDatabaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/db/PostgresDatabaseTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.db; +package com.j256.ormlite.jdbc.db; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -16,9 +16,11 @@ import org.junit.Test; import com.j256.ormlite.TestUtils; +import com.j256.ormlite.db.DatabaseType; import com.j256.ormlite.field.DataPersister; import com.j256.ormlite.field.FieldType; import com.j256.ormlite.jdbc.JdbcConnectionSource; +import com.j256.ormlite.jdbc.db.PostgresDatabaseType; import com.j256.ormlite.table.TableInfo; public class PostgresDatabaseTypeTest extends BaseJdbcDatabaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/db/SqlServerDatabaseTypeTest.java b/src/test/java/com/j256/ormlite/jdbc/db/SqlServerDatabaseTypeTest.java similarity index 97% rename from src/test/java/com/j256/ormlite/db/SqlServerDatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/jdbc/db/SqlServerDatabaseTypeTest.java index c5dc3577..ed37b0e4 100644 --- a/src/test/java/com/j256/ormlite/db/SqlServerDatabaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/db/SqlServerDatabaseTypeTest.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; @@ -14,6 +14,8 @@ import com.j256.ormlite.dao.Dao; import com.j256.ormlite.field.FieldType; import com.j256.ormlite.jdbc.JdbcConnectionSource; +import com.j256.ormlite.jdbc.db.H2DatabaseType; +import com.j256.ormlite.jdbc.db.SqlServerDatabaseType; import com.j256.ormlite.stmt.QueryBuilder; import com.j256.ormlite.table.TableInfo; diff --git a/src/test/java/com/j256/ormlite/db/SqlServerJtdsDatabaseConnectTypeTest.java b/src/test/java/com/j256/ormlite/jdbc/db/SqlServerJtdsDatabaseConnectTypeTest.java similarity index 82% rename from src/test/java/com/j256/ormlite/db/SqlServerJtdsDatabaseConnectTypeTest.java rename to src/test/java/com/j256/ormlite/jdbc/db/SqlServerJtdsDatabaseConnectTypeTest.java index 44727fdd..395d75a9 100644 --- a/src/test/java/com/j256/ormlite/db/SqlServerJtdsDatabaseConnectTypeTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/db/SqlServerJtdsDatabaseConnectTypeTest.java @@ -1,8 +1,9 @@ -package com.j256.ormlite.db; +package com.j256.ormlite.jdbc.db; import java.sql.SQLException; import com.j256.ormlite.jdbc.JdbcConnectionSource; +import com.j256.ormlite.jdbc.db.SqlServerJtdsDatabaseType; public class SqlServerJtdsDatabaseConnectTypeTest extends SqlServerDatabaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/db/SqliteDatabaseTypeTest.java b/src/test/java/com/j256/ormlite/jdbc/db/SqliteDatabaseTypeTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/db/SqliteDatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/jdbc/db/SqliteDatabaseTypeTest.java index e8f68a59..5a76530d 100644 --- a/src/test/java/com/j256/ormlite/db/SqliteDatabaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/db/SqliteDatabaseTypeTest.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; @@ -17,6 +17,7 @@ import com.j256.ormlite.field.DataType; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.jdbc.JdbcConnectionSource; +import com.j256.ormlite.jdbc.db.SqliteDatabaseType; import com.j256.ormlite.stmt.QueryBuilder; import com.j256.ormlite.table.TableInfo; diff --git a/src/test/java/com/j256/ormlite/examples/datapersister/DataPersisterMain.java b/src/test/java/com/j256/ormlite/jdbc/examples/datapersister/DataPersisterMain.java similarity index 98% rename from src/test/java/com/j256/ormlite/examples/datapersister/DataPersisterMain.java rename to src/test/java/com/j256/ormlite/jdbc/examples/datapersister/DataPersisterMain.java index aded6f4d..a7f89868 100644 --- a/src/test/java/com/j256/ormlite/examples/datapersister/DataPersisterMain.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/datapersister/DataPersisterMain.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.datapersister; +package com.j256.ormlite.jdbc.examples.datapersister; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/src/test/java/com/j256/ormlite/examples/datapersister/DateTimePersister.java b/src/test/java/com/j256/ormlite/jdbc/examples/datapersister/DateTimePersister.java similarity index 96% rename from src/test/java/com/j256/ormlite/examples/datapersister/DateTimePersister.java rename to src/test/java/com/j256/ormlite/jdbc/examples/datapersister/DateTimePersister.java index 50dc5612..fa55acf5 100644 --- a/src/test/java/com/j256/ormlite/examples/datapersister/DateTimePersister.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/datapersister/DateTimePersister.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.datapersister; +package com.j256.ormlite.jdbc.examples.datapersister; import org.joda.time.DateTime; diff --git a/src/test/java/com/j256/ormlite/examples/datapersister/MyDatePersister.java b/src/test/java/com/j256/ormlite/jdbc/examples/datapersister/MyDatePersister.java similarity index 97% rename from src/test/java/com/j256/ormlite/examples/datapersister/MyDatePersister.java rename to src/test/java/com/j256/ormlite/jdbc/examples/datapersister/MyDatePersister.java index 042eb476..597433ee 100644 --- a/src/test/java/com/j256/ormlite/examples/datapersister/MyDatePersister.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/datapersister/MyDatePersister.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.datapersister; +package com.j256.ormlite.jdbc.examples.datapersister; import java.sql.SQLException; import java.sql.Timestamp; diff --git a/src/test/java/com/j256/ormlite/examples/datapersister/README.txt b/src/test/java/com/j256/ormlite/jdbc/examples/datapersister/README.txt similarity index 100% rename from src/test/java/com/j256/ormlite/examples/datapersister/README.txt rename to src/test/java/com/j256/ormlite/jdbc/examples/datapersister/README.txt diff --git a/src/test/java/com/j256/ormlite/examples/datapersister/User.java b/src/test/java/com/j256/ormlite/jdbc/examples/datapersister/User.java similarity index 96% rename from src/test/java/com/j256/ormlite/examples/datapersister/User.java rename to src/test/java/com/j256/ormlite/jdbc/examples/datapersister/User.java index 2ed84a2b..8f8ab779 100644 --- a/src/test/java/com/j256/ormlite/examples/datapersister/User.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/datapersister/User.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.datapersister; +package com.j256.ormlite.jdbc.examples.datapersister; import java.util.Date; diff --git a/src/test/java/com/j256/ormlite/examples/fieldConfig/Account.java b/src/test/java/com/j256/ormlite/jdbc/examples/fieldConfig/Account.java similarity index 95% rename from src/test/java/com/j256/ormlite/examples/fieldConfig/Account.java rename to src/test/java/com/j256/ormlite/jdbc/examples/fieldConfig/Account.java index 7da50d69..2591c89a 100644 --- a/src/test/java/com/j256/ormlite/examples/fieldConfig/Account.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/fieldConfig/Account.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.fieldConfig; +package com.j256.ormlite.jdbc.examples.fieldConfig; /** * Example account object that is persisted to disk by the DAO and other example classes. diff --git a/src/test/java/com/j256/ormlite/examples/fieldConfig/Delivery.java b/src/test/java/com/j256/ormlite/jdbc/examples/fieldConfig/Delivery.java similarity index 94% rename from src/test/java/com/j256/ormlite/examples/fieldConfig/Delivery.java rename to src/test/java/com/j256/ormlite/jdbc/examples/fieldConfig/Delivery.java index a4fb0ee8..c67fb3fa 100644 --- a/src/test/java/com/j256/ormlite/examples/fieldConfig/Delivery.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/fieldConfig/Delivery.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.fieldConfig; +package com.j256.ormlite.jdbc.examples.fieldConfig; import java.util.Date; diff --git a/src/test/java/com/j256/ormlite/examples/fieldConfig/FieldConfigMain.java b/src/test/java/com/j256/ormlite/jdbc/examples/fieldConfig/FieldConfigMain.java similarity index 98% rename from src/test/java/com/j256/ormlite/examples/fieldConfig/FieldConfigMain.java rename to src/test/java/com/j256/ormlite/jdbc/examples/fieldConfig/FieldConfigMain.java index 5bd2097d..8a9fd874 100644 --- a/src/test/java/com/j256/ormlite/examples/fieldConfig/FieldConfigMain.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/fieldConfig/FieldConfigMain.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.fieldConfig; +package com.j256.ormlite.jdbc.examples.fieldConfig; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/src/test/java/com/j256/ormlite/examples/fieldConfig/README.txt b/src/test/java/com/j256/ormlite/jdbc/examples/fieldConfig/README.txt similarity index 100% rename from src/test/java/com/j256/ormlite/examples/fieldConfig/README.txt rename to src/test/java/com/j256/ormlite/jdbc/examples/fieldConfig/README.txt diff --git a/src/test/java/com/j256/ormlite/examples/foreign/Account.java b/src/test/java/com/j256/ormlite/jdbc/examples/foreign/Account.java similarity index 96% rename from src/test/java/com/j256/ormlite/examples/foreign/Account.java rename to src/test/java/com/j256/ormlite/jdbc/examples/foreign/Account.java index fd7c24b1..219095cf 100644 --- a/src/test/java/com/j256/ormlite/examples/foreign/Account.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/foreign/Account.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.foreign; +package com.j256.ormlite.jdbc.examples.foreign; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; diff --git a/src/test/java/com/j256/ormlite/examples/foreign/ForeignMain.java b/src/test/java/com/j256/ormlite/jdbc/examples/foreign/ForeignMain.java similarity index 98% rename from src/test/java/com/j256/ormlite/examples/foreign/ForeignMain.java rename to src/test/java/com/j256/ormlite/jdbc/examples/foreign/ForeignMain.java index 9848831b..1ef6d84d 100644 --- a/src/test/java/com/j256/ormlite/examples/foreign/ForeignMain.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/foreign/ForeignMain.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.foreign; +package com.j256.ormlite.jdbc.examples.foreign; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/src/test/java/com/j256/ormlite/examples/foreign/Order.java b/src/test/java/com/j256/ormlite/jdbc/examples/foreign/Order.java similarity index 96% rename from src/test/java/com/j256/ormlite/examples/foreign/Order.java rename to src/test/java/com/j256/ormlite/jdbc/examples/foreign/Order.java index 8eafdfc4..4a9eb107 100644 --- a/src/test/java/com/j256/ormlite/examples/foreign/Order.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/foreign/Order.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.foreign; +package com.j256.ormlite.jdbc.examples.foreign; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; diff --git a/src/test/java/com/j256/ormlite/examples/foreign/README.txt b/src/test/java/com/j256/ormlite/jdbc/examples/foreign/README.txt similarity index 100% rename from src/test/java/com/j256/ormlite/examples/foreign/README.txt rename to src/test/java/com/j256/ormlite/jdbc/examples/foreign/README.txt diff --git a/src/test/java/com/j256/ormlite/examples/foreignCollection/Account.java b/src/test/java/com/j256/ormlite/jdbc/examples/foreignCollection/Account.java similarity index 96% rename from src/test/java/com/j256/ormlite/examples/foreignCollection/Account.java rename to src/test/java/com/j256/ormlite/jdbc/examples/foreignCollection/Account.java index cce42805..7f324ef2 100644 --- a/src/test/java/com/j256/ormlite/examples/foreignCollection/Account.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/foreignCollection/Account.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.foreignCollection; +package com.j256.ormlite.jdbc.examples.foreignCollection; import com.j256.ormlite.dao.ForeignCollection; import com.j256.ormlite.field.DatabaseField; diff --git a/src/test/java/com/j256/ormlite/examples/foreignCollection/ForeignCollectionMain.java b/src/test/java/com/j256/ormlite/jdbc/examples/foreignCollection/ForeignCollectionMain.java similarity index 98% rename from src/test/java/com/j256/ormlite/examples/foreignCollection/ForeignCollectionMain.java rename to src/test/java/com/j256/ormlite/jdbc/examples/foreignCollection/ForeignCollectionMain.java index 12ac2882..f4816c75 100644 --- a/src/test/java/com/j256/ormlite/examples/foreignCollection/ForeignCollectionMain.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/foreignCollection/ForeignCollectionMain.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.foreignCollection; +package com.j256.ormlite.jdbc.examples.foreignCollection; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/src/test/java/com/j256/ormlite/examples/foreignCollection/Order.java b/src/test/java/com/j256/ormlite/jdbc/examples/foreignCollection/Order.java similarity index 96% rename from src/test/java/com/j256/ormlite/examples/foreignCollection/Order.java rename to src/test/java/com/j256/ormlite/jdbc/examples/foreignCollection/Order.java index 3f59c7df..1345cdad 100644 --- a/src/test/java/com/j256/ormlite/examples/foreignCollection/Order.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/foreignCollection/Order.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.foreignCollection; +package com.j256.ormlite.jdbc.examples.foreignCollection; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; diff --git a/src/test/java/com/j256/ormlite/examples/foreignCollection/README.txt b/src/test/java/com/j256/ormlite/jdbc/examples/foreignCollection/README.txt similarity index 100% rename from src/test/java/com/j256/ormlite/examples/foreignCollection/README.txt rename to src/test/java/com/j256/ormlite/jdbc/examples/foreignCollection/README.txt diff --git a/src/test/java/com/j256/ormlite/examples/manytomany/ManyToManyMain.java b/src/test/java/com/j256/ormlite/jdbc/examples/manytomany/ManyToManyMain.java similarity index 99% rename from src/test/java/com/j256/ormlite/examples/manytomany/ManyToManyMain.java rename to src/test/java/com/j256/ormlite/jdbc/examples/manytomany/ManyToManyMain.java index fe1140e0..aa3b7f56 100644 --- a/src/test/java/com/j256/ormlite/examples/manytomany/ManyToManyMain.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/manytomany/ManyToManyMain.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.manytomany; +package com.j256.ormlite.jdbc.examples.manytomany; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/j256/ormlite/examples/manytomany/Post.java b/src/test/java/com/j256/ormlite/jdbc/examples/manytomany/Post.java similarity index 91% rename from src/test/java/com/j256/ormlite/examples/manytomany/Post.java rename to src/test/java/com/j256/ormlite/jdbc/examples/manytomany/Post.java index 086dc844..8501a51e 100644 --- a/src/test/java/com/j256/ormlite/examples/manytomany/Post.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/manytomany/Post.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.manytomany; +package com.j256.ormlite.jdbc.examples.manytomany; import com.j256.ormlite.field.DatabaseField; diff --git a/src/test/java/com/j256/ormlite/examples/manytomany/README.txt b/src/test/java/com/j256/ormlite/jdbc/examples/manytomany/README.txt similarity index 100% rename from src/test/java/com/j256/ormlite/examples/manytomany/README.txt rename to src/test/java/com/j256/ormlite/jdbc/examples/manytomany/README.txt diff --git a/src/test/java/com/j256/ormlite/examples/manytomany/User.java b/src/test/java/com/j256/ormlite/jdbc/examples/manytomany/User.java similarity index 91% rename from src/test/java/com/j256/ormlite/examples/manytomany/User.java rename to src/test/java/com/j256/ormlite/jdbc/examples/manytomany/User.java index cca0a2e8..7cf74123 100644 --- a/src/test/java/com/j256/ormlite/examples/manytomany/User.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/manytomany/User.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.manytomany; +package com.j256.ormlite.jdbc.examples.manytomany; import com.j256.ormlite.field.DatabaseField; diff --git a/src/test/java/com/j256/ormlite/examples/manytomany/UserPost.java b/src/test/java/com/j256/ormlite/jdbc/examples/manytomany/UserPost.java similarity index 95% rename from src/test/java/com/j256/ormlite/examples/manytomany/UserPost.java rename to src/test/java/com/j256/ormlite/jdbc/examples/manytomany/UserPost.java index 94d44493..eb27891e 100644 --- a/src/test/java/com/j256/ormlite/examples/manytomany/UserPost.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/manytomany/UserPost.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.manytomany; +package com.j256.ormlite.jdbc.examples.manytomany; import com.j256.ormlite.field.DatabaseField; diff --git a/src/test/java/com/j256/ormlite/examples/simple/Account.java b/src/test/java/com/j256/ormlite/jdbc/examples/simple/Account.java similarity index 96% rename from src/test/java/com/j256/ormlite/examples/simple/Account.java rename to src/test/java/com/j256/ormlite/jdbc/examples/simple/Account.java index 57b92c0a..5cc9934b 100644 --- a/src/test/java/com/j256/ormlite/examples/simple/Account.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/simple/Account.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.simple; +package com.j256.ormlite.jdbc.examples.simple; import com.j256.ormlite.field.DatabaseField; import com.j256.ormlite.table.DatabaseTable; diff --git a/src/test/java/com/j256/ormlite/examples/simple/README.txt b/src/test/java/com/j256/ormlite/jdbc/examples/simple/README.txt similarity index 100% rename from src/test/java/com/j256/ormlite/examples/simple/README.txt rename to src/test/java/com/j256/ormlite/jdbc/examples/simple/README.txt diff --git a/src/test/java/com/j256/ormlite/examples/simple/SimpleMain.java b/src/test/java/com/j256/ormlite/jdbc/examples/simple/SimpleMain.java similarity index 99% rename from src/test/java/com/j256/ormlite/examples/simple/SimpleMain.java rename to src/test/java/com/j256/ormlite/jdbc/examples/simple/SimpleMain.java index b0257142..2a00df17 100644 --- a/src/test/java/com/j256/ormlite/examples/simple/SimpleMain.java +++ b/src/test/java/com/j256/ormlite/jdbc/examples/simple/SimpleMain.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.examples.simple; +package com.j256.ormlite.jdbc.examples.simple; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/src/test/java/com/j256/ormlite/jdbc/logger/Log4jLogTest.java b/src/test/java/com/j256/ormlite/jdbc/logger/Log4jLogTest.java new file mode 100644 index 00000000..ccf8abd3 --- /dev/null +++ b/src/test/java/com/j256/ormlite/jdbc/logger/Log4jLogTest.java @@ -0,0 +1,11 @@ +package com.j256.ormlite.jdbc.logger; + +import com.j256.ormlite.jdbc.logger.Log4jLog; +import com.j256.ormlite.logger.BaseLogTest; + +public class Log4jLogTest extends BaseLogTest { + + public Log4jLogTest() { + super(new Log4jLog("Log4jLogTest")); + } +} diff --git a/src/test/java/com/j256/ormlite/misc/JdbcTransactionManagerTest.java b/src/test/java/com/j256/ormlite/jdbc/misc/JdbcTransactionManagerTest.java similarity index 97% rename from src/test/java/com/j256/ormlite/misc/JdbcTransactionManagerTest.java rename to src/test/java/com/j256/ormlite/jdbc/misc/JdbcTransactionManagerTest.java index 4b519e85..f63fb5c9 100644 --- a/src/test/java/com/j256/ormlite/misc/JdbcTransactionManagerTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/misc/JdbcTransactionManagerTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.misc; +package com.j256.ormlite.jdbc.misc; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -11,10 +11,11 @@ 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; import com.j256.ormlite.jdbc.JdbcPooledConnectionSource; +import com.j256.ormlite.misc.TransactionManager; /** * This is a base class for the per-database tests and can't be rolled into -core. diff --git a/src/test/java/com/j256/ormlite/spring/DaoFactoryTest.java b/src/test/java/com/j256/ormlite/jdbc/spring/DaoFactoryTest.java similarity index 92% rename from src/test/java/com/j256/ormlite/spring/DaoFactoryTest.java rename to src/test/java/com/j256/ormlite/jdbc/spring/DaoFactoryTest.java index 127a8d5e..f570d57f 100644 --- a/src/test/java/com/j256/ormlite/spring/DaoFactoryTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/spring/DaoFactoryTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.spring; +package com.j256.ormlite.jdbc.spring; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -7,6 +7,7 @@ import com.j256.ormlite.BaseCoreTest; import com.j256.ormlite.dao.Dao; +import com.j256.ormlite.jdbc.spring.DaoFactory; import com.j256.ormlite.table.DatabaseTableConfig; public class DaoFactoryTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/spring/TableCreatorTest.java b/src/test/java/com/j256/ormlite/jdbc/spring/TableCreatorTest.java similarity index 96% rename from src/test/java/com/j256/ormlite/spring/TableCreatorTest.java rename to src/test/java/com/j256/ormlite/jdbc/spring/TableCreatorTest.java index 123f8f68..77a03707 100644 --- a/src/test/java/com/j256/ormlite/spring/TableCreatorTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/spring/TableCreatorTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.spring; +package com.j256.ormlite.jdbc.spring; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -9,9 +9,10 @@ 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; +import com.j256.ormlite.jdbc.spring.TableCreator; import com.j256.ormlite.table.TableUtils; public class TableCreatorTest extends BaseJdbcTest { diff --git a/src/test/java/com/j256/ormlite/stmt/JdbcQueryBuilderTest.java b/src/test/java/com/j256/ormlite/jdbc/stmt/JdbcQueryBuilderTest.java similarity index 99% rename from src/test/java/com/j256/ormlite/stmt/JdbcQueryBuilderTest.java rename to src/test/java/com/j256/ormlite/jdbc/stmt/JdbcQueryBuilderTest.java index 41c19857..6a9c0f1b 100644 --- a/src/test/java/com/j256/ormlite/stmt/JdbcQueryBuilderTest.java +++ b/src/test/java/com/j256/ormlite/jdbc/stmt/JdbcQueryBuilderTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.jdbc.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -17,9 +17,13 @@ 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; +import com.j256.ormlite.stmt.PreparedQuery; +import com.j256.ormlite.stmt.QueryBuilder; +import com.j256.ormlite.stmt.SelectArg; +import com.j256.ormlite.stmt.Where; public class JdbcQueryBuilderTest extends BaseJdbcTest { diff --git a/src/test/java/com/j256/ormlite/logger/Log4jLogTest.java b/src/test/java/com/j256/ormlite/logger/Log4jLogTest.java deleted file mode 100644 index d71f6559..00000000 --- a/src/test/java/com/j256/ormlite/logger/Log4jLogTest.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.j256.ormlite.logger; - -public class Log4jLogTest extends BaseLogTest { - - public Log4jLogTest() { - super(new Log4jLog("Log4jLogTest")); - } -}