diff --git a/pom.xml b/pom.xml index 950c95df2..962a7cfce 100644 --- a/pom.xml +++ b/pom.xml @@ -281,8 +281,8 @@ false - src/main/java/com/j256/ormlite/misc/VersionUtils.java - src/main/java/com/j256/ormlite/misc/VersionUtils.java + src/main/java/com/j256/ormlite/core/misc/VersionUtils.java + src/main/java/com/j256/ormlite/core/misc/VersionUtils.java true (VERSION__).*(__) $1${version}$2 diff --git a/src/main/java/com/j256/ormlite/dao/BaseDaoImpl.java b/src/main/java/com/j256/ormlite/core/dao/BaseDaoImpl.java similarity index 96% rename from src/main/java/com/j256/ormlite/dao/BaseDaoImpl.java rename to src/main/java/com/j256/ormlite/core/dao/BaseDaoImpl.java index 6bbfb3280..ed0978f30 100644 --- a/src/main/java/com/j256/ormlite/dao/BaseDaoImpl.java +++ b/src/main/java/com/j256/ormlite/core/dao/BaseDaoImpl.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.io.IOException; import java.sql.SQLException; @@ -11,30 +11,30 @@ import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.misc.BaseDaoEnabled; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.stmt.DeleteBuilder; -import com.j256.ormlite.stmt.GenericRowMapper; -import com.j256.ormlite.stmt.PreparedDelete; -import com.j256.ormlite.stmt.PreparedQuery; -import com.j256.ormlite.stmt.PreparedUpdate; -import com.j256.ormlite.stmt.QueryBuilder; -import com.j256.ormlite.stmt.SelectArg; -import com.j256.ormlite.stmt.SelectIterator; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.stmt.StatementExecutor; -import com.j256.ormlite.stmt.UpdateBuilder; -import com.j256.ormlite.stmt.Where; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.DatabaseTableConfig; -import com.j256.ormlite.table.ObjectFactory; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.misc.BaseDaoEnabled; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.stmt.DeleteBuilder; +import com.j256.ormlite.core.stmt.GenericRowMapper; +import com.j256.ormlite.core.stmt.PreparedDelete; +import com.j256.ormlite.core.stmt.PreparedQuery; +import com.j256.ormlite.core.stmt.PreparedUpdate; +import com.j256.ormlite.core.stmt.QueryBuilder; +import com.j256.ormlite.core.stmt.SelectArg; +import com.j256.ormlite.core.stmt.SelectIterator; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.stmt.StatementExecutor; +import com.j256.ormlite.core.stmt.UpdateBuilder; +import com.j256.ormlite.core.stmt.Where; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.DatabaseTableConfig; +import com.j256.ormlite.core.table.ObjectFactory; +import com.j256.ormlite.core.table.TableInfo; /** * Base class for the Database Access Objects that handle the reading and writing a class from the database. diff --git a/src/main/java/com/j256/ormlite/dao/BaseForeignCollection.java b/src/main/java/com/j256/ormlite/core/dao/BaseForeignCollection.java similarity index 93% rename from src/main/java/com/j256/ormlite/dao/BaseForeignCollection.java rename to src/main/java/com/j256/ormlite/core/dao/BaseForeignCollection.java index ceedfe657..dbd746bdc 100644 --- a/src/main/java/com/j256/ormlite/dao/BaseForeignCollection.java +++ b/src/main/java/com/j256/ormlite/core/dao/BaseForeignCollection.java @@ -1,16 +1,16 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.io.Serializable; import java.sql.SQLException; import java.util.Collection; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.ForeignCollectionField; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.stmt.PreparedQuery; -import com.j256.ormlite.stmt.QueryBuilder; -import com.j256.ormlite.stmt.SelectArg; -import com.j256.ormlite.stmt.mapped.MappedPreparedStmt; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.ForeignCollectionField; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.stmt.PreparedQuery; +import com.j256.ormlite.core.stmt.QueryBuilder; +import com.j256.ormlite.core.stmt.SelectArg; +import com.j256.ormlite.core.stmt.mapped.MappedPreparedStmt; /** * Base collection that is set on a field that as been marked with the {@link ForeignCollectionField} annotation when an diff --git a/src/main/java/com/j256/ormlite/dao/CloseableIterable.java b/src/main/java/com/j256/ormlite/core/dao/CloseableIterable.java similarity index 90% rename from src/main/java/com/j256/ormlite/dao/CloseableIterable.java rename to src/main/java/com/j256/ormlite/core/dao/CloseableIterable.java index 224bdf257..b0536dea5 100644 --- a/src/main/java/com/j256/ormlite/dao/CloseableIterable.java +++ b/src/main/java/com/j256/ormlite/core/dao/CloseableIterable.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; /** * Extension to Iterable to provide a iterator() method that returns a {@link CloseableIterator}. diff --git a/src/main/java/com/j256/ormlite/dao/CloseableIterator.java b/src/main/java/com/j256/ormlite/core/dao/CloseableIterator.java similarity index 97% rename from src/main/java/com/j256/ormlite/dao/CloseableIterator.java rename to src/main/java/com/j256/ormlite/core/dao/CloseableIterator.java index 68e19b1f0..ad8a6353f 100644 --- a/src/main/java/com/j256/ormlite/dao/CloseableIterator.java +++ b/src/main/java/com/j256/ormlite/core/dao/CloseableIterator.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.io.Closeable; import java.sql.SQLException; import java.util.Iterator; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.support.DatabaseResults; /** * Extension to Iterator to provide a close() method. This should be in the JDK. diff --git a/src/main/java/com/j256/ormlite/dao/CloseableWrappedIterable.java b/src/main/java/com/j256/ormlite/core/dao/CloseableWrappedIterable.java similarity index 95% rename from src/main/java/com/j256/ormlite/dao/CloseableWrappedIterable.java rename to src/main/java/com/j256/ormlite/core/dao/CloseableWrappedIterable.java index 8ad2af5cd..4be5c03fd 100644 --- a/src/main/java/com/j256/ormlite/dao/CloseableWrappedIterable.java +++ b/src/main/java/com/j256/ormlite/core/dao/CloseableWrappedIterable.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.io.Closeable; import java.io.IOException; diff --git a/src/main/java/com/j256/ormlite/dao/CloseableWrappedIterableImpl.java b/src/main/java/com/j256/ormlite/core/dao/CloseableWrappedIterableImpl.java similarity index 92% rename from src/main/java/com/j256/ormlite/dao/CloseableWrappedIterableImpl.java rename to src/main/java/com/j256/ormlite/core/dao/CloseableWrappedIterableImpl.java index 24d8ba312..4b9d36655 100644 --- a/src/main/java/com/j256/ormlite/dao/CloseableWrappedIterableImpl.java +++ b/src/main/java/com/j256/ormlite/core/dao/CloseableWrappedIterableImpl.java @@ -1,8 +1,8 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.io.IOException; -import com.j256.ormlite.misc.IOUtils; +import com.j256.ormlite.core.misc.IOUtils; /** * Class which is used to help folks use for loops but still close at the end. This is a wrapper to allow multiple diff --git a/src/main/java/com/j256/ormlite/dao/Dao.java b/src/main/java/com/j256/ormlite/core/dao/Dao.java similarity index 97% rename from src/main/java/com/j256/ormlite/dao/Dao.java rename to src/main/java/com/j256/ormlite/core/dao/Dao.java index 468dad295..ec93359b8 100644 --- a/src/main/java/com/j256/ormlite/dao/Dao.java +++ b/src/main/java/com/j256/ormlite/core/dao/Dao.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.io.IOException; import java.lang.ref.SoftReference; @@ -10,22 +10,22 @@ import java.util.Map; import java.util.concurrent.Callable; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.ForeignCollectionField; -import com.j256.ormlite.stmt.DeleteBuilder; -import com.j256.ormlite.stmt.GenericRowMapper; -import com.j256.ormlite.stmt.PreparedDelete; -import com.j256.ormlite.stmt.PreparedQuery; -import com.j256.ormlite.stmt.PreparedUpdate; -import com.j256.ormlite.stmt.QueryBuilder; -import com.j256.ormlite.stmt.SelectArg; -import com.j256.ormlite.stmt.UpdateBuilder; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.ObjectFactory; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.ForeignCollectionField; +import com.j256.ormlite.core.stmt.DeleteBuilder; +import com.j256.ormlite.core.stmt.GenericRowMapper; +import com.j256.ormlite.core.stmt.PreparedDelete; +import com.j256.ormlite.core.stmt.PreparedQuery; +import com.j256.ormlite.core.stmt.PreparedUpdate; +import com.j256.ormlite.core.stmt.QueryBuilder; +import com.j256.ormlite.core.stmt.SelectArg; +import com.j256.ormlite.core.stmt.UpdateBuilder; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.ObjectFactory; /** * The definition of the Database Access Objects that handle the reading and writing a class from the database. Kudos to diff --git a/src/main/java/com/j256/ormlite/dao/DaoManager.java b/src/main/java/com/j256/ormlite/core/dao/DaoManager.java similarity index 97% rename from src/main/java/com/j256/ormlite/dao/DaoManager.java rename to src/main/java/com/j256/ormlite/core/dao/DaoManager.java index 9d7348eaf..dc6ea43d6 100644 --- a/src/main/java/com/j256/ormlite/dao/DaoManager.java +++ b/src/main/java/com/j256/ormlite/core/dao/DaoManager.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.lang.reflect.Constructor; import java.sql.SQLException; @@ -6,13 +6,13 @@ import java.util.HashMap; import java.util.Map; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.logger.Logger; -import com.j256.ormlite.logger.LoggerFactory; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.table.DatabaseTable; -import com.j256.ormlite.table.DatabaseTableConfig; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.logger.Logger; +import com.j256.ormlite.core.logger.LoggerFactory; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.table.DatabaseTable; +import com.j256.ormlite.core.table.DatabaseTableConfig; /** * Class which caches created DAOs. Sometimes internal DAOs are used to support such features as auto-refreshing of diff --git a/src/main/java/com/j256/ormlite/dao/DatabaseResultsMapper.java b/src/main/java/com/j256/ormlite/core/dao/DatabaseResultsMapper.java similarity index 92% rename from src/main/java/com/j256/ormlite/dao/DatabaseResultsMapper.java rename to src/main/java/com/j256/ormlite/core/dao/DatabaseResultsMapper.java index 610f22546..a276dfd76 100644 --- a/src/main/java/com/j256/ormlite/dao/DatabaseResultsMapper.java +++ b/src/main/java/com/j256/ormlite/core/dao/DatabaseResultsMapper.java @@ -1,8 +1,8 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.sql.SQLException; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.support.DatabaseResults; /** * Result apper that utilized the raw {@link DatabaseResults} object. See diff --git a/src/main/java/com/j256/ormlite/dao/EagerForeignCollection.java b/src/main/java/com/j256/ormlite/core/dao/EagerForeignCollection.java similarity index 96% rename from src/main/java/com/j256/ormlite/dao/EagerForeignCollection.java rename to src/main/java/com/j256/ormlite/core/dao/EagerForeignCollection.java index c5648350d..e75342c7e 100644 --- a/src/main/java/com/j256/ormlite/dao/EagerForeignCollection.java +++ b/src/main/java/com/j256/ormlite/core/dao/EagerForeignCollection.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.io.Serializable; import java.sql.SQLException; @@ -6,10 +6,10 @@ import java.util.Collection; import java.util.List; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.ForeignCollectionField; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.ForeignCollectionField; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; /** * Collection that is set on a field that as been marked with the {@link ForeignCollectionField} annotation when an diff --git a/src/main/java/com/j256/ormlite/dao/ForeignCollection.java b/src/main/java/com/j256/ormlite/core/dao/ForeignCollection.java similarity index 98% rename from src/main/java/com/j256/ormlite/dao/ForeignCollection.java rename to src/main/java/com/j256/ormlite/core/dao/ForeignCollection.java index a765f5c55..3cc63a792 100644 --- a/src/main/java/com/j256/ormlite/dao/ForeignCollection.java +++ b/src/main/java/com/j256/ormlite/core/dao/ForeignCollection.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.io.IOException; import java.sql.SQLException; import java.util.Collection; -import com.j256.ormlite.field.ForeignCollectionField; +import com.j256.ormlite.core.field.ForeignCollectionField; /** *

diff --git a/src/main/java/com/j256/ormlite/dao/GenericRawResults.java b/src/main/java/com/j256/ormlite/core/dao/GenericRawResults.java similarity index 96% rename from src/main/java/com/j256/ormlite/dao/GenericRawResults.java rename to src/main/java/com/j256/ormlite/core/dao/GenericRawResults.java index bdf72595e..03dee2619 100644 --- a/src/main/java/com/j256/ormlite/dao/GenericRawResults.java +++ b/src/main/java/com/j256/ormlite/core/dao/GenericRawResults.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.io.IOException; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.field.DataType; +import com.j256.ormlite.core.field.DataType; /** * Results returned by a call to {@link Dao#queryRaw(String, String...)} which returns results as a String[], diff --git a/src/main/java/com/j256/ormlite/dao/LazyForeignCollection.java b/src/main/java/com/j256/ormlite/core/dao/LazyForeignCollection.java similarity index 97% rename from src/main/java/com/j256/ormlite/dao/LazyForeignCollection.java rename to src/main/java/com/j256/ormlite/core/dao/LazyForeignCollection.java index 366881f5c..018bee9d9 100644 --- a/src/main/java/com/j256/ormlite/dao/LazyForeignCollection.java +++ b/src/main/java/com/j256/ormlite/core/dao/LazyForeignCollection.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.io.IOException; import java.io.Serializable; @@ -9,10 +9,10 @@ import java.util.List; import java.util.Set; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.ForeignCollectionField; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.support.DatabaseConnection; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.ForeignCollectionField; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.support.DatabaseConnection; /** * Collection that is set on a field that as been marked with the {@link ForeignCollectionField} annotation when an diff --git a/src/main/java/com/j256/ormlite/dao/LruObjectCache.java b/src/main/java/com/j256/ormlite/core/dao/LruObjectCache.java similarity index 99% rename from src/main/java/com/j256/ormlite/dao/LruObjectCache.java rename to src/main/java/com/j256/ormlite/core/dao/LruObjectCache.java index 87ae1f75f..6eae13dae 100644 --- a/src/main/java/com/j256/ormlite/dao/LruObjectCache.java +++ b/src/main/java/com/j256/ormlite/core/dao/LruObjectCache.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/src/main/java/com/j256/ormlite/dao/ObjectCache.java b/src/main/java/com/j256/ormlite/core/dao/ObjectCache.java similarity index 97% rename from src/main/java/com/j256/ormlite/dao/ObjectCache.java rename to src/main/java/com/j256/ormlite/core/dao/ObjectCache.java index 879a85d6e..12244f617 100644 --- a/src/main/java/com/j256/ormlite/dao/ObjectCache.java +++ b/src/main/java/com/j256/ormlite/core/dao/ObjectCache.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; /** * Definition of an object cache that can be injected into the Dao with the {@link Dao#setObjectCache(ObjectCache)}. diff --git a/src/main/java/com/j256/ormlite/dao/RawRowMapper.java b/src/main/java/com/j256/ormlite/core/dao/RawRowMapper.java similarity index 87% rename from src/main/java/com/j256/ormlite/dao/RawRowMapper.java rename to src/main/java/com/j256/ormlite/core/dao/RawRowMapper.java index 47992b1bd..7ef0975a0 100644 --- a/src/main/java/com/j256/ormlite/dao/RawRowMapper.java +++ b/src/main/java/com/j256/ormlite/core/dao/RawRowMapper.java @@ -1,8 +1,8 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.sql.SQLException; -import com.j256.ormlite.stmt.QueryBuilder; +import com.j256.ormlite.core.stmt.QueryBuilder; /** * Parameterized row mapper that takes output from the {@link GenericRawResults} and returns a T. Is used in the @@ -10,7 +10,7 @@ * *

* NOTE: If you need to map Objects instead then consider using the {@link RawRowObjectMapper} with the - * {@link Dao#queryRaw(String, com.j256.ormlite.field.DataType[], RawRowObjectMapper, String...)} method which allows + * {@link Dao#queryRaw(String, com.j256.ormlite.core.field.DataType[], RawRowObjectMapper, String...)} method which allows * you to iterate over the raw results as Object[]. *

* diff --git a/src/main/java/com/j256/ormlite/dao/RawRowObjectMapper.java b/src/main/java/com/j256/ormlite/core/dao/RawRowObjectMapper.java similarity index 93% rename from src/main/java/com/j256/ormlite/dao/RawRowObjectMapper.java rename to src/main/java/com/j256/ormlite/core/dao/RawRowObjectMapper.java index 08c7520d7..d32adb9b8 100644 --- a/src/main/java/com/j256/ormlite/dao/RawRowObjectMapper.java +++ b/src/main/java/com/j256/ormlite/core/dao/RawRowObjectMapper.java @@ -1,9 +1,9 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.sql.SQLException; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.stmt.QueryBuilder; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.stmt.QueryBuilder; /** * Parameterized row mapper that takes output from the {@link GenericRawResults} and returns a T. Is used in the diff --git a/src/main/java/com/j256/ormlite/dao/ReferenceObjectCache.java b/src/main/java/com/j256/ormlite/core/dao/ReferenceObjectCache.java similarity index 99% rename from src/main/java/com/j256/ormlite/dao/ReferenceObjectCache.java rename to src/main/java/com/j256/ormlite/core/dao/ReferenceObjectCache.java index 80e7925ac..46a25359e 100644 --- a/src/main/java/com/j256/ormlite/dao/ReferenceObjectCache.java +++ b/src/main/java/com/j256/ormlite/core/dao/ReferenceObjectCache.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.lang.ref.Reference; import java.lang.ref.SoftReference; diff --git a/src/main/java/com/j256/ormlite/dao/RuntimeExceptionDao.java b/src/main/java/com/j256/ormlite/core/dao/RuntimeExceptionDao.java similarity index 95% rename from src/main/java/com/j256/ormlite/dao/RuntimeExceptionDao.java rename to src/main/java/com/j256/ormlite/core/dao/RuntimeExceptionDao.java index 21d332183..2069f9b3d 100644 --- a/src/main/java/com/j256/ormlite/dao/RuntimeExceptionDao.java +++ b/src/main/java/com/j256/ormlite/core/dao/RuntimeExceptionDao.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import java.io.IOException; import java.sql.SQLException; @@ -7,23 +7,23 @@ import java.util.Map; import java.util.concurrent.Callable; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.logger.Log.Level; -import com.j256.ormlite.logger.Logger; -import com.j256.ormlite.logger.LoggerFactory; -import com.j256.ormlite.stmt.DeleteBuilder; -import com.j256.ormlite.stmt.GenericRowMapper; -import com.j256.ormlite.stmt.PreparedDelete; -import com.j256.ormlite.stmt.PreparedQuery; -import com.j256.ormlite.stmt.PreparedUpdate; -import com.j256.ormlite.stmt.QueryBuilder; -import com.j256.ormlite.stmt.UpdateBuilder; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.DatabaseTableConfig; -import com.j256.ormlite.table.ObjectFactory; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.logger.Log.Level; +import com.j256.ormlite.core.logger.Logger; +import com.j256.ormlite.core.logger.LoggerFactory; +import com.j256.ormlite.core.stmt.DeleteBuilder; +import com.j256.ormlite.core.stmt.GenericRowMapper; +import com.j256.ormlite.core.stmt.PreparedDelete; +import com.j256.ormlite.core.stmt.PreparedQuery; +import com.j256.ormlite.core.stmt.PreparedUpdate; +import com.j256.ormlite.core.stmt.QueryBuilder; +import com.j256.ormlite.core.stmt.UpdateBuilder; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.DatabaseTableConfig; +import com.j256.ormlite.core.table.ObjectFactory; /** * Proxy to a {@link Dao} that wraps each Exception and rethrows it as RuntimeException. You can use this if your usage diff --git a/src/main/java/com/j256/ormlite/db/BaseDatabaseType.java b/src/main/java/com/j256/ormlite/core/db/BaseDatabaseType.java similarity index 90% rename from src/main/java/com/j256/ormlite/db/BaseDatabaseType.java rename to src/main/java/com/j256/ormlite/core/db/BaseDatabaseType.java index e394bf447..cce0efd3b 100644 --- a/src/main/java/com/j256/ormlite/db/BaseDatabaseType.java +++ b/src/main/java/com/j256/ormlite/core/db/BaseDatabaseType.java @@ -1,19 +1,19 @@ -package com.j256.ormlite.db; +package com.j256.ormlite.core.db; import java.sql.Driver; import java.sql.SQLException; import java.util.List; import java.util.Locale; -import com.j256.ormlite.field.BaseFieldConverter; -import com.j256.ormlite.field.DataPersister; -import com.j256.ormlite.field.FieldConverter; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.DatabaseTableConfig; +import com.j256.ormlite.core.field.BaseFieldConverter; +import com.j256.ormlite.core.field.DataPersister; +import com.j256.ormlite.core.field.FieldConverter; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.DatabaseTableConfig; /** * Base class for all of the {@link DatabaseType} classes that provide the per-database type functionality to create @@ -612,42 +612,4 @@ private void addSingleUnique(StringBuilder sb, FieldType fieldType, List alterSb.append(')'); additionalArgs.add(alterSb.toString()); } - - /** - * Conversion to/from the Boolean Java field as a number because some databases like the true/false. - */ - protected static class BooleanNumberFieldConverter extends BaseFieldConverter { - @Override - public SqlType getSqlType() { - return SqlType.BOOLEAN; - } - - @Override - public Object parseDefaultString(FieldType fieldType, String defaultStr) { - boolean bool = Boolean.parseBoolean(defaultStr); - return (bool ? Byte.valueOf((byte) 1) : Byte.valueOf((byte) 0)); - } - - @Override - public Object javaToSqlArg(FieldType fieldType, Object obj) { - Boolean bool = (Boolean) obj; - return (bool ? Byte.valueOf((byte) 1) : Byte.valueOf((byte) 0)); - } - - @Override - public Object resultToSqlArg(FieldType fieldType, DatabaseResults results, int columnPos) throws SQLException { - return results.getByte(columnPos); - } - - @Override - public Object sqlArgToJava(FieldType fieldType, Object sqlArg, int columnPos) { - byte arg = (Byte) sqlArg; - return (arg == 1 ? (Boolean) true : (Boolean) false); - } - - @Override - public Object resultStringToJava(FieldType fieldType, String stringValue, int columnPos) { - return sqlArgToJava(fieldType, Byte.parseByte(stringValue), columnPos); - } - } } diff --git a/src/main/java/com/j256/ormlite/db/BaseSqliteDatabaseType.java b/src/main/java/com/j256/ormlite/core/db/BaseSqliteDatabaseType.java similarity index 89% rename from src/main/java/com/j256/ormlite/db/BaseSqliteDatabaseType.java rename to src/main/java/com/j256/ormlite/core/db/BaseSqliteDatabaseType.java index 4da921ac6..b5d548561 100644 --- a/src/main/java/com/j256/ormlite/db/BaseSqliteDatabaseType.java +++ b/src/main/java/com/j256/ormlite/core/db/BaseSqliteDatabaseType.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.db; +package com.j256.ormlite.core.db; import java.util.List; -import com.j256.ormlite.field.DataPersister; -import com.j256.ormlite.field.FieldConverter; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.field.types.BigDecimalStringType; +import com.j256.ormlite.core.field.DataPersister; +import com.j256.ormlite.core.field.FieldConverter; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.field.types.BigDecimalStringType; /** * Sqlite database type information used to create the tables, etc.. diff --git a/src/main/java/com/j256/ormlite/core/db/BooleanNumberFieldConverter.java b/src/main/java/com/j256/ormlite/core/db/BooleanNumberFieldConverter.java new file mode 100644 index 000000000..ff359b582 --- /dev/null +++ b/src/main/java/com/j256/ormlite/core/db/BooleanNumberFieldConverter.java @@ -0,0 +1,46 @@ +package com.j256.ormlite.core.db; + +import com.j256.ormlite.core.field.BaseFieldConverter; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; + +import java.sql.SQLException; + +/** + * Conversion to/from the Boolean Java field as a number because some databases like the true/false. + */ +public class BooleanNumberFieldConverter extends BaseFieldConverter { + @Override + public SqlType getSqlType() { + return SqlType.BOOLEAN; + } + + @Override + public Object parseDefaultString(FieldType fieldType, String defaultStr) { + boolean bool = Boolean.parseBoolean(defaultStr); + return (bool ? Byte.valueOf((byte) 1) : Byte.valueOf((byte) 0)); + } + + @Override + public Object javaToSqlArg(FieldType fieldType, Object obj) { + Boolean bool = (Boolean) obj; + return (bool ? Byte.valueOf((byte) 1) : Byte.valueOf((byte) 0)); + } + + @Override + public Object resultToSqlArg(FieldType fieldType, DatabaseResults results, int columnPos) throws SQLException { + return results.getByte(columnPos); + } + + @Override + public Object sqlArgToJava(FieldType fieldType, Object sqlArg, int columnPos) { + byte arg = (Byte) sqlArg; + return (arg == 1 ? (Boolean) true : (Boolean) false); + } + + @Override + public Object resultStringToJava(FieldType fieldType, String stringValue, int columnPos) { + return sqlArgToJava(fieldType, Byte.parseByte(stringValue), columnPos); + } +} \ No newline at end of file diff --git a/src/main/java/com/j256/ormlite/db/DatabaseType.java b/src/main/java/com/j256/ormlite/core/db/DatabaseType.java similarity index 96% rename from src/main/java/com/j256/ormlite/db/DatabaseType.java rename to src/main/java/com/j256/ormlite/core/db/DatabaseType.java index 486e88dfc..38fbd0c41 100644 --- a/src/main/java/com/j256/ormlite/db/DatabaseType.java +++ b/src/main/java/com/j256/ormlite/core/db/DatabaseType.java @@ -1,16 +1,16 @@ -package com.j256.ormlite.db; +package com.j256.ormlite.core.db; import java.sql.Driver; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.field.DataPersister; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldConverter; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.table.DatabaseTableConfig; +import com.j256.ormlite.core.field.DataPersister; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldConverter; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.table.DatabaseTableConfig; /** * Definition of the per-database functionality needed to isolate the differences between the various databases. diff --git a/src/main/java/com/j256/ormlite/field/BaseFieldConverter.java b/src/main/java/com/j256/ormlite/core/field/BaseFieldConverter.java similarity index 91% rename from src/main/java/com/j256/ormlite/field/BaseFieldConverter.java rename to src/main/java/com/j256/ormlite/core/field/BaseFieldConverter.java index 1dc8600f4..475719b7b 100644 --- a/src/main/java/com/j256/ormlite/field/BaseFieldConverter.java +++ b/src/main/java/com/j256/ormlite/core/field/BaseFieldConverter.java @@ -1,8 +1,8 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import java.sql.SQLException; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.support.DatabaseResults; /** * Base class for field-converters. diff --git a/src/main/java/com/j256/ormlite/field/DataPersister.java b/src/main/java/com/j256/ormlite/core/field/DataPersister.java similarity index 95% rename from src/main/java/com/j256/ormlite/field/DataPersister.java rename to src/main/java/com/j256/ormlite/core/field/DataPersister.java index c210df6fd..bde6dbe37 100644 --- a/src/main/java/com/j256/ormlite/field/DataPersister.java +++ b/src/main/java/com/j256/ormlite/core/field/DataPersister.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import java.lang.reflect.Field; import java.sql.SQLException; -import com.j256.ormlite.field.types.BaseDataType; -import com.j256.ormlite.stmt.ArgumentHolder; +import com.j256.ormlite.core.field.types.BaseDataType; +import com.j256.ormlite.core.stmt.ArgumentHolder; /** * Data type that provide Java class to/from database mapping. diff --git a/src/main/java/com/j256/ormlite/field/DataPersisterManager.java b/src/main/java/com/j256/ormlite/core/field/DataPersisterManager.java similarity index 97% rename from src/main/java/com/j256/ormlite/field/DataPersisterManager.java rename to src/main/java/com/j256/ormlite/core/field/DataPersisterManager.java index 9f049b46e..36201b9a4 100644 --- a/src/main/java/com/j256/ormlite/field/DataPersisterManager.java +++ b/src/main/java/com/j256/ormlite/core/field/DataPersisterManager.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import java.lang.reflect.Field; import java.util.ArrayList; @@ -6,7 +6,7 @@ import java.util.List; import java.util.Map; -import com.j256.ormlite.field.types.EnumStringType; +import com.j256.ormlite.core.field.types.EnumStringType; /** * Class used to manage the various data types used by the system. The bulk of the data types come from the diff --git a/src/main/java/com/j256/ormlite/field/DataType.java b/src/main/java/com/j256/ormlite/core/field/DataType.java similarity index 75% rename from src/main/java/com/j256/ormlite/field/DataType.java rename to src/main/java/com/j256/ormlite/core/field/DataType.java index 48fb7900d..f176c8ed0 100644 --- a/src/main/java/com/j256/ormlite/field/DataType.java +++ b/src/main/java/com/j256/ormlite/core/field/DataType.java @@ -1,46 +1,46 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import java.math.BigDecimal; import java.math.BigInteger; -import com.j256.ormlite.field.types.BigDecimalNumericType; -import com.j256.ormlite.field.types.BigDecimalStringType; -import com.j256.ormlite.field.types.BigIntegerType; -import com.j256.ormlite.field.types.BooleanCharType; -import com.j256.ormlite.field.types.BooleanIntegerType; -import com.j256.ormlite.field.types.BooleanObjectType; -import com.j256.ormlite.field.types.BooleanType; -import com.j256.ormlite.field.types.ByteArrayType; -import com.j256.ormlite.field.types.ByteObjectType; -import com.j256.ormlite.field.types.ByteType; -import com.j256.ormlite.field.types.CharType; -import com.j256.ormlite.field.types.CharacterObjectType; -import com.j256.ormlite.field.types.DateLongType; -import com.j256.ormlite.field.types.DateIntegerType; -import com.j256.ormlite.field.types.DateStringType; -import com.j256.ormlite.field.types.DateTimeType; -import com.j256.ormlite.field.types.DateType; -import com.j256.ormlite.field.types.DoubleObjectType; -import com.j256.ormlite.field.types.DoubleType; -import com.j256.ormlite.field.types.EnumIntegerType; -import com.j256.ormlite.field.types.EnumStringType; -import com.j256.ormlite.field.types.EnumToStringType; -import com.j256.ormlite.field.types.FloatObjectType; -import com.j256.ormlite.field.types.FloatType; -import com.j256.ormlite.field.types.IntType; -import com.j256.ormlite.field.types.IntegerObjectType; -import com.j256.ormlite.field.types.LongObjectType; -import com.j256.ormlite.field.types.LongStringType; -import com.j256.ormlite.field.types.LongType; -import com.j256.ormlite.field.types.NativeUuidType; -import com.j256.ormlite.field.types.SerializableType; -import com.j256.ormlite.field.types.ShortObjectType; -import com.j256.ormlite.field.types.ShortType; -import com.j256.ormlite.field.types.SqlDateType; -import com.j256.ormlite.field.types.StringBytesType; -import com.j256.ormlite.field.types.StringType; -import com.j256.ormlite.field.types.TimeStampType; -import com.j256.ormlite.field.types.UuidType; +import com.j256.ormlite.core.field.types.BigDecimalNumericType; +import com.j256.ormlite.core.field.types.BigDecimalStringType; +import com.j256.ormlite.core.field.types.BigIntegerType; +import com.j256.ormlite.core.field.types.BooleanCharType; +import com.j256.ormlite.core.field.types.BooleanIntegerType; +import com.j256.ormlite.core.field.types.BooleanObjectType; +import com.j256.ormlite.core.field.types.BooleanType; +import com.j256.ormlite.core.field.types.ByteArrayType; +import com.j256.ormlite.core.field.types.ByteObjectType; +import com.j256.ormlite.core.field.types.ByteType; +import com.j256.ormlite.core.field.types.CharType; +import com.j256.ormlite.core.field.types.CharacterObjectType; +import com.j256.ormlite.core.field.types.DateLongType; +import com.j256.ormlite.core.field.types.DateIntegerType; +import com.j256.ormlite.core.field.types.DateStringType; +import com.j256.ormlite.core.field.types.DateTimeType; +import com.j256.ormlite.core.field.types.DateType; +import com.j256.ormlite.core.field.types.DoubleObjectType; +import com.j256.ormlite.core.field.types.DoubleType; +import com.j256.ormlite.core.field.types.EnumIntegerType; +import com.j256.ormlite.core.field.types.EnumStringType; +import com.j256.ormlite.core.field.types.EnumToStringType; +import com.j256.ormlite.core.field.types.FloatObjectType; +import com.j256.ormlite.core.field.types.FloatType; +import com.j256.ormlite.core.field.types.IntType; +import com.j256.ormlite.core.field.types.IntegerObjectType; +import com.j256.ormlite.core.field.types.LongObjectType; +import com.j256.ormlite.core.field.types.LongStringType; +import com.j256.ormlite.core.field.types.LongType; +import com.j256.ormlite.core.field.types.NativeUuidType; +import com.j256.ormlite.core.field.types.SerializableType; +import com.j256.ormlite.core.field.types.ShortObjectType; +import com.j256.ormlite.core.field.types.ShortType; +import com.j256.ormlite.core.field.types.SqlDateType; +import com.j256.ormlite.core.field.types.StringBytesType; +import com.j256.ormlite.core.field.types.StringType; +import com.j256.ormlite.core.field.types.TimeStampType; +import com.j256.ormlite.core.field.types.UuidType; /** * Data type enumeration that corresponds to a {@link DataPersister}. diff --git a/src/main/java/com/j256/ormlite/field/DatabaseField.java b/src/main/java/com/j256/ormlite/core/field/DatabaseField.java similarity index 98% rename from src/main/java/com/j256/ormlite/field/DatabaseField.java rename to src/main/java/com/j256/ormlite/core/field/DatabaseField.java index 95fa4d2b4..9e2a78be4 100644 --- a/src/main/java/com/j256/ormlite/field/DatabaseField.java +++ b/src/main/java/com/j256/ormlite/core/field/DatabaseField.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -6,9 +6,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.types.VoidType; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.types.VoidType; /** *

diff --git a/src/main/java/com/j256/ormlite/field/DatabaseFieldConfig.java b/src/main/java/com/j256/ormlite/core/field/DatabaseFieldConfig.java similarity index 98% rename from src/main/java/com/j256/ormlite/field/DatabaseFieldConfig.java rename to src/main/java/com/j256/ormlite/core/field/DatabaseFieldConfig.java index 42e2bc019..20f1deca3 100644 --- a/src/main/java/com/j256/ormlite/field/DatabaseFieldConfig.java +++ b/src/main/java/com/j256/ormlite/core/field/DatabaseFieldConfig.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.sql.SQLException; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.types.VoidType; -import com.j256.ormlite.misc.JavaxPersistenceConfigurer; -import com.j256.ormlite.table.DatabaseTableConfig; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.types.VoidType; +import com.j256.ormlite.core.misc.JavaxPersistenceConfigurer; +import com.j256.ormlite.core.table.DatabaseTableConfig; /** * Database field configuration information either supplied by a {@link DatabaseField} annotation or by direct Java or @@ -75,7 +75,7 @@ public class DatabaseFieldConfig { // see if we have this class at runtime Class.forName("javax.persistence.Entity"); // if we do then get our JavaxPersistance class - Class clazz = Class.forName("com.j256.ormlite.misc.JavaxPersistenceImpl"); + Class clazz = Class.forName("com.j256.ormlite.core.misc.JavaxPersistenceImpl"); javaxPersistenceConfigurer = (JavaxPersistenceConfigurer) clazz.getConstructor().newInstance(); } catch (Exception e) { // no configurer diff --git a/src/main/java/com/j256/ormlite/field/DatabaseFieldConfigLoader.java b/src/main/java/com/j256/ormlite/core/field/DatabaseFieldConfigLoader.java similarity index 99% rename from src/main/java/com/j256/ormlite/field/DatabaseFieldConfigLoader.java rename to src/main/java/com/j256/ormlite/core/field/DatabaseFieldConfigLoader.java index 212b97a64..b4dd74036 100644 --- a/src/main/java/com/j256/ormlite/field/DatabaseFieldConfigLoader.java +++ b/src/main/java/com/j256/ormlite/core/field/DatabaseFieldConfigLoader.java @@ -1,11 +1,11 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; import java.sql.SQLException; -import com.j256.ormlite.misc.SqlExceptionUtil; +import com.j256.ormlite.core.misc.SqlExceptionUtil; /** * Database field configuration loader which reads and writes {@link DatabaseFieldConfig} from a text file/stream. diff --git a/src/main/java/com/j256/ormlite/field/FieldConverter.java b/src/main/java/com/j256/ormlite/core/field/FieldConverter.java similarity index 95% rename from src/main/java/com/j256/ormlite/field/FieldConverter.java rename to src/main/java/com/j256/ormlite/core/field/FieldConverter.java index 0f1ad3f48..a3e935ecf 100644 --- a/src/main/java/com/j256/ormlite/field/FieldConverter.java +++ b/src/main/java/com/j256/ormlite/core/field/FieldConverter.java @@ -1,9 +1,9 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import java.sql.SQLException; -import com.j256.ormlite.db.BaseDatabaseType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.db.BaseDatabaseType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Convert a Java object into the appropriate argument to a SQL statement and then back from the result set to the Java diff --git a/src/main/java/com/j256/ormlite/field/FieldType.java b/src/main/java/com/j256/ormlite/core/field/FieldType.java similarity index 97% rename from src/main/java/com/j256/ormlite/field/FieldType.java rename to src/main/java/com/j256/ormlite/core/field/FieldType.java index 7614ba3a0..ffdd2ae02 100644 --- a/src/main/java/com/j256/ormlite/field/FieldType.java +++ b/src/main/java/com/j256/ormlite/core/field/FieldType.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import java.io.Serializable; import java.lang.reflect.Field; @@ -11,26 +11,26 @@ import java.util.Collection; import java.util.Map; -import com.j256.ormlite.dao.BaseDaoImpl; -import com.j256.ormlite.dao.BaseForeignCollection; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.DaoManager; -import com.j256.ormlite.dao.EagerForeignCollection; -import com.j256.ormlite.dao.ForeignCollection; -import com.j256.ormlite.dao.LazyForeignCollection; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.types.VoidType; -import com.j256.ormlite.logger.Log.Level; -import com.j256.ormlite.logger.Logger; -import com.j256.ormlite.logger.LoggerFactory; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.stmt.mapped.MappedQueryForFieldEq; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.DatabaseTableConfig; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.BaseDaoImpl; +import com.j256.ormlite.core.dao.BaseForeignCollection; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.DaoManager; +import com.j256.ormlite.core.dao.EagerForeignCollection; +import com.j256.ormlite.core.dao.ForeignCollection; +import com.j256.ormlite.core.dao.LazyForeignCollection; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.types.VoidType; +import com.j256.ormlite.core.logger.Log.Level; +import com.j256.ormlite.core.logger.Logger; +import com.j256.ormlite.core.logger.LoggerFactory; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.stmt.mapped.MappedQueryForFieldEq; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.DatabaseTableConfig; +import com.j256.ormlite.core.table.TableInfo; /** * Per field information configured from the {@link DatabaseField} annotation and the associated {@link Field} in the diff --git a/src/main/java/com/j256/ormlite/field/ForeignCollectionField.java b/src/main/java/com/j256/ormlite/core/field/ForeignCollectionField.java similarity index 94% rename from src/main/java/com/j256/ormlite/field/ForeignCollectionField.java rename to src/main/java/com/j256/ormlite/core/field/ForeignCollectionField.java index 4a64fb45f..e657f1f11 100644 --- a/src/main/java/com/j256/ormlite/field/ForeignCollectionField.java +++ b/src/main/java/com/j256/ormlite/core/field/ForeignCollectionField.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -6,10 +6,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.ForeignCollection; -import com.j256.ormlite.dao.LazyForeignCollection; -import com.j256.ormlite.stmt.QueryBuilder; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.ForeignCollection; +import com.j256.ormlite.core.dao.LazyForeignCollection; +import com.j256.ormlite.core.stmt.QueryBuilder; /** * Annotation that identifies a {@link ForeignCollection} field in a class that corresponds to objects in a foreign diff --git a/src/main/java/com/j256/ormlite/field/SqlType.java b/src/main/java/com/j256/ormlite/core/field/SqlType.java similarity index 94% rename from src/main/java/com/j256/ormlite/field/SqlType.java rename to src/main/java/com/j256/ormlite/core/field/SqlType.java index 0cddcfcd9..28d9b9594 100644 --- a/src/main/java/com/j256/ormlite/field/SqlType.java +++ b/src/main/java/com/j256/ormlite/core/field/SqlType.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; /** * The SQL data types that are supported. These are basically an enumeration of the constants in java.sql.Types. diff --git a/src/main/java/com/j256/ormlite/field/types/BaseDataType.java b/src/main/java/com/j256/ormlite/core/field/types/BaseDataType.java similarity index 94% rename from src/main/java/com/j256/ormlite/field/types/BaseDataType.java rename to src/main/java/com/j256/ormlite/core/field/types/BaseDataType.java index ffce788f5..f816947d5 100644 --- a/src/main/java/com/j256/ormlite/field/types/BaseDataType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/BaseDataType.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.lang.reflect.Field; import java.sql.SQLException; -import com.j256.ormlite.field.BaseFieldConverter; -import com.j256.ormlite.field.DataPersister; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.BaseFieldConverter; +import com.j256.ormlite.core.field.DataPersister; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; /** * Base data type that defines the default persistance methods for the various data types. diff --git a/src/main/java/com/j256/ormlite/field/types/BaseDateType.java b/src/main/java/com/j256/ormlite/core/field/types/BaseDateType.java similarity index 94% rename from src/main/java/com/j256/ormlite/field/types/BaseDateType.java rename to src/main/java/com/j256/ormlite/core/field/types/BaseDateType.java index eb14c0cac..1f7a26182 100644 --- a/src/main/java/com/j256/ormlite/field/types/BaseDateType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/BaseDateType.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.lang.reflect.Field; import java.text.DateFormat; @@ -6,8 +6,8 @@ import java.text.SimpleDateFormat; import java.util.Date; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; /** * Base class for all of the {@link java.sql.Date} class types. diff --git a/src/main/java/com/j256/ormlite/field/types/BaseEnumType.java b/src/main/java/com/j256/ormlite/core/field/types/BaseEnumType.java similarity index 86% rename from src/main/java/com/j256/ormlite/field/types/BaseEnumType.java rename to src/main/java/com/j256/ormlite/core/field/types/BaseEnumType.java index dd10ceb9a..6688a136e 100644 --- a/src/main/java/com/j256/ormlite/field/types/BaseEnumType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/BaseEnumType.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.lang.reflect.Field; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; /** * Base class for the enum classes to provide a utility method. diff --git a/src/main/java/com/j256/ormlite/field/types/BigDecimalNumericType.java b/src/main/java/com/j256/ormlite/core/field/types/BigDecimalNumericType.java similarity index 85% rename from src/main/java/com/j256/ormlite/field/types/BigDecimalNumericType.java rename to src/main/java/com/j256/ormlite/core/field/types/BigDecimalNumericType.java index ccdd17c36..203894365 100644 --- a/src/main/java/com/j256/ormlite/field/types/BigDecimalNumericType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/BigDecimalNumericType.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a {@link BigInteger} object as a NUMERIC SQL database field. diff --git a/src/main/java/com/j256/ormlite/field/types/BigDecimalStringType.java b/src/main/java/com/j256/ormlite/core/field/types/BigDecimalStringType.java similarity index 88% rename from src/main/java/com/j256/ormlite/field/types/BigDecimalStringType.java rename to src/main/java/com/j256/ormlite/core/field/types/BigDecimalStringType.java index 54ef4cee6..4dfca4e0b 100644 --- a/src/main/java/com/j256/ormlite/field/types/BigDecimalStringType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/BigDecimalStringType.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a {@link BigInteger} object. diff --git a/src/main/java/com/j256/ormlite/field/types/BigIntegerType.java b/src/main/java/com/j256/ormlite/core/field/types/BigIntegerType.java similarity index 89% rename from src/main/java/com/j256/ormlite/field/types/BigIntegerType.java rename to src/main/java/com/j256/ormlite/core/field/types/BigIntegerType.java index 921017292..949c99d5e 100644 --- a/src/main/java/com/j256/ormlite/field/types/BigIntegerType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/BigIntegerType.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.math.BigInteger; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a {@link BigInteger} object. diff --git a/src/main/java/com/j256/ormlite/field/types/BooleanCharType.java b/src/main/java/com/j256/ormlite/core/field/types/BooleanCharType.java similarity index 90% rename from src/main/java/com/j256/ormlite/field/types/BooleanCharType.java rename to src/main/java/com/j256/ormlite/core/field/types/BooleanCharType.java index 1e91e64f9..9a5c755d5 100644 --- a/src/main/java/com/j256/ormlite/field/types/BooleanCharType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/BooleanCharType.java @@ -1,11 +1,11 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Booleans can be stored in the database as the character '1' '0'. You can change the characters by specifying a format diff --git a/src/main/java/com/j256/ormlite/field/types/BooleanIntegerType.java b/src/main/java/com/j256/ormlite/core/field/types/BooleanIntegerType.java similarity index 87% rename from src/main/java/com/j256/ormlite/field/types/BooleanIntegerType.java rename to src/main/java/com/j256/ormlite/core/field/types/BooleanIntegerType.java index 48083c905..28d9835d0 100644 --- a/src/main/java/com/j256/ormlite/field/types/BooleanIntegerType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/BooleanIntegerType.java @@ -1,11 +1,11 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Booleans can be stored in the database as the integer column type and the value 1 (really non-0) for true and 0 for diff --git a/src/main/java/com/j256/ormlite/field/types/BooleanObjectType.java b/src/main/java/com/j256/ormlite/core/field/types/BooleanObjectType.java similarity index 84% rename from src/main/java/com/j256/ormlite/field/types/BooleanObjectType.java rename to src/main/java/com/j256/ormlite/core/field/types/BooleanObjectType.java index 3e9c17488..2b0ba3d2d 100644 --- a/src/main/java/com/j256/ormlite/field/types/BooleanObjectType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/BooleanObjectType.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a Boolean object. diff --git a/src/main/java/com/j256/ormlite/field/types/BooleanType.java b/src/main/java/com/j256/ormlite/core/field/types/BooleanType.java similarity index 86% rename from src/main/java/com/j256/ormlite/field/types/BooleanType.java rename to src/main/java/com/j256/ormlite/core/field/types/BooleanType.java index 83aa49e91..3b9d380c6 100644 --- a/src/main/java/com/j256/ormlite/field/types/BooleanType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/BooleanType.java @@ -1,6 +1,6 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.SqlType; /** * Type that persists a boolean primitive. diff --git a/src/main/java/com/j256/ormlite/field/types/ByteArrayType.java b/src/main/java/com/j256/ormlite/core/field/types/ByteArrayType.java similarity index 88% rename from src/main/java/com/j256/ormlite/field/types/ByteArrayType.java rename to src/main/java/com/j256/ormlite/core/field/types/ByteArrayType.java index d3fc50f69..552e50839 100644 --- a/src/main/java/com/j256/ormlite/field/types/ByteArrayType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/ByteArrayType.java @@ -1,11 +1,11 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; import java.util.Arrays; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a byte[] object. diff --git a/src/main/java/com/j256/ormlite/field/types/ByteObjectType.java b/src/main/java/com/j256/ormlite/core/field/types/ByteObjectType.java similarity index 83% rename from src/main/java/com/j256/ormlite/field/types/ByteObjectType.java rename to src/main/java/com/j256/ormlite/core/field/types/ByteObjectType.java index 2b728ecae..8d9ad978f 100644 --- a/src/main/java/com/j256/ormlite/field/types/ByteObjectType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/ByteObjectType.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a Byte object. diff --git a/src/main/java/com/j256/ormlite/field/types/ByteType.java b/src/main/java/com/j256/ormlite/core/field/types/ByteType.java similarity index 85% rename from src/main/java/com/j256/ormlite/field/types/ByteType.java rename to src/main/java/com/j256/ormlite/core/field/types/ByteType.java index ee833ff41..e0df81ff5 100644 --- a/src/main/java/com/j256/ormlite/field/types/ByteType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/ByteType.java @@ -1,6 +1,6 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.SqlType; /** * Type that persists a byte primitive. diff --git a/src/main/java/com/j256/ormlite/field/types/CharType.java b/src/main/java/com/j256/ormlite/core/field/types/CharType.java similarity index 86% rename from src/main/java/com/j256/ormlite/field/types/CharType.java rename to src/main/java/com/j256/ormlite/core/field/types/CharType.java index 94c972ddf..8206fc5eb 100644 --- a/src/main/java/com/j256/ormlite/field/types/CharType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/CharType.java @@ -1,7 +1,7 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; /** * Type that persists a char primitive. diff --git a/src/main/java/com/j256/ormlite/field/types/CharacterObjectType.java b/src/main/java/com/j256/ormlite/core/field/types/CharacterObjectType.java similarity index 84% rename from src/main/java/com/j256/ormlite/field/types/CharacterObjectType.java rename to src/main/java/com/j256/ormlite/core/field/types/CharacterObjectType.java index 3f4b33842..7bbbfa43c 100644 --- a/src/main/java/com/j256/ormlite/field/types/CharacterObjectType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/CharacterObjectType.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a Character object. diff --git a/src/main/java/com/j256/ormlite/field/types/DateIntegerType.java b/src/main/java/com/j256/ormlite/core/field/types/DateIntegerType.java similarity index 87% rename from src/main/java/com/j256/ormlite/field/types/DateIntegerType.java rename to src/main/java/com/j256/ormlite/core/field/types/DateIntegerType.java index 40cf73bbd..55879e76d 100644 --- a/src/main/java/com/j256/ormlite/field/types/DateIntegerType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/DateIntegerType.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; import java.util.Date; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseResults; /** * Persists the {@link java.util.Date} Java class as integer seconds (not milliseconds) since epoch. diff --git a/src/main/java/com/j256/ormlite/field/types/DateLongType.java b/src/main/java/com/j256/ormlite/core/field/types/DateLongType.java similarity index 86% rename from src/main/java/com/j256/ormlite/field/types/DateLongType.java rename to src/main/java/com/j256/ormlite/core/field/types/DateLongType.java index 2252a479f..2fa0babad 100644 --- a/src/main/java/com/j256/ormlite/field/types/DateLongType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/DateLongType.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; import java.util.Date; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseResults; /** * Persists the {@link java.util.Date} Java class as long milliseconds since epoch. diff --git a/src/main/java/com/j256/ormlite/field/types/DateStringType.java b/src/main/java/com/j256/ormlite/core/field/types/DateStringType.java similarity index 91% rename from src/main/java/com/j256/ormlite/field/types/DateStringType.java rename to src/main/java/com/j256/ormlite/core/field/types/DateStringType.java index 587e752f8..8e1b10d33 100644 --- a/src/main/java/com/j256/ormlite/field/types/DateStringType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/DateStringType.java @@ -1,14 +1,14 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; import java.text.DateFormat; import java.text.ParseException; import java.util.Date; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a {@link java.util.Date} object as a String. diff --git a/src/main/java/com/j256/ormlite/field/types/DateTimeType.java b/src/main/java/com/j256/ormlite/core/field/types/DateTimeType.java similarity index 92% rename from src/main/java/com/j256/ormlite/field/types/DateTimeType.java rename to src/main/java/com/j256/ormlite/core/field/types/DateTimeType.java index 5a80a3177..6164b9a57 100644 --- a/src/main/java/com/j256/ormlite/field/types/DateTimeType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/DateTimeType.java @@ -1,14 +1,14 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.sql.SQLException; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseResults; /** * A custom persister that is able to store the org.joda.time.DateTime class in the database as epoch-millis long diff --git a/src/main/java/com/j256/ormlite/field/types/DateType.java b/src/main/java/com/j256/ormlite/core/field/types/DateType.java similarity index 88% rename from src/main/java/com/j256/ormlite/field/types/DateType.java rename to src/main/java/com/j256/ormlite/core/field/types/DateType.java index ce1fe7553..cf2d2019a 100644 --- a/src/main/java/com/j256/ormlite/field/types/DateType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/DateType.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; import java.sql.Timestamp; import java.text.ParseException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a {@link java.util.Date} object. diff --git a/src/main/java/com/j256/ormlite/field/types/DoubleObjectType.java b/src/main/java/com/j256/ormlite/core/field/types/DoubleObjectType.java similarity index 82% rename from src/main/java/com/j256/ormlite/field/types/DoubleObjectType.java rename to src/main/java/com/j256/ormlite/core/field/types/DoubleObjectType.java index 5d8cf33db..809da22ee 100644 --- a/src/main/java/com/j256/ormlite/field/types/DoubleObjectType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/DoubleObjectType.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a Double object. diff --git a/src/main/java/com/j256/ormlite/field/types/DoubleType.java b/src/main/java/com/j256/ormlite/core/field/types/DoubleType.java similarity index 86% rename from src/main/java/com/j256/ormlite/field/types/DoubleType.java rename to src/main/java/com/j256/ormlite/core/field/types/DoubleType.java index 56e859c1d..2129e3e08 100644 --- a/src/main/java/com/j256/ormlite/field/types/DoubleType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/DoubleType.java @@ -1,6 +1,6 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.SqlType; /** * Type that persists a double primitive. diff --git a/src/main/java/com/j256/ormlite/field/types/EnumIntegerType.java b/src/main/java/com/j256/ormlite/core/field/types/EnumIntegerType.java similarity index 92% rename from src/main/java/com/j256/ormlite/field/types/EnumIntegerType.java rename to src/main/java/com/j256/ormlite/core/field/types/EnumIntegerType.java index dc25a3fe4..f9f85f8e7 100644 --- a/src/main/java/com/j256/ormlite/field/types/EnumIntegerType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/EnumIntegerType.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Persists an Enum Java class as its ordinal integer value. You can also specify the {@link EnumStringType} as the diff --git a/src/main/java/com/j256/ormlite/field/types/EnumStringType.java b/src/main/java/com/j256/ormlite/core/field/types/EnumStringType.java similarity index 92% rename from src/main/java/com/j256/ormlite/field/types/EnumStringType.java rename to src/main/java/com/j256/ormlite/core/field/types/EnumStringType.java index 8504c346c..91fc24cce 100644 --- a/src/main/java/com/j256/ormlite/field/types/EnumStringType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/EnumStringType.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists an enum as its name produced by call @{link {@link Enum#name()}. You can also use the diff --git a/src/main/java/com/j256/ormlite/field/types/EnumToStringType.java b/src/main/java/com/j256/ormlite/core/field/types/EnumToStringType.java similarity index 90% rename from src/main/java/com/j256/ormlite/field/types/EnumToStringType.java rename to src/main/java/com/j256/ormlite/core/field/types/EnumToStringType.java index 5bbbd0560..706a2f45f 100644 --- a/src/main/java/com/j256/ormlite/field/types/EnumToStringType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/EnumToStringType.java @@ -1,6 +1,6 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.SqlType; /** * Type that persists an enum as its string value produced by call @{link {@link Enum#toString()}. You can also use the diff --git a/src/main/java/com/j256/ormlite/field/types/FloatObjectType.java b/src/main/java/com/j256/ormlite/core/field/types/FloatObjectType.java similarity index 82% rename from src/main/java/com/j256/ormlite/field/types/FloatObjectType.java rename to src/main/java/com/j256/ormlite/core/field/types/FloatObjectType.java index 7faea76c8..09dee6922 100644 --- a/src/main/java/com/j256/ormlite/field/types/FloatObjectType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/FloatObjectType.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a boolean primitive. diff --git a/src/main/java/com/j256/ormlite/field/types/FloatType.java b/src/main/java/com/j256/ormlite/core/field/types/FloatType.java similarity index 86% rename from src/main/java/com/j256/ormlite/field/types/FloatType.java rename to src/main/java/com/j256/ormlite/core/field/types/FloatType.java index b08bd3b1b..e5b52dffe 100644 --- a/src/main/java/com/j256/ormlite/field/types/FloatType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/FloatType.java @@ -1,6 +1,6 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.SqlType; /** * Type that persists a float primitive. diff --git a/src/main/java/com/j256/ormlite/field/types/IntType.java b/src/main/java/com/j256/ormlite/core/field/types/IntType.java similarity index 85% rename from src/main/java/com/j256/ormlite/field/types/IntType.java rename to src/main/java/com/j256/ormlite/core/field/types/IntType.java index ff1474733..6029abaf0 100644 --- a/src/main/java/com/j256/ormlite/field/types/IntType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/IntType.java @@ -1,6 +1,6 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.SqlType; /** * Type that persists a integer primitive. diff --git a/src/main/java/com/j256/ormlite/field/types/IntegerObjectType.java b/src/main/java/com/j256/ormlite/core/field/types/IntegerObjectType.java similarity index 87% rename from src/main/java/com/j256/ormlite/field/types/IntegerObjectType.java rename to src/main/java/com/j256/ormlite/core/field/types/IntegerObjectType.java index b3897f7e7..0be9fc5de 100644 --- a/src/main/java/com/j256/ormlite/field/types/IntegerObjectType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/IntegerObjectType.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a Integer object. diff --git a/src/main/java/com/j256/ormlite/field/types/LongObjectType.java b/src/main/java/com/j256/ormlite/core/field/types/LongObjectType.java similarity index 87% rename from src/main/java/com/j256/ormlite/field/types/LongObjectType.java rename to src/main/java/com/j256/ormlite/core/field/types/LongObjectType.java index eff59cb63..f2210e543 100644 --- a/src/main/java/com/j256/ormlite/field/types/LongObjectType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/LongObjectType.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a Long object. diff --git a/src/main/java/com/j256/ormlite/field/types/LongStringType.java b/src/main/java/com/j256/ormlite/core/field/types/LongStringType.java similarity index 89% rename from src/main/java/com/j256/ormlite/field/types/LongStringType.java rename to src/main/java/com/j256/ormlite/core/field/types/LongStringType.java index 4effb919e..8901988ac 100644 --- a/src/main/java/com/j256/ormlite/field/types/LongStringType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/LongStringType.java @@ -1,6 +1,6 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.SqlType; /** * Persists the {@link String} Java class but with more storage in the database. diff --git a/src/main/java/com/j256/ormlite/field/types/LongType.java b/src/main/java/com/j256/ormlite/core/field/types/LongType.java similarity index 85% rename from src/main/java/com/j256/ormlite/field/types/LongType.java rename to src/main/java/com/j256/ormlite/core/field/types/LongType.java index a98f44367..daa075694 100644 --- a/src/main/java/com/j256/ormlite/field/types/LongType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/LongType.java @@ -1,6 +1,6 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.SqlType; /** * Type that persists a long primitive. diff --git a/src/main/java/com/j256/ormlite/field/types/NativeUuidType.java b/src/main/java/com/j256/ormlite/core/field/types/NativeUuidType.java similarity index 86% rename from src/main/java/com/j256/ormlite/field/types/NativeUuidType.java rename to src/main/java/com/j256/ormlite/core/field/types/NativeUuidType.java index 573a05cf9..b7cb15f6f 100644 --- a/src/main/java/com/j256/ormlite/field/types/NativeUuidType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/NativeUuidType.java @@ -1,8 +1,8 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.util.UUID; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.SqlType; /** * Type that persists a {@link UUID} object but as a UUID type which is supported by a couple of database-types. diff --git a/src/main/java/com/j256/ormlite/field/types/SerializableType.java b/src/main/java/com/j256/ormlite/core/field/types/SerializableType.java similarity index 92% rename from src/main/java/com/j256/ormlite/field/types/SerializableType.java rename to src/main/java/com/j256/ormlite/core/field/types/SerializableType.java index b8d2ac51c..9253f0e4a 100644 --- a/src/main/java/com/j256/ormlite/field/types/SerializableType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/SerializableType.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -9,11 +9,11 @@ import java.sql.SQLException; import java.util.Arrays; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseResults; /** * Persists an unknown Java Object that is {@link Serializable}. diff --git a/src/main/java/com/j256/ormlite/field/types/ShortObjectType.java b/src/main/java/com/j256/ormlite/core/field/types/ShortObjectType.java similarity index 86% rename from src/main/java/com/j256/ormlite/field/types/ShortObjectType.java rename to src/main/java/com/j256/ormlite/core/field/types/ShortObjectType.java index 160fd6d92..3fb3b6d7d 100644 --- a/src/main/java/com/j256/ormlite/field/types/ShortObjectType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/ShortObjectType.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a Short object. diff --git a/src/main/java/com/j256/ormlite/field/types/ShortType.java b/src/main/java/com/j256/ormlite/core/field/types/ShortType.java similarity index 86% rename from src/main/java/com/j256/ormlite/field/types/ShortType.java rename to src/main/java/com/j256/ormlite/core/field/types/ShortType.java index 3bbfcf65e..dc345bcbb 100644 --- a/src/main/java/com/j256/ormlite/field/types/ShortType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/ShortType.java @@ -1,6 +1,6 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.SqlType; /** * Type that persists a short primitive. diff --git a/src/main/java/com/j256/ormlite/field/types/SqlDateStringType.java b/src/main/java/com/j256/ormlite/core/field/types/SqlDateStringType.java similarity index 91% rename from src/main/java/com/j256/ormlite/field/types/SqlDateStringType.java rename to src/main/java/com/j256/ormlite/core/field/types/SqlDateStringType.java index d304244ce..5ba281090 100644 --- a/src/main/java/com/j256/ormlite/field/types/SqlDateStringType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/SqlDateStringType.java @@ -1,11 +1,11 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.lang.reflect.Field; import java.sql.SQLException; import java.util.Date; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; /** * Type that persists a {@link java.sql.Date} object. diff --git a/src/main/java/com/j256/ormlite/field/types/SqlDateType.java b/src/main/java/com/j256/ormlite/core/field/types/SqlDateType.java similarity index 91% rename from src/main/java/com/j256/ormlite/field/types/SqlDateType.java rename to src/main/java/com/j256/ormlite/core/field/types/SqlDateType.java index 135b9915e..e7cc68b98 100644 --- a/src/main/java/com/j256/ormlite/field/types/SqlDateType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/SqlDateType.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.lang.reflect.Field; import java.sql.Timestamp; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; /** * Type that persists a {@link java.sql.Date} object. diff --git a/src/main/java/com/j256/ormlite/field/types/StringBytesType.java b/src/main/java/com/j256/ormlite/core/field/types/StringBytesType.java similarity index 91% rename from src/main/java/com/j256/ormlite/field/types/StringBytesType.java rename to src/main/java/com/j256/ormlite/core/field/types/StringBytesType.java index c11488f48..3b8d07244 100644 --- a/src/main/java/com/j256/ormlite/field/types/StringBytesType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/StringBytesType.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.io.UnsupportedEncodingException; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a String as a byte array. diff --git a/src/main/java/com/j256/ormlite/field/types/StringType.java b/src/main/java/com/j256/ormlite/core/field/types/StringType.java similarity index 83% rename from src/main/java/com/j256/ormlite/field/types/StringType.java rename to src/main/java/com/j256/ormlite/core/field/types/StringType.java index 1ea364d08..03c92858e 100644 --- a/src/main/java/com/j256/ormlite/field/types/StringType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/StringType.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a String object. diff --git a/src/main/java/com/j256/ormlite/field/types/TimeStampStringType.java b/src/main/java/com/j256/ormlite/core/field/types/TimeStampStringType.java similarity index 92% rename from src/main/java/com/j256/ormlite/field/types/TimeStampStringType.java rename to src/main/java/com/j256/ormlite/core/field/types/TimeStampStringType.java index 61943c302..529ba96b8 100644 --- a/src/main/java/com/j256/ormlite/field/types/TimeStampStringType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/TimeStampStringType.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.lang.reflect.Field; import java.sql.SQLException; import java.sql.Timestamp; import java.util.Date; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; /** * Type that persists a {@link java.sql.Timestamp} object as a String. diff --git a/src/main/java/com/j256/ormlite/field/types/TimeStampType.java b/src/main/java/com/j256/ormlite/core/field/types/TimeStampType.java similarity index 90% rename from src/main/java/com/j256/ormlite/field/types/TimeStampType.java rename to src/main/java/com/j256/ormlite/core/field/types/TimeStampType.java index 32746b3b8..ce1b0dd91 100644 --- a/src/main/java/com/j256/ormlite/field/types/TimeStampType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/TimeStampType.java @@ -1,9 +1,9 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.lang.reflect.Field; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; /** * Type that persists a {@link java.sql.Timestamp} object. diff --git a/src/main/java/com/j256/ormlite/field/types/UuidType.java b/src/main/java/com/j256/ormlite/core/field/types/UuidType.java similarity index 88% rename from src/main/java/com/j256/ormlite/field/types/UuidType.java rename to src/main/java/com/j256/ormlite/core/field/types/UuidType.java index 570e1a7f4..1b9643e2c 100644 --- a/src/main/java/com/j256/ormlite/field/types/UuidType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/UuidType.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.sql.SQLException; import java.util.UUID; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseResults; /** * Type that persists a {@link UUID} object using a database String. This is not to be confused with the native UUID diff --git a/src/main/java/com/j256/ormlite/field/types/VoidType.java b/src/main/java/com/j256/ormlite/core/field/types/VoidType.java similarity index 79% rename from src/main/java/com/j256/ormlite/field/types/VoidType.java rename to src/main/java/com/j256/ormlite/core/field/types/VoidType.java index f5fbfc4eb..455caacd9 100644 --- a/src/main/java/com/j256/ormlite/field/types/VoidType.java +++ b/src/main/java/com/j256/ormlite/core/field/types/VoidType.java @@ -1,9 +1,9 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import java.lang.reflect.Field; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.support.DatabaseResults; /** * Marker class used to see if we have a customer persister defined. diff --git a/src/main/java/com/j256/ormlite/logger/CommonsLoggingLog.java b/src/main/java/com/j256/ormlite/core/logger/CommonsLoggingLog.java similarity index 97% rename from src/main/java/com/j256/ormlite/logger/CommonsLoggingLog.java rename to src/main/java/com/j256/ormlite/core/logger/CommonsLoggingLog.java index 6e2429eaf..bcb6e5ba3 100644 --- a/src/main/java/com/j256/ormlite/logger/CommonsLoggingLog.java +++ b/src/main/java/com/j256/ormlite/core/logger/CommonsLoggingLog.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.logger; +package com.j256.ormlite.core.logger; /** * Class which implements our Log interface by delegating to the Apache commons logging classes. diff --git a/src/main/java/com/j256/ormlite/logger/JavaUtilLog.java b/src/main/java/com/j256/ormlite/core/logger/JavaUtilLog.java similarity index 76% rename from src/main/java/com/j256/ormlite/logger/JavaUtilLog.java rename to src/main/java/com/j256/ormlite/core/logger/JavaUtilLog.java index e43ed181b..67594caf8 100644 --- a/src/main/java/com/j256/ormlite/logger/JavaUtilLog.java +++ b/src/main/java/com/j256/ormlite/core/logger/JavaUtilLog.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.logger; +package com.j256.ormlite.core.logger; /** * Class which logs to java.util.log. This will never be chosen by default because it should always in the classpath, @@ -15,21 +15,21 @@ public JavaUtilLog(String className) { } @Override - public boolean isLevelEnabled(com.j256.ormlite.logger.Log.Level level) { + public boolean isLevelEnabled(com.j256.ormlite.core.logger.Log.Level level) { return logger.isLoggable(levelToJavaLevel(level)); } @Override - public void log(com.j256.ormlite.logger.Log.Level level, String msg) { + public void log(com.j256.ormlite.core.logger.Log.Level level, String msg) { logger.log(levelToJavaLevel(level), msg); } @Override - public void log(com.j256.ormlite.logger.Log.Level level, String msg, Throwable throwable) { + public void log(com.j256.ormlite.core.logger.Log.Level level, String msg, Throwable throwable) { logger.log(levelToJavaLevel(level), msg, throwable); } - private java.util.logging.Level levelToJavaLevel(com.j256.ormlite.logger.Log.Level level) { + private java.util.logging.Level levelToJavaLevel(com.j256.ormlite.core.logger.Log.Level level) { switch (level) { case TRACE: return java.util.logging.Level.FINER; diff --git a/src/main/java/com/j256/ormlite/logger/LocalLog.java b/src/main/java/com/j256/ormlite/core/logger/LocalLog.java similarity index 97% rename from src/main/java/com/j256/ormlite/logger/LocalLog.java rename to src/main/java/com/j256/ormlite/core/logger/LocalLog.java index 13ab48177..40dbc7469 100644 --- a/src/main/java/com/j256/ormlite/logger/LocalLog.java +++ b/src/main/java/com/j256/ormlite/core/logger/LocalLog.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.logger; +package com.j256.ormlite.core.logger; import java.io.BufferedReader; import java.io.File; @@ -15,7 +15,7 @@ import java.util.Locale; import java.util.regex.Pattern; -import com.j256.ormlite.misc.IOUtils; +import com.j256.ormlite.core.misc.IOUtils; /** *

@@ -44,8 +44,8 @@ */ public class LocalLog implements Log { - public static final String LOCAL_LOG_LEVEL_PROPERTY = "com.j256.ormlite.logger.level"; - public static final String LOCAL_LOG_FILE_PROPERTY = "com.j256.ormlite.logger.file"; + public static final String LOCAL_LOG_LEVEL_PROPERTY = "com.j256.ormlite.core.logger.level"; + public static final String LOCAL_LOG_FILE_PROPERTY = "com.j256.ormlite.core.logger.file"; public static final String LOCAL_LOG_PROPERTIES_FILE = "/ormliteLocalLog.properties"; private static final Level DEFAULT_LEVEL = Level.DEBUG; diff --git a/src/main/java/com/j256/ormlite/logger/Log.java b/src/main/java/com/j256/ormlite/core/logger/Log.java similarity index 96% rename from src/main/java/com/j256/ormlite/logger/Log.java rename to src/main/java/com/j256/ormlite/core/logger/Log.java index eeed28f74..a2a7d5c41 100644 --- a/src/main/java/com/j256/ormlite/logger/Log.java +++ b/src/main/java/com/j256/ormlite/core/logger/Log.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.logger; +package com.j256.ormlite.core.logger; /** * Interface so we can front various log code which may or may not be in the classpath. diff --git a/src/main/java/com/j256/ormlite/logger/Logger.java b/src/main/java/com/j256/ormlite/core/logger/Logger.java similarity index 99% rename from src/main/java/com/j256/ormlite/logger/Logger.java rename to src/main/java/com/j256/ormlite/core/logger/Logger.java index 2add0f25c..762d38d5a 100644 --- a/src/main/java/com/j256/ormlite/logger/Logger.java +++ b/src/main/java/com/j256/ormlite/core/logger/Logger.java @@ -1,8 +1,8 @@ -package com.j256.ormlite.logger; +package com.j256.ormlite.core.logger; import java.lang.reflect.Array; -import com.j256.ormlite.logger.Log.Level; +import com.j256.ormlite.core.logger.Log.Level; /** *

diff --git a/src/main/java/com/j256/ormlite/logger/LoggerFactory.java b/src/main/java/com/j256/ormlite/core/logger/LoggerFactory.java similarity index 88% rename from src/main/java/com/j256/ormlite/logger/LoggerFactory.java rename to src/main/java/com/j256/ormlite/core/logger/LoggerFactory.java index d711bee75..484214012 100644 --- a/src/main/java/com/j256/ormlite/logger/LoggerFactory.java +++ b/src/main/java/com/j256/ormlite/core/logger/LoggerFactory.java @@ -1,22 +1,22 @@ -package com.j256.ormlite.logger; +package com.j256.ormlite.core.logger; import java.lang.reflect.Constructor; -import com.j256.ormlite.logger.Log.Level; +import com.j256.ormlite.core.logger.Log.Level; /** * Factory that creates {@link Logger} instances. It uses reflection to see what loggers are installed on the system and * tries to find the most appropriate one. * *

- * To set the logger to a particular type, set the system property ("com.j256.ormlite.logger.type") contained in - * {@link #LOG_TYPE_SYSTEM_PROPERTY} ("com.j256.ormlite.logger.type") to be one of the values in + * To set the logger to a particular type, set the system property ("com.j256.ormlite.core.logger.type") contained in + * {@link #LOG_TYPE_SYSTEM_PROPERTY} ("com.j256.ormlite.core.logger.type") to be one of the values in * {@link LoggerFactory.LogType} enum. *

*/ public class LoggerFactory { - public static final String LOG_TYPE_SYSTEM_PROPERTY = "com.j256.ormlite.logger.type"; + public static final String LOG_TYPE_SYSTEM_PROPERTY = "com.j256.ormlite.core.logger.type"; private static LogType logType; /** @@ -85,15 +85,15 @@ private static LogType findLogType() { * Type of internal logs supported. This is package permissions for testing. */ public enum LogType { - SLF4J("org.slf4j.LoggerFactory", "com.j256.ormlite.logger.Slf4jLoggingLog"), + SLF4J("org.slf4j.LoggerFactory", "com.j256.ormlite.core.logger.Slf4jLoggingLog"), /** * WARNING: Android log must be _before_ commons logging since Android provides commons logging but logging * messages are ignored that are sent there. Grrrrr. */ ANDROID("android.util.Log", "com.j256.ormlite.android.AndroidLog"), - COMMONS_LOGGING("org.apache.commons.logging.LogFactory", "com.j256.ormlite.logger.CommonsLoggingLog"), - LOG4J2("org.apache.logging.log4j.LogManager", "com.j256.ormlite.logger.Log4j2Log"), - LOG4J("org.apache.log4j.Logger", "com.j256.ormlite.logger.Log4jLog"), + COMMONS_LOGGING("org.apache.commons.logging.LogFactory", "com.j256.ormlite.core.logger.CommonsLoggingLog"), + LOG4J2("org.apache.logging.log4j.LogManager", "com.j256.ormlite.core.logger.Log4j2Log"), + LOG4J("org.apache.log4j.Logger", "com.j256.ormlite.core.logger.Log4jLog"), // this should always be at the end as the fall-back, so it's always available LOCAL(LocalLog.class.getName(), LocalLog.class.getName()) { @Override @@ -108,7 +108,7 @@ public boolean isAvailable() { } }, // we put this down here because it's always available but we rarely want to use it - JAVA_UTIL("java.util.logging.Logger", "com.j256.ormlite.logger.JavaUtilLog"), + JAVA_UTIL("java.util.logging.Logger", "com.j256.ormlite.core.logger.JavaUtilLog"), // end ; diff --git a/src/main/java/com/j256/ormlite/logger/Slf4jLoggingLog.java b/src/main/java/com/j256/ormlite/core/logger/Slf4jLoggingLog.java similarity index 91% rename from src/main/java/com/j256/ormlite/logger/Slf4jLoggingLog.java rename to src/main/java/com/j256/ormlite/core/logger/Slf4jLoggingLog.java index 072046b44..39c3840fb 100644 --- a/src/main/java/com/j256/ormlite/logger/Slf4jLoggingLog.java +++ b/src/main/java/com/j256/ormlite/core/logger/Slf4jLoggingLog.java @@ -1,7 +1,7 @@ -package com.j256.ormlite.logger; +package com.j256.ormlite.core.logger; /** - * Class which implements our {@link com.j256.ormlite.logger.Log} interface by delegating to slf4j. + * Class which implements our {@link com.j256.ormlite.core.logger.Log} interface by delegating to slf4j. * * @author graywatson */ diff --git a/src/main/java/com/j256/ormlite/misc/BaseDaoEnabled.java b/src/main/java/com/j256/ormlite/core/misc/BaseDaoEnabled.java similarity index 97% rename from src/main/java/com/j256/ormlite/misc/BaseDaoEnabled.java rename to src/main/java/com/j256/ormlite/core/misc/BaseDaoEnabled.java index 7921fef7a..db2e9b7f1 100644 --- a/src/main/java/com/j256/ormlite/misc/BaseDaoEnabled.java +++ b/src/main/java/com/j256/ormlite/core/misc/BaseDaoEnabled.java @@ -1,8 +1,8 @@ -package com.j256.ormlite.misc; +package com.j256.ormlite.core.misc; import java.sql.SQLException; -import com.j256.ormlite.dao.Dao; +import com.j256.ormlite.core.dao.Dao; /** * Base class that your data elements can extend which allow them to refresh, update, etc. themselves. ORMLite will diff --git a/src/main/java/com/j256/ormlite/misc/IOUtils.java b/src/main/java/com/j256/ormlite/core/misc/IOUtils.java similarity index 95% rename from src/main/java/com/j256/ormlite/misc/IOUtils.java rename to src/main/java/com/j256/ormlite/core/misc/IOUtils.java index 58ccb4eaf..4f8cb1911 100644 --- a/src/main/java/com/j256/ormlite/misc/IOUtils.java +++ b/src/main/java/com/j256/ormlite/core/misc/IOUtils.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.misc; +package com.j256.ormlite.core.misc; import java.io.Closeable; import java.io.IOException; diff --git a/src/main/java/com/j256/ormlite/misc/JavaxPersistenceConfigurer.java b/src/main/java/com/j256/ormlite/core/misc/JavaxPersistenceConfigurer.java similarity index 83% rename from src/main/java/com/j256/ormlite/misc/JavaxPersistenceConfigurer.java rename to src/main/java/com/j256/ormlite/core/misc/JavaxPersistenceConfigurer.java index 90f6bf342..2c3e333c4 100644 --- a/src/main/java/com/j256/ormlite/misc/JavaxPersistenceConfigurer.java +++ b/src/main/java/com/j256/ormlite/core/misc/JavaxPersistenceConfigurer.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.misc; +package com.j256.ormlite.core.misc; import java.lang.reflect.Field; import java.sql.SQLException; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DatabaseFieldConfig; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DatabaseFieldConfig; /** * Interface that allows us to load and process javax.persistance annotations only if available. diff --git a/src/main/java/com/j256/ormlite/misc/JavaxPersistenceImpl.java b/src/main/java/com/j256/ormlite/core/misc/JavaxPersistenceImpl.java similarity index 94% rename from src/main/java/com/j256/ormlite/misc/JavaxPersistenceImpl.java rename to src/main/java/com/j256/ormlite/core/misc/JavaxPersistenceImpl.java index 0bdcf2f86..f26d9feae 100644 --- a/src/main/java/com/j256/ormlite/misc/JavaxPersistenceImpl.java +++ b/src/main/java/com/j256/ormlite/core/misc/JavaxPersistenceImpl.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.misc; +package com.j256.ormlite.core.misc; import java.lang.reflect.Field; import java.util.Collection; @@ -17,11 +17,11 @@ import javax.persistence.Table; import javax.persistence.Version; -import com.j256.ormlite.dao.ForeignCollection; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DataPersisterManager; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseFieldConfig; +import com.j256.ormlite.core.dao.ForeignCollection; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DataPersisterManager; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseFieldConfig; /** * Class for isolating the detection of the javax.persistence annotations. This used to be a hard dependency but it has diff --git a/src/main/java/com/j256/ormlite/misc/SqlExceptionUtil.java b/src/main/java/com/j256/ormlite/core/misc/SqlExceptionUtil.java similarity index 95% rename from src/main/java/com/j256/ormlite/misc/SqlExceptionUtil.java rename to src/main/java/com/j256/ormlite/core/misc/SqlExceptionUtil.java index c21e3e737..a4ed0a5bf 100644 --- a/src/main/java/com/j256/ormlite/misc/SqlExceptionUtil.java +++ b/src/main/java/com/j256/ormlite/core/misc/SqlExceptionUtil.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.misc; +package com.j256.ormlite.core.misc; import java.sql.SQLException; diff --git a/src/main/java/com/j256/ormlite/misc/TransactionManager.java b/src/main/java/com/j256/ormlite/core/misc/TransactionManager.java similarity index 96% rename from src/main/java/com/j256/ormlite/misc/TransactionManager.java rename to src/main/java/com/j256/ormlite/core/misc/TransactionManager.java index aebf974bb..e3f128d01 100644 --- a/src/main/java/com/j256/ormlite/misc/TransactionManager.java +++ b/src/main/java/com/j256/ormlite/core/misc/TransactionManager.java @@ -1,15 +1,15 @@ -package com.j256.ormlite.misc; +package com.j256.ormlite.core.misc; import java.sql.SQLException; import java.sql.Savepoint; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicInteger; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.logger.Logger; -import com.j256.ormlite.logger.LoggerFactory; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.logger.Logger; +import com.j256.ormlite.core.logger.LoggerFactory; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; /** *

@@ -47,7 +47,7 @@ *

* * 
- * <bean id="transactionManager" class="com.j256.ormlite.misc.TransactionManager" init-method="initialize">
+ * <bean id="transactionManager" class="com.j256.ormlite.core.misc.TransactionManager" init-method="initialize">
  * 	<property name="dataSource" ref="dataSource" />
  * </bean>
  *
diff --git a/src/main/java/com/j256/ormlite/misc/VersionUtils.java b/src/main/java/com/j256/ormlite/core/misc/VersionUtils.java similarity index 91% rename from src/main/java/com/j256/ormlite/misc/VersionUtils.java rename to src/main/java/com/j256/ormlite/core/misc/VersionUtils.java index 25333e097..07725f94f 100644 --- a/src/main/java/com/j256/ormlite/misc/VersionUtils.java +++ b/src/main/java/com/j256/ormlite/core/misc/VersionUtils.java @@ -1,7 +1,7 @@ -package com.j256.ormlite.misc; +package com.j256.ormlite.core.misc; -import com.j256.ormlite.logger.Logger; -import com.j256.ormlite.logger.LoggerFactory; +import com.j256.ormlite.core.logger.Logger; +import com.j256.ormlite.core.logger.LoggerFactory; /** * A class which helps us verify that we are running symmetric versions. @@ -10,7 +10,7 @@ */ public class VersionUtils { - private static final String CORE_VERSION = "VERSION__5.1__"; + private static final String CORE_VERSION = "VERSION__5.2-SNAPSHOT__"; private static Logger logger; private static boolean thrownOnErrors = false; diff --git a/src/main/java/com/j256/ormlite/stmt/ArgumentHolder.java b/src/main/java/com/j256/ormlite/core/stmt/ArgumentHolder.java similarity index 93% rename from src/main/java/com/j256/ormlite/stmt/ArgumentHolder.java rename to src/main/java/com/j256/ormlite/core/stmt/ArgumentHolder.java index de10749a8..33a0e1996 100644 --- a/src/main/java/com/j256/ormlite/stmt/ArgumentHolder.java +++ b/src/main/java/com/j256/ormlite/core/stmt/ArgumentHolder.java @@ -1,9 +1,9 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; /** * An argument to a select SQL statement. After the query is constructed, the caller can set the value on this argument diff --git a/src/main/java/com/j256/ormlite/stmt/BaseArgumentHolder.java b/src/main/java/com/j256/ormlite/core/stmt/BaseArgumentHolder.java similarity index 95% rename from src/main/java/com/j256/ormlite/stmt/BaseArgumentHolder.java rename to src/main/java/com/j256/ormlite/core/stmt/BaseArgumentHolder.java index 1a779e192..a5ce6b3a5 100644 --- a/src/main/java/com/j256/ormlite/stmt/BaseArgumentHolder.java +++ b/src/main/java/com/j256/ormlite/core/stmt/BaseArgumentHolder.java @@ -1,9 +1,9 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; /** * Base class for other select argument classes. diff --git a/src/main/java/com/j256/ormlite/stmt/ColumnArg.java b/src/main/java/com/j256/ormlite/core/stmt/ColumnArg.java similarity index 97% rename from src/main/java/com/j256/ormlite/stmt/ColumnArg.java rename to src/main/java/com/j256/ormlite/core/stmt/ColumnArg.java index d13bb5a42..18cbac0a4 100644 --- a/src/main/java/com/j256/ormlite/stmt/ColumnArg.java +++ b/src/main/java/com/j256/ormlite/core/stmt/ColumnArg.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; /** * An argument to a select SQL statement that represents a column in a table. This allows you using the diff --git a/src/main/java/com/j256/ormlite/stmt/DeleteBuilder.java b/src/main/java/com/j256/ormlite/core/stmt/DeleteBuilder.java similarity index 91% rename from src/main/java/com/j256/ormlite/stmt/DeleteBuilder.java rename to src/main/java/com/j256/ormlite/core/stmt/DeleteBuilder.java index e375e1f8f..dc5cf637e 100644 --- a/src/main/java/com/j256/ormlite/stmt/DeleteBuilder.java +++ b/src/main/java/com/j256/ormlite/core/stmt/DeleteBuilder.java @@ -1,11 +1,11 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.table.TableInfo; /** * Assists in building sql DELETE statements for a particular table in a particular database. diff --git a/src/main/java/com/j256/ormlite/stmt/GenericRowMapper.java b/src/main/java/com/j256/ormlite/core/stmt/GenericRowMapper.java similarity index 87% rename from src/main/java/com/j256/ormlite/stmt/GenericRowMapper.java rename to src/main/java/com/j256/ormlite/core/stmt/GenericRowMapper.java index b6a5470e6..cd625bb33 100644 --- a/src/main/java/com/j256/ormlite/stmt/GenericRowMapper.java +++ b/src/main/java/com/j256/ormlite/core/stmt/GenericRowMapper.java @@ -1,8 +1,8 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import java.sql.SQLException; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.support.DatabaseResults; /** * Parameterized version similar to Spring's RowMapper which converts a result row into an object. diff --git a/src/main/java/com/j256/ormlite/stmt/NullArgHolder.java b/src/main/java/com/j256/ormlite/core/stmt/NullArgHolder.java similarity index 89% rename from src/main/java/com/j256/ormlite/stmt/NullArgHolder.java rename to src/main/java/com/j256/ormlite/core/stmt/NullArgHolder.java index e8913e41c..51bdf3fa9 100644 --- a/src/main/java/com/j256/ormlite/stmt/NullArgHolder.java +++ b/src/main/java/com/j256/ormlite/core/stmt/NullArgHolder.java @@ -1,7 +1,7 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; /** * An argument to a select SQL statement for null arguments. This overrides the protections around multiple columns diff --git a/src/main/java/com/j256/ormlite/stmt/PreparedDelete.java b/src/main/java/com/j256/ormlite/core/stmt/PreparedDelete.java similarity index 82% rename from src/main/java/com/j256/ormlite/stmt/PreparedDelete.java rename to src/main/java/com/j256/ormlite/core/stmt/PreparedDelete.java index bb08984f9..157412092 100644 --- a/src/main/java/com/j256/ormlite/stmt/PreparedDelete.java +++ b/src/main/java/com/j256/ormlite/core/stmt/PreparedDelete.java @@ -1,6 +1,6 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; -import com.j256.ormlite.dao.Dao; +import com.j256.ormlite.core.dao.Dao; /** * Interface returned by the {@link DeleteBuilder#prepare()} which supports custom DELETE statements. This should be in diff --git a/src/main/java/com/j256/ormlite/stmt/PreparedQuery.java b/src/main/java/com/j256/ormlite/core/stmt/PreparedQuery.java similarity index 84% rename from src/main/java/com/j256/ormlite/stmt/PreparedQuery.java rename to src/main/java/com/j256/ormlite/core/stmt/PreparedQuery.java index ffbd0b609..dd364b50e 100644 --- a/src/main/java/com/j256/ormlite/stmt/PreparedQuery.java +++ b/src/main/java/com/j256/ormlite/core/stmt/PreparedQuery.java @@ -1,6 +1,6 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; -import com.j256.ormlite.dao.Dao; +import com.j256.ormlite.core.dao.Dao; /** * Interface returned by the {@link QueryBuilder#prepare()} which supports custom SELECT queries. This should be in turn diff --git a/src/main/java/com/j256/ormlite/stmt/PreparedStmt.java b/src/main/java/com/j256/ormlite/core/stmt/PreparedStmt.java similarity index 89% rename from src/main/java/com/j256/ormlite/stmt/PreparedStmt.java rename to src/main/java/com/j256/ormlite/core/stmt/PreparedStmt.java index b682de5cb..e05dda31a 100644 --- a/src/main/java/com/j256/ormlite/stmt/PreparedStmt.java +++ b/src/main/java/com/j256/ormlite/core/stmt/PreparedStmt.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import java.sql.SQLException; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.DatabaseConnection; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.DatabaseConnection; /** * Parent interface for the {@link PreparedQuery}, {@link PreparedUpdate}, and {@link PreparedDelete} interfaces. diff --git a/src/main/java/com/j256/ormlite/stmt/PreparedUpdate.java b/src/main/java/com/j256/ormlite/core/stmt/PreparedUpdate.java similarity index 82% rename from src/main/java/com/j256/ormlite/stmt/PreparedUpdate.java rename to src/main/java/com/j256/ormlite/core/stmt/PreparedUpdate.java index e9c2b58b7..5075395ec 100644 --- a/src/main/java/com/j256/ormlite/stmt/PreparedUpdate.java +++ b/src/main/java/com/j256/ormlite/core/stmt/PreparedUpdate.java @@ -1,6 +1,6 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; -import com.j256.ormlite.dao.Dao; +import com.j256.ormlite.core.dao.Dao; /** * Interface returned by the {@link UpdateBuilder#prepare()} which supports custom UPDATE statements. This should be in diff --git a/src/main/java/com/j256/ormlite/stmt/QueryBuilder.java b/src/main/java/com/j256/ormlite/core/stmt/QueryBuilder.java similarity index 98% rename from src/main/java/com/j256/ormlite/stmt/QueryBuilder.java rename to src/main/java/com/j256/ormlite/core/stmt/QueryBuilder.java index c0e3dd38c..1bd4de968 100644 --- a/src/main/java/com/j256/ormlite/stmt/QueryBuilder.java +++ b/src/main/java/com/j256/ormlite/core/stmt/QueryBuilder.java @@ -1,19 +1,19 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import java.sql.SQLException; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.j256.ormlite.dao.CloseableIterator; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.GenericRawResults; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.ForeignCollectionField; -import com.j256.ormlite.stmt.query.ColumnNameOrRawSql; -import com.j256.ormlite.stmt.query.OrderBy; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.CloseableIterator; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.GenericRawResults; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.ForeignCollectionField; +import com.j256.ormlite.core.stmt.query.ColumnNameOrRawSql; +import com.j256.ormlite.core.stmt.query.OrderBy; +import com.j256.ormlite.core.table.TableInfo; /** * Assists in building sql query (SELECT) statements for a particular table in a particular database. diff --git a/src/main/java/com/j256/ormlite/stmt/RawResultsImpl.java b/src/main/java/com/j256/ormlite/core/stmt/RawResultsImpl.java similarity index 83% rename from src/main/java/com/j256/ormlite/stmt/RawResultsImpl.java rename to src/main/java/com/j256/ormlite/core/stmt/RawResultsImpl.java index e5a35037e..f77f36923 100644 --- a/src/main/java/com/j256/ormlite/stmt/RawResultsImpl.java +++ b/src/main/java/com/j256/ormlite/core/stmt/RawResultsImpl.java @@ -1,17 +1,17 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import java.io.IOException; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import com.j256.ormlite.dao.CloseableIterator; -import com.j256.ormlite.dao.GenericRawResults; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; +import com.j256.ormlite.core.dao.CloseableIterator; +import com.j256.ormlite.core.dao.GenericRawResults; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; /** * Handler for our raw results objects which does the conversion for various different results: String[], Object[], and diff --git a/src/main/java/com/j256/ormlite/stmt/RawRowMapperImpl.java b/src/main/java/com/j256/ormlite/core/stmt/RawRowMapperImpl.java similarity index 82% rename from src/main/java/com/j256/ormlite/stmt/RawRowMapperImpl.java rename to src/main/java/com/j256/ormlite/core/stmt/RawRowMapperImpl.java index aeb5a2e5d..f58d06196 100644 --- a/src/main/java/com/j256/ormlite/stmt/RawRowMapperImpl.java +++ b/src/main/java/com/j256/ormlite/core/stmt/RawRowMapperImpl.java @@ -1,11 +1,11 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import java.sql.SQLException; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.RawRowMapper; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.RawRowMapper; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.table.TableInfo; /** * Default row mapper when you are using the {@link Dao#queryRaw(String, RawRowMapper, String...)}. diff --git a/src/main/java/com/j256/ormlite/stmt/SelectArg.java b/src/main/java/com/j256/ormlite/core/stmt/SelectArg.java similarity index 97% rename from src/main/java/com/j256/ormlite/stmt/SelectArg.java rename to src/main/java/com/j256/ormlite/core/stmt/SelectArg.java index 66c6f4206..5b0561409 100644 --- a/src/main/java/com/j256/ormlite/stmt/SelectArg.java +++ b/src/main/java/com/j256/ormlite/core/stmt/SelectArg.java @@ -1,6 +1,6 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.SqlType; /** * An argument to a select SQL statement. After the query is constructed, the caller can set the value on this argument diff --git a/src/main/java/com/j256/ormlite/stmt/SelectIterator.java b/src/main/java/com/j256/ormlite/core/stmt/SelectIterator.java similarity index 93% rename from src/main/java/com/j256/ormlite/stmt/SelectIterator.java rename to src/main/java/com/j256/ormlite/core/stmt/SelectIterator.java index 4d65bb19d..6e2608190 100644 --- a/src/main/java/com/j256/ormlite/stmt/SelectIterator.java +++ b/src/main/java/com/j256/ormlite/core/stmt/SelectIterator.java @@ -1,18 +1,18 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import java.io.IOException; import java.sql.SQLException; -import com.j256.ormlite.dao.CloseableIterator; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.logger.Logger; -import com.j256.ormlite.logger.LoggerFactory; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.dao.CloseableIterator; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.logger.Logger; +import com.j256.ormlite.core.logger.LoggerFactory; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; /** * Internal iterator so we can page through the class. This is used by the {@link Dao#iterator} methods. diff --git a/src/main/java/com/j256/ormlite/stmt/StatementBuilder.java b/src/main/java/com/j256/ormlite/core/stmt/StatementBuilder.java similarity index 96% rename from src/main/java/com/j256/ormlite/stmt/StatementBuilder.java rename to src/main/java/com/j256/ormlite/core/stmt/StatementBuilder.java index e735aefaf..91388cd66 100644 --- a/src/main/java/com/j256/ormlite/stmt/StatementBuilder.java +++ b/src/main/java/com/j256/ormlite/core/stmt/StatementBuilder.java @@ -1,16 +1,16 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.logger.Logger; -import com.j256.ormlite.logger.LoggerFactory; -import com.j256.ormlite.stmt.mapped.MappedPreparedStmt; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.logger.Logger; +import com.j256.ormlite.core.logger.LoggerFactory; +import com.j256.ormlite.core.stmt.mapped.MappedPreparedStmt; +import com.j256.ormlite.core.table.TableInfo; /** * Assists in building of SQL statements for a particular table in a particular database. diff --git a/src/main/java/com/j256/ormlite/stmt/StatementExecutor.java b/src/main/java/com/j256/ormlite/core/stmt/StatementExecutor.java similarity index 95% rename from src/main/java/com/j256/ormlite/stmt/StatementExecutor.java rename to src/main/java/com/j256/ormlite/core/stmt/StatementExecutor.java index fd2d4145d..588bbdc44 100644 --- a/src/main/java/com/j256/ormlite/stmt/StatementExecutor.java +++ b/src/main/java/com/j256/ormlite/core/stmt/StatementExecutor.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import java.sql.SQLException; import java.util.ArrayList; @@ -6,35 +6,35 @@ import java.util.List; import java.util.concurrent.Callable; -import com.j256.ormlite.dao.BaseDaoImpl; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.DatabaseResultsMapper; -import com.j256.ormlite.dao.GenericRawResults; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.dao.RawRowMapper; -import com.j256.ormlite.dao.RawRowObjectMapper; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.logger.Logger; -import com.j256.ormlite.logger.LoggerFactory; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.misc.TransactionManager; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.stmt.mapped.MappedCreate; -import com.j256.ormlite.stmt.mapped.MappedDelete; -import com.j256.ormlite.stmt.mapped.MappedDeleteCollection; -import com.j256.ormlite.stmt.mapped.MappedQueryForFieldEq; -import com.j256.ormlite.stmt.mapped.MappedRefresh; -import com.j256.ormlite.stmt.mapped.MappedUpdate; -import com.j256.ormlite.stmt.mapped.MappedUpdateId; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.BaseDaoImpl; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.DatabaseResultsMapper; +import com.j256.ormlite.core.dao.GenericRawResults; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.dao.RawRowMapper; +import com.j256.ormlite.core.dao.RawRowObjectMapper; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.logger.Logger; +import com.j256.ormlite.core.logger.LoggerFactory; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.misc.TransactionManager; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.stmt.mapped.MappedCreate; +import com.j256.ormlite.core.stmt.mapped.MappedDelete; +import com.j256.ormlite.core.stmt.mapped.MappedDeleteCollection; +import com.j256.ormlite.core.stmt.mapped.MappedQueryForFieldEq; +import com.j256.ormlite.core.stmt.mapped.MappedRefresh; +import com.j256.ormlite.core.stmt.mapped.MappedUpdate; +import com.j256.ormlite.core.stmt.mapped.MappedUpdateId; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.TableInfo; /** * Executes SQL statements for a particular table in a particular database. Basically a call through to various mapped diff --git a/src/main/java/com/j256/ormlite/stmt/ThreadLocalSelectArg.java b/src/main/java/com/j256/ormlite/core/stmt/ThreadLocalSelectArg.java similarity index 94% rename from src/main/java/com/j256/ormlite/stmt/ThreadLocalSelectArg.java rename to src/main/java/com/j256/ormlite/core/stmt/ThreadLocalSelectArg.java index cae89d237..e0ba734fa 100644 --- a/src/main/java/com/j256/ormlite/stmt/ThreadLocalSelectArg.java +++ b/src/main/java/com/j256/ormlite/core/stmt/ThreadLocalSelectArg.java @@ -1,6 +1,6 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.SqlType; /** * Like {@link SelectArg} but using a {@link ThreadLocal} internally to improve reentrance so that multiple threads can diff --git a/src/main/java/com/j256/ormlite/stmt/UpdateBuilder.java b/src/main/java/com/j256/ormlite/core/stmt/UpdateBuilder.java similarity index 93% rename from src/main/java/com/j256/ormlite/stmt/UpdateBuilder.java rename to src/main/java/com/j256/ormlite/core/stmt/UpdateBuilder.java index 936dff7ff..e381b77be 100644 --- a/src/main/java/com/j256/ormlite/stmt/UpdateBuilder.java +++ b/src/main/java/com/j256/ormlite/core/stmt/UpdateBuilder.java @@ -1,16 +1,16 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.query.Clause; -import com.j256.ormlite.stmt.query.SetExpression; -import com.j256.ormlite.stmt.query.SetValue; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.query.Clause; +import com.j256.ormlite.core.stmt.query.SetExpression; +import com.j256.ormlite.core.stmt.query.SetValue; +import com.j256.ormlite.core.table.TableInfo; /** * Assists in building sql UPDATE statements for a particular table in a particular database. diff --git a/src/main/java/com/j256/ormlite/stmt/Where.java b/src/main/java/com/j256/ormlite/core/stmt/Where.java similarity index 95% rename from src/main/java/com/j256/ormlite/stmt/Where.java rename to src/main/java/com/j256/ormlite/core/stmt/Where.java index 5be59fdec..b64ca662c 100644 --- a/src/main/java/com/j256/ormlite/stmt/Where.java +++ b/src/main/java/com/j256/ormlite/core/stmt/Where.java @@ -1,28 +1,28 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import com.j256.ormlite.dao.CloseableIterator; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.GenericRawResults; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.QueryBuilder.InternalQueryBuilderWrapper; -import com.j256.ormlite.stmt.query.Between; -import com.j256.ormlite.stmt.query.Clause; -import com.j256.ormlite.stmt.query.Exists; -import com.j256.ormlite.stmt.query.In; -import com.j256.ormlite.stmt.query.InSubQuery; -import com.j256.ormlite.stmt.query.IsNotNull; -import com.j256.ormlite.stmt.query.IsNull; -import com.j256.ormlite.stmt.query.ManyClause; -import com.j256.ormlite.stmt.query.NeedsFutureClause; -import com.j256.ormlite.stmt.query.Not; -import com.j256.ormlite.stmt.query.Raw; -import com.j256.ormlite.stmt.query.SimpleComparison; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.CloseableIterator; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.GenericRawResults; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.QueryBuilder.InternalQueryBuilderWrapper; +import com.j256.ormlite.core.stmt.query.Between; +import com.j256.ormlite.core.stmt.query.Clause; +import com.j256.ormlite.core.stmt.query.Exists; +import com.j256.ormlite.core.stmt.query.In; +import com.j256.ormlite.core.stmt.query.InSubQuery; +import com.j256.ormlite.core.stmt.query.IsNotNull; +import com.j256.ormlite.core.stmt.query.IsNull; +import com.j256.ormlite.core.stmt.query.ManyClause; +import com.j256.ormlite.core.stmt.query.NeedsFutureClause; +import com.j256.ormlite.core.stmt.query.Not; +import com.j256.ormlite.core.stmt.query.Raw; +import com.j256.ormlite.core.stmt.query.SimpleComparison; +import com.j256.ormlite.core.table.TableInfo; /** *

diff --git a/src/main/java/com/j256/ormlite/stmt/mapped/BaseMappedQuery.java b/src/main/java/com/j256/ormlite/core/stmt/mapped/BaseMappedQuery.java similarity index 90% rename from src/main/java/com/j256/ormlite/stmt/mapped/BaseMappedQuery.java rename to src/main/java/com/j256/ormlite/core/stmt/mapped/BaseMappedQuery.java index 5b44a2061..53fb0c32b 100644 --- a/src/main/java/com/j256/ormlite/stmt/mapped/BaseMappedQuery.java +++ b/src/main/java/com/j256/ormlite/core/stmt/mapped/BaseMappedQuery.java @@ -1,15 +1,15 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; -import com.j256.ormlite.dao.BaseForeignCollection; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.GenericRowMapper; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.BaseForeignCollection; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.GenericRowMapper; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.TableInfo; /** * Abstract mapped statement for queries which handle the creating of a new object and the row mapping functionality. diff --git a/src/main/java/com/j256/ormlite/stmt/mapped/BaseMappedStatement.java b/src/main/java/com/j256/ormlite/core/stmt/mapped/BaseMappedStatement.java similarity index 90% rename from src/main/java/com/j256/ormlite/stmt/mapped/BaseMappedStatement.java rename to src/main/java/com/j256/ormlite/core/stmt/mapped/BaseMappedStatement.java index 1f9323dc2..cfdfa7ccd 100644 --- a/src/main/java/com/j256/ormlite/stmt/mapped/BaseMappedStatement.java +++ b/src/main/java/com/j256/ormlite/core/stmt/mapped/BaseMappedStatement.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.logger.Logger; -import com.j256.ormlite.logger.LoggerFactory; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.logger.Logger; +import com.j256.ormlite.core.logger.LoggerFactory; +import com.j256.ormlite.core.table.TableInfo; /** * Abstract mapped statement which has common statements used by the subclasses. diff --git a/src/main/java/com/j256/ormlite/stmt/mapped/MappedCreate.java b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedCreate.java similarity index 95% rename from src/main/java/com/j256/ormlite/stmt/mapped/MappedCreate.java rename to src/main/java/com/j256/ormlite/core/stmt/mapped/MappedCreate.java index b314c9323..31f508684 100644 --- a/src/main/java/com/j256/ormlite/stmt/mapped/MappedCreate.java +++ b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedCreate.java @@ -1,15 +1,15 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import java.sql.SQLException; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.logger.Log.Level; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.GeneratedKeyHolder; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.logger.Log.Level; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.GeneratedKeyHolder; +import com.j256.ormlite.core.table.TableInfo; /** * A mapped statement for creating a new instance of an object. diff --git a/src/main/java/com/j256/ormlite/stmt/mapped/MappedDelete.java b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedDelete.java similarity index 88% rename from src/main/java/com/j256/ormlite/stmt/mapped/MappedDelete.java rename to src/main/java/com/j256/ormlite/core/stmt/mapped/MappedDelete.java index 4c9a20145..6c56eb2ca 100644 --- a/src/main/java/com/j256/ormlite/stmt/mapped/MappedDelete.java +++ b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedDelete.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import java.sql.SQLException; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.table.TableInfo; /** * A mapped statement for deleting an object. diff --git a/src/main/java/com/j256/ormlite/stmt/mapped/MappedDeleteCollection.java b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedDeleteCollection.java similarity index 92% rename from src/main/java/com/j256/ormlite/stmt/mapped/MappedDeleteCollection.java rename to src/main/java/com/j256/ormlite/core/stmt/mapped/MappedDeleteCollection.java index 0e87ac00f..94ea19260 100644 --- a/src/main/java/com/j256/ormlite/stmt/mapped/MappedDeleteCollection.java +++ b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedDeleteCollection.java @@ -1,14 +1,14 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import java.sql.SQLException; import java.util.Collection; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.table.TableInfo; /** * A mapped statement for deleting objects that correspond to a collection of IDs. diff --git a/src/main/java/com/j256/ormlite/stmt/mapped/MappedPreparedStmt.java b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedPreparedStmt.java similarity index 83% rename from src/main/java/com/j256/ormlite/stmt/mapped/MappedPreparedStmt.java rename to src/main/java/com/j256/ormlite/core/stmt/mapped/MappedPreparedStmt.java index 04bbf9768..8b028fc83 100644 --- a/src/main/java/com/j256/ormlite/stmt/mapped/MappedPreparedStmt.java +++ b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedPreparedStmt.java @@ -1,20 +1,20 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.logger.Log.Level; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.PreparedDelete; -import com.j256.ormlite.stmt.PreparedQuery; -import com.j256.ormlite.stmt.PreparedUpdate; -import com.j256.ormlite.stmt.StatementBuilder; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.logger.Log.Level; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.PreparedDelete; +import com.j256.ormlite.core.stmt.PreparedQuery; +import com.j256.ormlite.core.stmt.PreparedUpdate; +import com.j256.ormlite.core.stmt.StatementBuilder; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.table.TableInfo; /** * Mapped statement used by the {@link StatementBuilder#prepareStatement(Long, boolean)} method. diff --git a/src/main/java/com/j256/ormlite/stmt/mapped/MappedQueryForFieldEq.java b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedQueryForFieldEq.java similarity index 90% rename from src/main/java/com/j256/ormlite/stmt/mapped/MappedQueryForFieldEq.java rename to src/main/java/com/j256/ormlite/core/stmt/mapped/MappedQueryForFieldEq.java index 046968ddf..77222dee5 100644 --- a/src/main/java/com/j256/ormlite/stmt/mapped/MappedQueryForFieldEq.java +++ b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedQueryForFieldEq.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import java.sql.SQLException; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.table.TableInfo; /** * Mapped statement for querying for an object by a single field. diff --git a/src/main/java/com/j256/ormlite/stmt/mapped/MappedRefresh.java b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedRefresh.java similarity index 86% rename from src/main/java/com/j256/ormlite/stmt/mapped/MappedRefresh.java rename to src/main/java/com/j256/ormlite/core/stmt/mapped/MappedRefresh.java index dd3156797..7e4569d23 100644 --- a/src/main/java/com/j256/ormlite/stmt/mapped/MappedRefresh.java +++ b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedRefresh.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import java.sql.SQLException; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.table.TableInfo; /** * Mapped statement for refreshing the fields in an object. diff --git a/src/main/java/com/j256/ormlite/stmt/mapped/MappedUpdate.java b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedUpdate.java similarity index 93% rename from src/main/java/com/j256/ormlite/stmt/mapped/MappedUpdate.java rename to src/main/java/com/j256/ormlite/core/stmt/mapped/MappedUpdate.java index eaec46037..87d511121 100644 --- a/src/main/java/com/j256/ormlite/stmt/mapped/MappedUpdate.java +++ b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedUpdate.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import java.sql.SQLException; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.table.TableInfo; /** * Mapped statement for updating an object. diff --git a/src/main/java/com/j256/ormlite/stmt/mapped/MappedUpdateId.java b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedUpdateId.java similarity index 88% rename from src/main/java/com/j256/ormlite/stmt/mapped/MappedUpdateId.java rename to src/main/java/com/j256/ormlite/core/stmt/mapped/MappedUpdateId.java index 9bbc05e17..8ee7cb476 100644 --- a/src/main/java/com/j256/ormlite/stmt/mapped/MappedUpdateId.java +++ b/src/main/java/com/j256/ormlite/core/stmt/mapped/MappedUpdateId.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import java.sql.SQLException; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.table.TableInfo; /** * Mapped statement for updating an object's ID field. diff --git a/src/main/java/com/j256/ormlite/stmt/query/BaseComparison.java b/src/main/java/com/j256/ormlite/core/stmt/query/BaseComparison.java similarity index 94% rename from src/main/java/com/j256/ormlite/stmt/query/BaseComparison.java rename to src/main/java/com/j256/ormlite/core/stmt/query/BaseComparison.java index 3dc9be7a8..6eed6390a 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/BaseComparison.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/BaseComparison.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.ColumnArg; -import com.j256.ormlite.stmt.SelectArg; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.ColumnArg; +import com.j256.ormlite.core.stmt.SelectArg; /** * Internal base class for all comparison operations. diff --git a/src/main/java/com/j256/ormlite/stmt/query/Between.java b/src/main/java/com/j256/ormlite/core/stmt/query/Between.java similarity index 82% rename from src/main/java/com/j256/ormlite/stmt/query/Between.java rename to src/main/java/com/j256/ormlite/core/stmt/query/Between.java index c042e1852..defcae5e9 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/Between.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/Between.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.Where; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.Where; /** * Internal class handling the SQL 'between' query part. Used by {@link Where#between}. diff --git a/src/main/java/com/j256/ormlite/stmt/query/Clause.java b/src/main/java/com/j256/ormlite/core/stmt/query/Clause.java similarity index 78% rename from src/main/java/com/j256/ormlite/stmt/query/Clause.java rename to src/main/java/com/j256/ormlite/core/stmt/query/Clause.java index 5760cb857..912d98dc2 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/Clause.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/Clause.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.stmt.ArgumentHolder; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.stmt.ArgumentHolder; /** * Internal marker class for query clauses. diff --git a/src/main/java/com/j256/ormlite/stmt/query/ColumnNameOrRawSql.java b/src/main/java/com/j256/ormlite/core/stmt/query/ColumnNameOrRawSql.java similarity index 95% rename from src/main/java/com/j256/ormlite/stmt/query/ColumnNameOrRawSql.java rename to src/main/java/com/j256/ormlite/core/stmt/query/ColumnNameOrRawSql.java index a3b766040..042fa52d0 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/ColumnNameOrRawSql.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/ColumnNameOrRawSql.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; /** * Internal class handling the SQL 'GROUP BY' operation and other lists of column-names or raw SQL. diff --git a/src/main/java/com/j256/ormlite/stmt/query/Comparison.java b/src/main/java/com/j256/ormlite/core/stmt/query/Comparison.java similarity index 81% rename from src/main/java/com/j256/ormlite/stmt/query/Comparison.java rename to src/main/java/com/j256/ormlite/core/stmt/query/Comparison.java index 6f12bcea8..b94d71f13 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/Comparison.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/Comparison.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.stmt.ArgumentHolder; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.stmt.ArgumentHolder; /** * Internal interfaces which define a comparison operation. diff --git a/src/main/java/com/j256/ormlite/stmt/query/Exists.java b/src/main/java/com/j256/ormlite/core/stmt/query/Exists.java similarity index 71% rename from src/main/java/com/j256/ormlite/stmt/query/Exists.java rename to src/main/java/com/j256/ormlite/core/stmt/query/Exists.java index 4770a0442..b018fe3eb 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/Exists.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/Exists.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.QueryBuilder.InternalQueryBuilderWrapper; -import com.j256.ormlite.stmt.Where; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.QueryBuilder.InternalQueryBuilderWrapper; +import com.j256.ormlite.core.stmt.Where; /** * Internal class handling the SQL 'EXISTS' query part. Used by {@link Where#exists}. diff --git a/src/main/java/com/j256/ormlite/stmt/query/In.java b/src/main/java/com/j256/ormlite/core/stmt/query/In.java similarity index 86% rename from src/main/java/com/j256/ormlite/stmt/query/In.java rename to src/main/java/com/j256/ormlite/core/stmt/query/In.java index 2cdccfa71..b268f5c08 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/In.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/In.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; import java.util.Arrays; import java.util.List; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.Where; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.Where; /** * Internal class handling the SQL 'in' query part. Used by {@link Where#in}. diff --git a/src/main/java/com/j256/ormlite/stmt/query/InSubQuery.java b/src/main/java/com/j256/ormlite/core/stmt/query/InSubQuery.java similarity index 83% rename from src/main/java/com/j256/ormlite/stmt/query/InSubQuery.java rename to src/main/java/com/j256/ormlite/core/stmt/query/InSubQuery.java index f2291d017..b21dfa0d9 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/InSubQuery.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/InSubQuery.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.QueryBuilder.InternalQueryBuilderWrapper; -import com.j256.ormlite.stmt.Where; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.QueryBuilder.InternalQueryBuilderWrapper; +import com.j256.ormlite.core.stmt.Where; /** * Internal class handling the SQL 'in' query part. Used by {@link Where#in}. diff --git a/src/main/java/com/j256/ormlite/stmt/query/IsNotNull.java b/src/main/java/com/j256/ormlite/core/stmt/query/IsNotNull.java similarity index 72% rename from src/main/java/com/j256/ormlite/stmt/query/IsNotNull.java rename to src/main/java/com/j256/ormlite/core/stmt/query/IsNotNull.java index 3cc6fbac7..447f6d314 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/IsNotNull.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/IsNotNull.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.Where; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.Where; /** * Internal class handling the SQL 'IS NOT NULL' comparison query part. Used by {@link Where#isNull}. diff --git a/src/main/java/com/j256/ormlite/stmt/query/IsNull.java b/src/main/java/com/j256/ormlite/core/stmt/query/IsNull.java similarity index 72% rename from src/main/java/com/j256/ormlite/stmt/query/IsNull.java rename to src/main/java/com/j256/ormlite/core/stmt/query/IsNull.java index e97633b08..0ac968c4b 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/IsNull.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/IsNull.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.Where; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.Where; /** * Internal class handling the SQL 'IS NULL' comparison query part. Used by {@link Where#isNull}. diff --git a/src/main/java/com/j256/ormlite/stmt/query/ManyClause.java b/src/main/java/com/j256/ormlite/core/stmt/query/ManyClause.java similarity index 93% rename from src/main/java/com/j256/ormlite/stmt/query/ManyClause.java rename to src/main/java/com/j256/ormlite/core/stmt/query/ManyClause.java index 38b308a63..918c76997 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/ManyClause.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/ManyClause.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.stmt.ArgumentHolder; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.stmt.ArgumentHolder; /** * For operations with a number of them in a row. diff --git a/src/main/java/com/j256/ormlite/stmt/query/NeedsFutureClause.java b/src/main/java/com/j256/ormlite/core/stmt/query/NeedsFutureClause.java similarity index 92% rename from src/main/java/com/j256/ormlite/stmt/query/NeedsFutureClause.java rename to src/main/java/com/j256/ormlite/core/stmt/query/NeedsFutureClause.java index d788aba7a..e6ba0b166 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/NeedsFutureClause.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/NeedsFutureClause.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; /** *

diff --git a/src/main/java/com/j256/ormlite/stmt/query/Not.java b/src/main/java/com/j256/ormlite/core/stmt/query/Not.java similarity index 91% rename from src/main/java/com/j256/ormlite/stmt/query/Not.java rename to src/main/java/com/j256/ormlite/core/stmt/query/Not.java index e3d446d52..effd86b1b 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/Not.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/Not.java @@ -1,11 +1,11 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.Where; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.Where; /** * Internal class handling the SQL 'NOT' boolean comparison operation. Used by {@link Where#not}. diff --git a/src/main/java/com/j256/ormlite/stmt/query/OrderBy.java b/src/main/java/com/j256/ormlite/core/stmt/query/OrderBy.java similarity index 87% rename from src/main/java/com/j256/ormlite/stmt/query/OrderBy.java rename to src/main/java/com/j256/ormlite/core/stmt/query/OrderBy.java index d911d6b2d..8cb4340ae 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/OrderBy.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/OrderBy.java @@ -1,7 +1,7 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.QueryBuilder; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.QueryBuilder; /** * Internal class handling the SQL 'ORDER BY' operation. Used by {@link QueryBuilder#orderBy(String, boolean)} and diff --git a/src/main/java/com/j256/ormlite/stmt/query/Raw.java b/src/main/java/com/j256/ormlite/core/stmt/query/Raw.java similarity index 82% rename from src/main/java/com/j256/ormlite/stmt/query/Raw.java rename to src/main/java/com/j256/ormlite/core/stmt/query/Raw.java index cca0e6435..7ba7f3554 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/Raw.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/Raw.java @@ -1,9 +1,9 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.util.List; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.stmt.ArgumentHolder; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.stmt.ArgumentHolder; /** * Raw part of the where to just stick in a string in the middle of the WHERE. It is up to the user to do so properly. diff --git a/src/main/java/com/j256/ormlite/stmt/query/SetExpression.java b/src/main/java/com/j256/ormlite/core/stmt/query/SetExpression.java similarity index 78% rename from src/main/java/com/j256/ormlite/stmt/query/SetExpression.java rename to src/main/java/com/j256/ormlite/core/stmt/query/SetExpression.java index 534a612d6..89db1275d 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/SetExpression.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/SetExpression.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.StatementBuilder; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.StatementBuilder; /** * Internal class handling the SQL SET part used by UPDATE statements. Used by diff --git a/src/main/java/com/j256/ormlite/stmt/query/SetValue.java b/src/main/java/com/j256/ormlite/core/stmt/query/SetValue.java similarity index 78% rename from src/main/java/com/j256/ormlite/stmt/query/SetValue.java rename to src/main/java/com/j256/ormlite/core/stmt/query/SetValue.java index a158b57a9..f91527124 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/SetValue.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/SetValue.java @@ -1,11 +1,11 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.NullArgHolder; -import com.j256.ormlite.stmt.StatementBuilder; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.NullArgHolder; +import com.j256.ormlite.core.stmt.StatementBuilder; /** * Internal class handling the SQL SET part used by UPDATE statements. Used by diff --git a/src/main/java/com/j256/ormlite/stmt/query/SimpleComparison.java b/src/main/java/com/j256/ormlite/core/stmt/query/SimpleComparison.java similarity index 91% rename from src/main/java/com/j256/ormlite/stmt/query/SimpleComparison.java rename to src/main/java/com/j256/ormlite/core/stmt/query/SimpleComparison.java index 2be3fc7dc..5251caa2b 100644 --- a/src/main/java/com/j256/ormlite/stmt/query/SimpleComparison.java +++ b/src/main/java/com/j256/ormlite/core/stmt/query/SimpleComparison.java @@ -1,8 +1,8 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; -import com.j256.ormlite.field.FieldType; +import com.j256.ormlite.core.field.FieldType; /** * Internal class handling a simple comparison query part where the operation is passed in. diff --git a/src/main/java/com/j256/ormlite/support/BaseConnectionSource.java b/src/main/java/com/j256/ormlite/core/support/BaseConnectionSource.java similarity index 97% rename from src/main/java/com/j256/ormlite/support/BaseConnectionSource.java rename to src/main/java/com/j256/ormlite/core/support/BaseConnectionSource.java index 89e63e4a2..6a320d2c8 100644 --- a/src/main/java/com/j256/ormlite/support/BaseConnectionSource.java +++ b/src/main/java/com/j256/ormlite/core/support/BaseConnectionSource.java @@ -1,8 +1,8 @@ -package com.j256.ormlite.support; +package com.j256.ormlite.core.support; import java.sql.SQLException; -import com.j256.ormlite.logger.Logger; +import com.j256.ormlite.core.logger.Logger; /** * Connection source base class which provides the save/clear mechanism using a thread local. diff --git a/src/main/java/com/j256/ormlite/support/CompiledStatement.java b/src/main/java/com/j256/ormlite/core/support/CompiledStatement.java similarity index 94% rename from src/main/java/com/j256/ormlite/support/CompiledStatement.java rename to src/main/java/com/j256/ormlite/core/support/CompiledStatement.java index 0b6f8c0d2..5870789a0 100644 --- a/src/main/java/com/j256/ormlite/support/CompiledStatement.java +++ b/src/main/java/com/j256/ormlite/core/support/CompiledStatement.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.support; +package com.j256.ormlite.core.support; import java.io.Closeable; import java.sql.SQLException; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.field.SqlType; /** * An internal reduction of the SQL PreparedStatement so we can implement its functionality outside of JDBC. diff --git a/src/main/java/com/j256/ormlite/support/ConnectionSource.java b/src/main/java/com/j256/ormlite/core/support/ConnectionSource.java similarity index 97% rename from src/main/java/com/j256/ormlite/support/ConnectionSource.java rename to src/main/java/com/j256/ormlite/core/support/ConnectionSource.java index 1a991b353..a8f3b48c9 100644 --- a/src/main/java/com/j256/ormlite/support/ConnectionSource.java +++ b/src/main/java/com/j256/ormlite/core/support/ConnectionSource.java @@ -1,9 +1,9 @@ -package com.j256.ormlite.support; +package com.j256.ormlite.core.support; import java.io.Closeable; import java.sql.SQLException; -import com.j256.ormlite.db.DatabaseType; +import com.j256.ormlite.core.db.DatabaseType; /** * A reduction of the SQL DataSource so we can implement its functionality outside of JDBC. diff --git a/src/main/java/com/j256/ormlite/support/DatabaseConnection.java b/src/main/java/com/j256/ormlite/core/support/DatabaseConnection.java similarity index 96% rename from src/main/java/com/j256/ormlite/support/DatabaseConnection.java rename to src/main/java/com/j256/ormlite/core/support/DatabaseConnection.java index 52468c3b9..2e3331948 100644 --- a/src/main/java/com/j256/ormlite/support/DatabaseConnection.java +++ b/src/main/java/com/j256/ormlite/core/support/DatabaseConnection.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.support; +package com.j256.ormlite.core.support; import java.io.Closeable; import java.sql.SQLException; import java.sql.Savepoint; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.GenericRowMapper; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.GenericRowMapper; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; /** * A reduction of the SQL Connection so we can implement its functionality outside of JDBC. diff --git a/src/main/java/com/j256/ormlite/support/DatabaseConnectionProxy.java b/src/main/java/com/j256/ormlite/core/support/DatabaseConnectionProxy.java similarity index 94% rename from src/main/java/com/j256/ormlite/support/DatabaseConnectionProxy.java rename to src/main/java/com/j256/ormlite/core/support/DatabaseConnectionProxy.java index 4f6912dc2..2f9b36716 100644 --- a/src/main/java/com/j256/ormlite/support/DatabaseConnectionProxy.java +++ b/src/main/java/com/j256/ormlite/core/support/DatabaseConnectionProxy.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.support; +package com.j256.ormlite.core.support; import java.io.IOException; import java.sql.SQLException; import java.sql.Savepoint; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.GenericRowMapper; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.GenericRowMapper; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; /** * Database connection proxy so you can intercept database operations either for debugging, replication, logging, or diff --git a/src/main/java/com/j256/ormlite/support/DatabaseConnectionProxyFactory.java b/src/main/java/com/j256/ormlite/core/support/DatabaseConnectionProxyFactory.java similarity index 98% rename from src/main/java/com/j256/ormlite/support/DatabaseConnectionProxyFactory.java rename to src/main/java/com/j256/ormlite/core/support/DatabaseConnectionProxyFactory.java index 01f11a620..5f526528c 100644 --- a/src/main/java/com/j256/ormlite/support/DatabaseConnectionProxyFactory.java +++ b/src/main/java/com/j256/ormlite/core/support/DatabaseConnectionProxyFactory.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.support; +package com.j256.ormlite.core.support; import java.sql.SQLException; diff --git a/src/main/java/com/j256/ormlite/support/DatabaseResults.java b/src/main/java/com/j256/ormlite/core/support/DatabaseResults.java similarity index 98% rename from src/main/java/com/j256/ormlite/support/DatabaseResults.java rename to src/main/java/com/j256/ormlite/core/support/DatabaseResults.java index 4f13cbe05..343cf1ea1 100644 --- a/src/main/java/com/j256/ormlite/support/DatabaseResults.java +++ b/src/main/java/com/j256/ormlite/core/support/DatabaseResults.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.support; +package com.j256.ormlite.core.support; import java.io.Closeable; import java.io.InputStream; @@ -6,7 +6,7 @@ import java.sql.SQLException; import java.sql.Timestamp; -import com.j256.ormlite.dao.ObjectCache; +import com.j256.ormlite.core.dao.ObjectCache; /** * A reduction of the SQL ResultSet so we can implement it outside of JDBC. diff --git a/src/main/java/com/j256/ormlite/support/GeneratedKeyHolder.java b/src/main/java/com/j256/ormlite/core/support/GeneratedKeyHolder.java similarity index 89% rename from src/main/java/com/j256/ormlite/support/GeneratedKeyHolder.java rename to src/main/java/com/j256/ormlite/core/support/GeneratedKeyHolder.java index a0a8e9c05..1bb382840 100644 --- a/src/main/java/com/j256/ormlite/support/GeneratedKeyHolder.java +++ b/src/main/java/com/j256/ormlite/core/support/GeneratedKeyHolder.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.support; +package com.j256.ormlite.core.support; import java.sql.SQLException; diff --git a/src/main/java/com/j256/ormlite/support/ReflectionDatabaseConnectionProxyFactory.java b/src/main/java/com/j256/ormlite/core/support/ReflectionDatabaseConnectionProxyFactory.java similarity index 94% rename from src/main/java/com/j256/ormlite/support/ReflectionDatabaseConnectionProxyFactory.java rename to src/main/java/com/j256/ormlite/core/support/ReflectionDatabaseConnectionProxyFactory.java index dee355e67..a2ea5ecde 100644 --- a/src/main/java/com/j256/ormlite/support/ReflectionDatabaseConnectionProxyFactory.java +++ b/src/main/java/com/j256/ormlite/core/support/ReflectionDatabaseConnectionProxyFactory.java @@ -1,9 +1,9 @@ -package com.j256.ormlite.support; +package com.j256.ormlite.core.support; import java.lang.reflect.Constructor; import java.sql.SQLException; -import com.j256.ormlite.misc.SqlExceptionUtil; +import com.j256.ormlite.core.misc.SqlExceptionUtil; /** * Database connection proxy factory that uses reflection to create the proxied connection. The class in question should diff --git a/src/main/java/com/j256/ormlite/table/DatabaseTable.java b/src/main/java/com/j256/ormlite/core/table/DatabaseTable.java similarity index 93% rename from src/main/java/com/j256/ormlite/table/DatabaseTable.java rename to src/main/java/com/j256/ormlite/core/table/DatabaseTable.java index b6e83dbd0..eb3886dd5 100644 --- a/src/main/java/com/j256/ormlite/table/DatabaseTable.java +++ b/src/main/java/com/j256/ormlite/core/table/DatabaseTable.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.table; +package com.j256.ormlite.core.table; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -6,7 +6,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import com.j256.ormlite.dao.DaoManager; +import com.j256.ormlite.core.dao.DaoManager; /** * Annotation that marks a class to be stored in the database. It is only required if you want to mark the class or diff --git a/src/main/java/com/j256/ormlite/table/DatabaseTableConfig.java b/src/main/java/com/j256/ormlite/core/table/DatabaseTableConfig.java similarity index 95% rename from src/main/java/com/j256/ormlite/table/DatabaseTableConfig.java rename to src/main/java/com/j256/ormlite/core/table/DatabaseTableConfig.java index 55d49f263..3eb8d5c6d 100644 --- a/src/main/java/com/j256/ormlite/table/DatabaseTableConfig.java +++ b/src/main/java/com/j256/ormlite/core/table/DatabaseTableConfig.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.table; +package com.j256.ormlite.core.table; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -7,12 +7,12 @@ import java.util.List; import java.util.Locale; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.DatabaseFieldConfig; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.misc.JavaxPersistenceConfigurer; -import com.j256.ormlite.support.ConnectionSource; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.DatabaseFieldConfig; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.misc.JavaxPersistenceConfigurer; +import com.j256.ormlite.core.support.ConnectionSource; /** * Database table configuration information either supplied by Spring or direct Java wiring or from a @@ -37,7 +37,7 @@ public class DatabaseTableConfig { // see if we have this class at runtime Class.forName("javax.persistence.Entity"); // if we do then get our JavaxPersistance class - Class clazz = Class.forName("com.j256.ormlite.misc.JavaxPersistenceImpl"); + Class clazz = Class.forName("com.j256.ormlite.core.misc.JavaxPersistenceImpl"); javaxPersistenceConfigurer = (JavaxPersistenceConfigurer) clazz.getConstructor().newInstance(); } catch (Exception e) { // no configurer diff --git a/src/main/java/com/j256/ormlite/table/DatabaseTableConfigLoader.java b/src/main/java/com/j256/ormlite/core/table/DatabaseTableConfigLoader.java similarity index 96% rename from src/main/java/com/j256/ormlite/table/DatabaseTableConfigLoader.java rename to src/main/java/com/j256/ormlite/core/table/DatabaseTableConfigLoader.java index 9b381814d..17b8b1ee6 100644 --- a/src/main/java/com/j256/ormlite/table/DatabaseTableConfigLoader.java +++ b/src/main/java/com/j256/ormlite/core/table/DatabaseTableConfigLoader.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.table; +package com.j256.ormlite.core.table; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -7,9 +7,9 @@ import java.util.ArrayList; import java.util.List; -import com.j256.ormlite.field.DatabaseFieldConfig; -import com.j256.ormlite.field.DatabaseFieldConfigLoader; -import com.j256.ormlite.misc.SqlExceptionUtil; +import com.j256.ormlite.core.field.DatabaseFieldConfig; +import com.j256.ormlite.core.field.DatabaseFieldConfigLoader; +import com.j256.ormlite.core.misc.SqlExceptionUtil; /** * Database table configuration loader which reads and writes {@link DatabaseTableConfig} from a text file/stream. diff --git a/src/main/java/com/j256/ormlite/table/ObjectFactory.java b/src/main/java/com/j256/ormlite/core/table/ObjectFactory.java similarity index 88% rename from src/main/java/com/j256/ormlite/table/ObjectFactory.java rename to src/main/java/com/j256/ormlite/core/table/ObjectFactory.java index 7f5e31d89..9e7803ae8 100644 --- a/src/main/java/com/j256/ormlite/table/ObjectFactory.java +++ b/src/main/java/com/j256/ormlite/core/table/ObjectFactory.java @@ -1,9 +1,9 @@ -package com.j256.ormlite.table; +package com.j256.ormlite.core.table; import java.lang.reflect.Constructor; import java.sql.SQLException; -import com.j256.ormlite.dao.Dao; +import com.j256.ormlite.core.dao.Dao; /** * Interface that allows you to inject a factory class that creates objects of this class. You set it on the DAO using: diff --git a/src/main/java/com/j256/ormlite/table/TableInfo.java b/src/main/java/com/j256/ormlite/core/table/TableInfo.java similarity index 94% rename from src/main/java/com/j256/ormlite/table/TableInfo.java rename to src/main/java/com/j256/ormlite/core/table/TableInfo.java index 2c2768a20..f27ecac29 100644 --- a/src/main/java/com/j256/ormlite/table/TableInfo.java +++ b/src/main/java/com/j256/ormlite/core/table/TableInfo.java @@ -1,18 +1,18 @@ -package com.j256.ormlite.table; +package com.j256.ormlite.core.table; import java.lang.reflect.Constructor; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; -import com.j256.ormlite.dao.BaseDaoImpl; -import com.j256.ormlite.dao.ForeignCollection; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.misc.BaseDaoEnabled; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.support.ConnectionSource; +import com.j256.ormlite.core.dao.BaseDaoImpl; +import com.j256.ormlite.core.dao.ForeignCollection; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.misc.BaseDaoEnabled; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.support.ConnectionSource; /** * Information about a database table including the associated tableName, class, constructor, and the included fields. diff --git a/src/main/java/com/j256/ormlite/table/TableUtils.java b/src/main/java/com/j256/ormlite/core/table/TableUtils.java similarity index 96% rename from src/main/java/com/j256/ormlite/table/TableUtils.java rename to src/main/java/com/j256/ormlite/core/table/TableUtils.java index 560bfad39..07942618d 100644 --- a/src/main/java/com/j256/ormlite/table/TableUtils.java +++ b/src/main/java/com/j256/ormlite/core/table/TableUtils.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.table; +package com.j256.ormlite.core.table; import java.sql.SQLException; import java.util.ArrayList; @@ -9,21 +9,21 @@ import java.util.Map; import java.util.Set; -import com.j256.ormlite.dao.BaseDaoImpl; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.DaoManager; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.logger.Logger; -import com.j256.ormlite.logger.LoggerFactory; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.misc.SqlExceptionUtil; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.dao.BaseDaoImpl; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.DaoManager; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.logger.Logger; +import com.j256.ormlite.core.logger.LoggerFactory; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.misc.SqlExceptionUtil; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; /** * Couple utility methods for the creating, dropping, and maintenance of tables. diff --git a/src/test/java/com/j256/ormlite/BaseCoreTest.java b/src/test/java/com/j256/ormlite/core/BaseCoreTest.java similarity index 89% rename from src/test/java/com/j256/ormlite/BaseCoreTest.java rename to src/test/java/com/j256/ormlite/core/BaseCoreTest.java index 78bacf4d7..3a209b36e 100644 --- a/src/test/java/com/j256/ormlite/BaseCoreTest.java +++ b/src/test/java/com/j256/ormlite/core/BaseCoreTest.java @@ -1,20 +1,20 @@ -package com.j256.ormlite; +package com.j256.ormlite.core; import java.sql.SQLException; import org.junit.After; import org.junit.Before; -import com.j256.ormlite.dao.BaseDaoImpl; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.DaoManager; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.h2.H2ConnectionSource; -import com.j256.ormlite.h2.H2DatabaseType; -import com.j256.ormlite.table.DatabaseTable; -import com.j256.ormlite.table.DatabaseTableConfig; -import com.j256.ormlite.table.TableUtils; +import com.j256.ormlite.core.dao.BaseDaoImpl; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.DaoManager; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.h2.H2ConnectionSource; +import com.j256.ormlite.core.h2.H2DatabaseType; +import com.j256.ormlite.core.table.DatabaseTable; +import com.j256.ormlite.core.table.DatabaseTableConfig; +import com.j256.ormlite.core.table.TableUtils; public abstract class BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/TestUtils.java b/src/test/java/com/j256/ormlite/core/TestUtils.java similarity index 92% rename from src/test/java/com/j256/ormlite/TestUtils.java rename to src/test/java/com/j256/ormlite/core/TestUtils.java index 9f24ff1f8..9f295c326 100644 --- a/src/test/java/com/j256/ormlite/TestUtils.java +++ b/src/test/java/com/j256/ormlite/core/TestUtils.java @@ -1,10 +1,10 @@ -package com.j256.ormlite; +package com.j256.ormlite.core; import java.io.File; import org.junit.Ignore; -import com.j256.ormlite.db.DatabaseType; +import com.j256.ormlite.core.db.DatabaseType; /** * Set of test utilities for all of the unit tests. diff --git a/src/test/java/com/j256/ormlite/WrappedConnection.java b/src/test/java/com/j256/ormlite/core/WrappedConnection.java similarity index 71% rename from src/test/java/com/j256/ormlite/WrappedConnection.java rename to src/test/java/com/j256/ormlite/core/WrappedConnection.java index fc3a353ba..eded156a7 100644 --- a/src/test/java/com/j256/ormlite/WrappedConnection.java +++ b/src/test/java/com/j256/ormlite/core/WrappedConnection.java @@ -1,8 +1,8 @@ -package com.j256.ormlite; +package com.j256.ormlite.core; import java.lang.reflect.InvocationHandler; -import com.j256.ormlite.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseConnection; public interface WrappedConnection extends InvocationHandler { diff --git a/src/test/java/com/j256/ormlite/WrappedConnectionSource.java b/src/test/java/com/j256/ormlite/core/WrappedConnectionSource.java similarity index 95% rename from src/test/java/com/j256/ormlite/WrappedConnectionSource.java rename to src/test/java/com/j256/ormlite/core/WrappedConnectionSource.java index 4329f4e39..78613d691 100644 --- a/src/test/java/com/j256/ormlite/WrappedConnectionSource.java +++ b/src/test/java/com/j256/ormlite/core/WrappedConnectionSource.java @@ -1,4 +1,4 @@ -package com.j256.ormlite; +package com.j256.ormlite.core; import java.io.IOException; import java.lang.reflect.Method; @@ -7,10 +7,10 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; /** * Wrapped connection source for testing purposes. diff --git a/src/test/java/com/j256/ormlite/WrappedDatabaseConnection.java b/src/test/java/com/j256/ormlite/core/WrappedDatabaseConnection.java similarity index 95% rename from src/test/java/com/j256/ormlite/WrappedDatabaseConnection.java rename to src/test/java/com/j256/ormlite/core/WrappedDatabaseConnection.java index c94cca00f..5642a8179 100644 --- a/src/test/java/com/j256/ormlite/WrappedDatabaseConnection.java +++ b/src/test/java/com/j256/ormlite/core/WrappedDatabaseConnection.java @@ -1,4 +1,4 @@ -package com.j256.ormlite; +package com.j256.ormlite.core; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -7,8 +7,8 @@ import java.util.ArrayList; import java.util.List; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.DatabaseConnection; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.DatabaseConnection; public class WrappedDatabaseConnection implements WrappedConnection, InvocationHandler { diff --git a/src/test/java/com/j256/ormlite/dao/BaseDaoImplTest.java b/src/test/java/com/j256/ormlite/core/dao/BaseDaoImplTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/dao/BaseDaoImplTest.java rename to src/test/java/com/j256/ormlite/core/dao/BaseDaoImplTest.java index 86ae3d6a0..1f4dc5156 100644 --- a/src/test/java/com/j256/ormlite/dao/BaseDaoImplTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/BaseDaoImplTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.easymock.EasyMock.createMock; import static org.junit.Assert.assertEquals; @@ -26,25 +26,25 @@ import org.h2.api.Trigger; import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao.CreateOrUpdateStatus; -import com.j256.ormlite.dao.Dao.DaoObserver; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.ForeignCollectionField; -import com.j256.ormlite.stmt.DeleteBuilder; -import com.j256.ormlite.stmt.PreparedQuery; -import com.j256.ormlite.stmt.QueryBuilder; -import com.j256.ormlite.stmt.UpdateBuilder; -import com.j256.ormlite.stmt.Where; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.DatabaseTable; -import com.j256.ormlite.table.DatabaseTableConfig; -import com.j256.ormlite.table.ObjectFactory; -import com.j256.ormlite.table.TableUtils; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao.CreateOrUpdateStatus; +import com.j256.ormlite.core.dao.Dao.DaoObserver; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.ForeignCollectionField; +import com.j256.ormlite.core.stmt.DeleteBuilder; +import com.j256.ormlite.core.stmt.PreparedQuery; +import com.j256.ormlite.core.stmt.QueryBuilder; +import com.j256.ormlite.core.stmt.UpdateBuilder; +import com.j256.ormlite.core.stmt.Where; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.DatabaseTable; +import com.j256.ormlite.core.table.DatabaseTableConfig; +import com.j256.ormlite.core.table.ObjectFactory; +import com.j256.ormlite.core.table.TableUtils; public class BaseDaoImplTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/dao/BaseObjectCacheTest.java b/src/test/java/com/j256/ormlite/core/dao/BaseObjectCacheTest.java similarity index 97% rename from src/test/java/com/j256/ormlite/dao/BaseObjectCacheTest.java rename to src/test/java/com/j256/ormlite/core/dao/BaseObjectCacheTest.java index 9c40a522a..ec82e8710 100644 --- a/src/test/java/com/j256/ormlite/dao/BaseObjectCacheTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/BaseObjectCacheTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -10,9 +10,9 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.ForeignCollectionField; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.ForeignCollectionField; public abstract class BaseObjectCacheTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/dao/CloseableIterableTest.java b/src/test/java/com/j256/ormlite/core/dao/CloseableIterableTest.java similarity index 95% rename from src/test/java/com/j256/ormlite/dao/CloseableIterableTest.java rename to src/test/java/com/j256/ormlite/core/dao/CloseableIterableTest.java index 98a9103bf..6d80fae9a 100644 --- a/src/test/java/com/j256/ormlite/dao/CloseableIterableTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/CloseableIterableTest.java @@ -1,11 +1,11 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; +import com.j256.ormlite.core.BaseCoreTest; public class CloseableIterableTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/dao/CloseableIteratorTest.java b/src/test/java/com/j256/ormlite/core/dao/CloseableIteratorTest.java similarity index 95% rename from src/test/java/com/j256/ormlite/dao/CloseableIteratorTest.java rename to src/test/java/com/j256/ormlite/core/dao/CloseableIteratorTest.java index e393fbefb..771b4d524 100644 --- a/src/test/java/com/j256/ormlite/dao/CloseableIteratorTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/CloseableIteratorTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -10,12 +10,12 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.stmt.PreparedQuery; -import com.j256.ormlite.stmt.QueryBuilder; -import com.j256.ormlite.stmt.SelectArg; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.stmt.PreparedQuery; +import com.j256.ormlite.core.stmt.QueryBuilder; +import com.j256.ormlite.core.stmt.SelectArg; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; public class CloseableIteratorTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/dao/CreateOrUpdateTest.java b/src/test/java/com/j256/ormlite/core/dao/CreateOrUpdateTest.java similarity index 91% rename from src/test/java/com/j256/ormlite/dao/CreateOrUpdateTest.java rename to src/test/java/com/j256/ormlite/core/dao/CreateOrUpdateTest.java index deafe1314..983cd2570 100644 --- a/src/test/java/com/j256/ormlite/dao/CreateOrUpdateTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/CreateOrUpdateTest.java @@ -1,17 +1,17 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.field.DataPersisterManager; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.field.types.StringType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.field.DataPersisterManager; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.field.types.StringType; +import com.j256.ormlite.core.table.DatabaseTable; /** * Test which demonstrates a bug to the create-or-update DAO call with custom ids. diff --git a/src/test/java/com/j256/ormlite/dao/DaoCacheTest.java b/src/test/java/com/j256/ormlite/core/dao/DaoCacheTest.java similarity index 93% rename from src/test/java/com/j256/ormlite/dao/DaoCacheTest.java rename to src/test/java/com/j256/ormlite/core/dao/DaoCacheTest.java index d639e9780..534e43f57 100644 --- a/src/test/java/com/j256/ormlite/dao/DaoCacheTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/DaoCacheTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -9,9 +9,9 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.ForeignCollectionField; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.ForeignCollectionField; /** * User test which tests some cache issues. diff --git a/src/test/java/com/j256/ormlite/dao/DaoManagerTest.java b/src/test/java/com/j256/ormlite/core/dao/DaoManagerTest.java similarity index 97% rename from src/test/java/com/j256/ormlite/dao/DaoManagerTest.java rename to src/test/java/com/j256/ormlite/core/dao/DaoManagerTest.java index ade0ea73c..22255ecce 100644 --- a/src/test/java/com/j256/ormlite/dao/DaoManagerTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/DaoManagerTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -16,14 +16,14 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -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.support.ConnectionSource; -import com.j256.ormlite.table.DatabaseTable; -import com.j256.ormlite.table.DatabaseTableConfig; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.DatabaseFieldConfig; +import com.j256.ormlite.core.field.ForeignCollectionField; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.table.DatabaseTable; +import com.j256.ormlite.core.table.DatabaseTableConfig; public class DaoManagerTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/dao/EagerForeignCollectionTest.java b/src/test/java/com/j256/ormlite/core/dao/EagerForeignCollectionTest.java similarity index 94% rename from src/test/java/com/j256/ormlite/dao/EagerForeignCollectionTest.java rename to src/test/java/com/j256/ormlite/core/dao/EagerForeignCollectionTest.java index 77df28838..001fc5d91 100644 --- a/src/test/java/com/j256/ormlite/dao/EagerForeignCollectionTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/EagerForeignCollectionTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -8,9 +8,9 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.ForeignCollectionField; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.ForeignCollectionField; public class EagerForeignCollectionTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/dao/ForeignCollectionTest.java b/src/test/java/com/j256/ormlite/core/dao/ForeignCollectionTest.java similarity index 99% rename from src/test/java/com/j256/ormlite/dao/ForeignCollectionTest.java rename to src/test/java/com/j256/ormlite/core/dao/ForeignCollectionTest.java index 3774f962c..60ac1925d 100644 --- a/src/test/java/com/j256/ormlite/dao/ForeignCollectionTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/ForeignCollectionTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -25,11 +25,11 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.DatabaseFieldConfig; -import com.j256.ormlite.field.ForeignCollectionField; -import com.j256.ormlite.table.DatabaseTableConfig; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.DatabaseFieldConfig; +import com.j256.ormlite.core.field.ForeignCollectionField; +import com.j256.ormlite.core.table.DatabaseTableConfig; public class ForeignCollectionTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/dao/ForeignObjectTest.java b/src/test/java/com/j256/ormlite/core/dao/ForeignObjectTest.java similarity index 97% rename from src/test/java/com/j256/ormlite/dao/ForeignObjectTest.java rename to src/test/java/com/j256/ormlite/core/dao/ForeignObjectTest.java index 7be5b0388..cecb94861 100644 --- a/src/test/java/com/j256/ormlite/dao/ForeignObjectTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/ForeignObjectTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -10,9 +10,9 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.ForeignCollectionField; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.ForeignCollectionField; public class ForeignObjectTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/dao/LazyForeignCollectionTest.java b/src/test/java/com/j256/ormlite/core/dao/LazyForeignCollectionTest.java similarity index 87% rename from src/test/java/com/j256/ormlite/dao/LazyForeignCollectionTest.java rename to src/test/java/com/j256/ormlite/core/dao/LazyForeignCollectionTest.java index 85423888f..dea6bd627 100644 --- a/src/test/java/com/j256/ormlite/dao/LazyForeignCollectionTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/LazyForeignCollectionTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -7,9 +7,9 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.ForeignCollectionField; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.ForeignCollectionField; public class LazyForeignCollectionTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/dao/LruObjectCacheTest.java b/src/test/java/com/j256/ormlite/core/dao/LruObjectCacheTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/dao/LruObjectCacheTest.java rename to src/test/java/com/j256/ormlite/core/dao/LruObjectCacheTest.java index 719eff3ad..018d782f8 100644 --- a/src/test/java/com/j256/ormlite/dao/LruObjectCacheTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/LruObjectCacheTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; diff --git a/src/test/java/com/j256/ormlite/dao/RawRowMapperTest.java b/src/test/java/com/j256/ormlite/core/dao/RawRowMapperTest.java similarity index 94% rename from src/test/java/com/j256/ormlite/dao/RawRowMapperTest.java rename to src/test/java/com/j256/ormlite/core/dao/RawRowMapperTest.java index 4fb9e85e6..cb1b20c2b 100644 --- a/src/test/java/com/j256/ormlite/dao/RawRowMapperTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/RawRowMapperTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -8,9 +8,9 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.stmt.QueryBuilder; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.stmt.QueryBuilder; +import com.j256.ormlite.core.support.DatabaseResults; public class RawRowMapperTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/dao/RawRowObjectMapperTest.java b/src/test/java/com/j256/ormlite/core/dao/RawRowObjectMapperTest.java similarity index 91% rename from src/test/java/com/j256/ormlite/dao/RawRowObjectMapperTest.java rename to src/test/java/com/j256/ormlite/core/dao/RawRowObjectMapperTest.java index 3fabef940..fadcae962 100644 --- a/src/test/java/com/j256/ormlite/dao/RawRowObjectMapperTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/RawRowObjectMapperTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -7,9 +7,9 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.stmt.QueryBuilder; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.stmt.QueryBuilder; public class RawRowObjectMapperTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/dao/ReferenceObjectCacheTest.java b/src/test/java/com/j256/ormlite/core/dao/ReferenceObjectCacheTest.java similarity index 99% rename from src/test/java/com/j256/ormlite/dao/ReferenceObjectCacheTest.java rename to src/test/java/com/j256/ormlite/core/dao/ReferenceObjectCacheTest.java index f47f29155..38eee72f6 100644 --- a/src/test/java/com/j256/ormlite/dao/ReferenceObjectCacheTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/ReferenceObjectCacheTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; diff --git a/src/test/java/com/j256/ormlite/dao/RuntimeExceptionDaoTest.java b/src/test/java/com/j256/ormlite/core/dao/RuntimeExceptionDaoTest.java similarity index 97% rename from src/test/java/com/j256/ormlite/dao/RuntimeExceptionDaoTest.java rename to src/test/java/com/j256/ormlite/core/dao/RuntimeExceptionDaoTest.java index aa18e0575..4caa9406e 100644 --- a/src/test/java/com/j256/ormlite/dao/RuntimeExceptionDaoTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/RuntimeExceptionDaoTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -28,22 +28,22 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao.CreateOrUpdateStatus; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.stmt.DeleteBuilder; -import com.j256.ormlite.stmt.GenericRowMapper; -import com.j256.ormlite.stmt.PreparedDelete; -import com.j256.ormlite.stmt.PreparedQuery; -import com.j256.ormlite.stmt.PreparedUpdate; -import com.j256.ormlite.stmt.QueryBuilder; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.stmt.UpdateBuilder; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.DatabaseTableConfig; -import com.j256.ormlite.table.ObjectFactory; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao.CreateOrUpdateStatus; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.stmt.DeleteBuilder; +import com.j256.ormlite.core.stmt.GenericRowMapper; +import com.j256.ormlite.core.stmt.PreparedDelete; +import com.j256.ormlite.core.stmt.PreparedQuery; +import com.j256.ormlite.core.stmt.PreparedUpdate; +import com.j256.ormlite.core.stmt.QueryBuilder; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.stmt.UpdateBuilder; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.DatabaseTableConfig; +import com.j256.ormlite.core.table.ObjectFactory; public class RuntimeExceptionDaoTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/dao/VersionFieldTest.java b/src/test/java/com/j256/ormlite/core/dao/VersionFieldTest.java similarity index 96% rename from src/test/java/com/j256/ormlite/dao/VersionFieldTest.java rename to src/test/java/com/j256/ormlite/core/dao/VersionFieldTest.java index b00b32d51..4d47a1c22 100644 --- a/src/test/java/com/j256/ormlite/dao/VersionFieldTest.java +++ b/src/test/java/com/j256/ormlite/core/dao/VersionFieldTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.dao; +package com.j256.ormlite.core.dao; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -8,9 +8,9 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; public class VersionFieldTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/db/BaseCoreDatabaseTypeTest.java b/src/test/java/com/j256/ormlite/core/db/BaseCoreDatabaseTypeTest.java similarity index 94% rename from src/test/java/com/j256/ormlite/db/BaseCoreDatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/core/db/BaseCoreDatabaseTypeTest.java index 21408cd56..53af221b2 100644 --- a/src/test/java/com/j256/ormlite/db/BaseCoreDatabaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/db/BaseCoreDatabaseTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.db; +package com.j256.ormlite.core.db; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -17,19 +17,18 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.TestUtils; -import com.j256.ormlite.db.BaseDatabaseType.BooleanNumberFieldConverter; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldConverter; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.field.types.DateStringType; -import com.j256.ormlite.field.types.EnumStringType; -import com.j256.ormlite.field.types.StringType; -import com.j256.ormlite.field.types.UuidType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.TestUtils; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldConverter; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.field.types.DateStringType; +import com.j256.ormlite.core.field.types.EnumStringType; +import com.j256.ormlite.core.field.types.StringType; +import com.j256.ormlite.core.field.types.UuidType; +import com.j256.ormlite.core.support.DatabaseResults; public class BaseCoreDatabaseTypeTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/db/BaseDatabaseTypeTest.java b/src/test/java/com/j256/ormlite/core/db/BaseDatabaseTypeTest.java similarity index 93% rename from src/test/java/com/j256/ormlite/db/BaseDatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/core/db/BaseDatabaseTypeTest.java index 3ff84c0a0..64a7f0071 100644 --- a/src/test/java/com/j256/ormlite/db/BaseDatabaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/db/BaseDatabaseTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.db; +package com.j256.ormlite.core.db; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -11,8 +11,8 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.field.DataPersisterManager; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.field.DataPersisterManager; public class BaseDatabaseTypeTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/db/BaseSqliteDatabaseTypeTest.java b/src/test/java/com/j256/ormlite/core/db/BaseSqliteDatabaseTypeTest.java similarity index 94% rename from src/test/java/com/j256/ormlite/db/BaseSqliteDatabaseTypeTest.java rename to src/test/java/com/j256/ormlite/core/db/BaseSqliteDatabaseTypeTest.java index b195bdbb9..911665f02 100644 --- a/src/test/java/com/j256/ormlite/db/BaseSqliteDatabaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/db/BaseSqliteDatabaseTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.db; +package com.j256.ormlite.core.db; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -10,9 +10,9 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.FieldType; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.FieldType; public class BaseSqliteDatabaseTypeTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/field/CustomFieldNullTest.java b/src/test/java/com/j256/ormlite/core/field/CustomFieldNullTest.java similarity index 92% rename from src/test/java/com/j256/ormlite/field/CustomFieldNullTest.java rename to src/test/java/com/j256/ormlite/core/field/CustomFieldNullTest.java index 4d9fe4e33..2ef4de27b 100644 --- a/src/test/java/com/j256/ormlite/field/CustomFieldNullTest.java +++ b/src/test/java/com/j256/ormlite/core/field/CustomFieldNullTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import static org.junit.Assert.assertEquals; @@ -7,11 +7,11 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.types.StringType; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.types.StringType; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.DatabaseTable; /** * Interesting test that checks for handling of null results in a customer persister. Thanks to Harshit Mittal. diff --git a/src/test/java/com/j256/ormlite/field/DataPersisterManagerTest.java b/src/test/java/com/j256/ormlite/core/field/DataPersisterManagerTest.java similarity index 96% rename from src/test/java/com/j256/ormlite/field/DataPersisterManagerTest.java rename to src/test/java/com/j256/ormlite/core/field/DataPersisterManagerTest.java index 8d0967a75..2e6462dab 100644 --- a/src/test/java/com/j256/ormlite/field/DataPersisterManagerTest.java +++ b/src/test/java/com/j256/ormlite/core/field/DataPersisterManagerTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -9,10 +9,10 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.types.BaseDataType; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.types.BaseDataType; +import com.j256.ormlite.core.support.DatabaseResults; public class DataPersisterManagerTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/field/DatabaseFieldConfigLoaderTest.java b/src/test/java/com/j256/ormlite/core/field/DatabaseFieldConfigLoaderTest.java similarity index 99% rename from src/test/java/com/j256/ormlite/field/DatabaseFieldConfigLoaderTest.java rename to src/test/java/com/j256/ormlite/core/field/DatabaseFieldConfigLoaderTest.java index 7b31feeae..69f3fceae 100644 --- a/src/test/java/com/j256/ormlite/field/DatabaseFieldConfigLoaderTest.java +++ b/src/test/java/com/j256/ormlite/core/field/DatabaseFieldConfigLoaderTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -14,7 +14,7 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; +import com.j256.ormlite.core.BaseCoreTest; public class DatabaseFieldConfigLoaderTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/field/DatabaseFieldConfigReflectionTest.java b/src/test/java/com/j256/ormlite/core/field/DatabaseFieldConfigReflectionTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/field/DatabaseFieldConfigReflectionTest.java rename to src/test/java/com/j256/ormlite/core/field/DatabaseFieldConfigReflectionTest.java index 80bf51044..f73682949 100644 --- a/src/test/java/com/j256/ormlite/field/DatabaseFieldConfigReflectionTest.java +++ b/src/test/java/com/j256/ormlite/core/field/DatabaseFieldConfigReflectionTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -12,7 +12,7 @@ import org.apache.commons.lang.StringUtils; import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; +import com.j256.ormlite.core.BaseCoreTest; public class DatabaseFieldConfigReflectionTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/field/DatabaseFieldConfigTest.java b/src/test/java/com/j256/ormlite/core/field/DatabaseFieldConfigTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/field/DatabaseFieldConfigTest.java rename to src/test/java/com/j256/ormlite/core/field/DatabaseFieldConfigTest.java index fe11cbcfc..35088c549 100644 --- a/src/test/java/com/j256/ormlite/field/DatabaseFieldConfigTest.java +++ b/src/test/java/com/j256/ormlite/core/field/DatabaseFieldConfigTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -18,9 +18,9 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.db.BaseDatabaseType; -import com.j256.ormlite.db.DatabaseType; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.db.BaseDatabaseType; +import com.j256.ormlite.core.db.DatabaseType; public class DatabaseFieldConfigTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/field/DatabaseFieldTest.java b/src/test/java/com/j256/ormlite/core/field/DatabaseFieldTest.java similarity index 86% rename from src/test/java/com/j256/ormlite/field/DatabaseFieldTest.java rename to src/test/java/com/j256/ormlite/core/field/DatabaseFieldTest.java index faf35d02d..aed1ba11e 100644 --- a/src/test/java/com/j256/ormlite/field/DatabaseFieldTest.java +++ b/src/test/java/com/j256/ormlite/core/field/DatabaseFieldTest.java @@ -1,12 +1,12 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao; public class DatabaseFieldTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/field/FieldTypeTest.java b/src/test/java/com/j256/ormlite/core/field/FieldTypeTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/field/FieldTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/FieldTypeTest.java index 6b4e17b37..3dc4f37a0 100644 --- a/src/test/java/com/j256/ormlite/field/FieldTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/FieldTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field; +package com.j256.ormlite.core.field; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -24,17 +24,17 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.ForeignCollection; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.h2.H2DatabaseType; -import com.j256.ormlite.stmt.GenericRowMapper; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.DatabaseTableConfig; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.ForeignCollection; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.h2.H2DatabaseType; +import com.j256.ormlite.core.stmt.GenericRowMapper; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.DatabaseTableConfig; public class FieldTypeTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/field/types/BaseTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/BaseTypeTest.java similarity index 91% rename from src/test/java/com/j256/ormlite/field/types/BaseTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/BaseTypeTest.java index 1a7733098..a130508eb 100644 --- a/src/test/java/com/j256/ormlite/field/types/BaseTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/BaseTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -13,15 +13,15 @@ import java.util.List; import java.util.Map; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataPersister; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataPersister; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; public abstract class BaseTypeTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/field/types/BigDecimalNumericTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/BigDecimalNumericTypeTest.java similarity index 90% rename from src/test/java/com/j256/ormlite/field/types/BigDecimalNumericTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/BigDecimalNumericTypeTest.java index 2faccd834..8f67b0808 100644 --- a/src/test/java/com/j256/ormlite/field/types/BigDecimalNumericTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/BigDecimalNumericTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -9,11 +9,11 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class BigDecimalNumericTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/BigDecimalStringTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/BigDecimalStringTypeTest.java similarity index 65% rename from src/test/java/com/j256/ormlite/field/types/BigDecimalStringTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/BigDecimalStringTypeTest.java index 2cd898cc2..97251eb31 100644 --- a/src/test/java/com/j256/ormlite/field/types/BigDecimalStringTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/BigDecimalStringTypeTest.java @@ -1,8 +1,8 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import org.junit.Test; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.SqlType; public class BigDecimalStringTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/BigDecimalTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/BigDecimalTypeTest.java similarity index 93% rename from src/test/java/com/j256/ormlite/field/types/BigDecimalTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/BigDecimalTypeTest.java index d2aff9c26..179e8cd6b 100644 --- a/src/test/java/com/j256/ormlite/field/types/BigDecimalTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/BigDecimalTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -9,10 +9,10 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.table.DatabaseTable; public class BigDecimalTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/BigIntegerTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/BigIntegerTypeTest.java similarity index 93% rename from src/test/java/com/j256/ormlite/field/types/BigIntegerTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/BigIntegerTypeTest.java index 8e3cb0a79..d7a352146 100644 --- a/src/test/java/com/j256/ormlite/field/types/BigIntegerTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/BigIntegerTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -10,11 +10,11 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class BigIntegerTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/BooleanCharTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/BooleanCharTypeTest.java similarity index 81% rename from src/test/java/com/j256/ormlite/field/types/BooleanCharTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/BooleanCharTypeTest.java index 5c42360f8..d130b8581 100644 --- a/src/test/java/com/j256/ormlite/field/types/BooleanCharTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/BooleanCharTypeTest.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.table.DatabaseTable; public class BooleanCharTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/BooleanIntegerTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/BooleanIntegerTypeTest.java similarity index 81% rename from src/test/java/com/j256/ormlite/field/types/BooleanIntegerTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/BooleanIntegerTypeTest.java index 925b29f5d..658daba60 100644 --- a/src/test/java/com/j256/ormlite/field/types/BooleanIntegerTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/BooleanIntegerTypeTest.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.table.DatabaseTable; public class BooleanIntegerTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/BooleanObjectTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/BooleanObjectTypeTest.java similarity index 85% rename from src/test/java/com/j256/ormlite/field/types/BooleanObjectTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/BooleanObjectTypeTest.java index 83b977a47..e7cdc8283 100644 --- a/src/test/java/com/j256/ormlite/field/types/BooleanObjectTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/BooleanObjectTypeTest.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.table.DatabaseTable; public class BooleanObjectTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/BooleanTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/BooleanTypeTest.java similarity index 85% rename from src/test/java/com/j256/ormlite/field/types/BooleanTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/BooleanTypeTest.java index 2d58cea07..f50df54f0 100644 --- a/src/test/java/com/j256/ormlite/field/types/BooleanTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/BooleanTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -7,11 +7,11 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class BooleanTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/ByteArrayTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/ByteArrayTypeTest.java similarity index 88% rename from src/test/java/com/j256/ormlite/field/types/ByteArrayTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/ByteArrayTypeTest.java index c75370f99..d5c4bb0b0 100644 --- a/src/test/java/com/j256/ormlite/field/types/ByteArrayTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/ByteArrayTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -6,11 +6,11 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class ByteArrayTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/ByteObjectTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/ByteObjectTypeTest.java similarity index 85% rename from src/test/java/com/j256/ormlite/field/types/ByteObjectTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/ByteObjectTypeTest.java index 9e70c2c0d..3f98ccba4 100644 --- a/src/test/java/com/j256/ormlite/field/types/ByteObjectTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/ByteObjectTypeTest.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.table.DatabaseTable; public class ByteObjectTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/ByteTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/ByteTypeTest.java similarity index 85% rename from src/test/java/com/j256/ormlite/field/types/ByteTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/ByteTypeTest.java index a75027b3b..2e3612d10 100644 --- a/src/test/java/com/j256/ormlite/field/types/ByteTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/ByteTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; @@ -6,11 +6,11 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class ByteTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/CharObjectTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/CharObjectTypeTest.java similarity index 87% rename from src/test/java/com/j256/ormlite/field/types/CharObjectTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/CharObjectTypeTest.java index ebbaf4e04..ccf22cda1 100644 --- a/src/test/java/com/j256/ormlite/field/types/CharObjectTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/CharObjectTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; @@ -6,10 +6,10 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.table.DatabaseTable; public class CharObjectTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/CharTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/CharTypeTest.java similarity index 84% rename from src/test/java/com/j256/ormlite/field/types/CharTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/CharTypeTest.java index e457be817..0fccd3b15 100644 --- a/src/test/java/com/j256/ormlite/field/types/CharTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/CharTypeTest.java @@ -1,14 +1,14 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class CharTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/DateIntegerTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/DateIntegerTypeTest.java similarity index 89% rename from src/test/java/com/j256/ormlite/field/types/DateIntegerTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/DateIntegerTypeTest.java index 1e690c63e..a6335147f 100644 --- a/src/test/java/com/j256/ormlite/field/types/DateIntegerTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/DateIntegerTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -10,12 +10,12 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class DateIntegerTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/DateLongTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/DateLongTypeTest.java similarity index 85% rename from src/test/java/com/j256/ormlite/field/types/DateLongTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/DateLongTypeTest.java index 5b4e96c83..32724685d 100644 --- a/src/test/java/com/j256/ormlite/field/types/DateLongTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/DateLongTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; @@ -7,12 +7,12 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class DateLongTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/DateStringTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/DateStringTypeTest.java similarity index 92% rename from src/test/java/com/j256/ormlite/field/types/DateStringTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/DateStringTypeTest.java index f7394d4c8..6a3548181 100644 --- a/src/test/java/com/j256/ormlite/field/types/DateStringTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/DateStringTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -13,16 +13,16 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.DatabaseTable; public class DateStringTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/DateTimeTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/DateTimeTypeTest.java similarity index 90% rename from src/test/java/com/j256/ormlite/field/types/DateTimeTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/DateTimeTypeTest.java index a2b5ef70c..db329fa50 100644 --- a/src/test/java/com/j256/ormlite/field/types/DateTimeTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/DateTimeTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -9,7 +9,7 @@ import org.junit.Test; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.support.DatabaseResults; public class DateTimeTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/DateTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/DateTypeTest.java similarity index 89% rename from src/test/java/com/j256/ormlite/field/types/DateTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/DateTypeTest.java index 4f92165d9..c7135069a 100644 --- a/src/test/java/com/j256/ormlite/field/types/DateTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/DateTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; @@ -9,11 +9,11 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.table.DatabaseTable; public class DateTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/DoubleObjectTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/DoubleObjectTypeTest.java similarity index 85% rename from src/test/java/com/j256/ormlite/field/types/DoubleObjectTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/DoubleObjectTypeTest.java index 54d6ed847..060c8c72e 100644 --- a/src/test/java/com/j256/ormlite/field/types/DoubleObjectTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/DoubleObjectTypeTest.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.table.DatabaseTable; public class DoubleObjectTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/DoubleTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/DoubleTypeTest.java similarity index 85% rename from src/test/java/com/j256/ormlite/field/types/DoubleTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/DoubleTypeTest.java index 43f5a8144..7d6fd3a1c 100644 --- a/src/test/java/com/j256/ormlite/field/types/DoubleTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/DoubleTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; @@ -6,11 +6,11 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class DoubleTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/EnumIntegerTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/EnumIntegerTypeTest.java similarity index 85% rename from src/test/java/com/j256/ormlite/field/types/EnumIntegerTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/EnumIntegerTypeTest.java index 206b96c68..a6ed7474b 100644 --- a/src/test/java/com/j256/ormlite/field/types/EnumIntegerTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/EnumIntegerTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -6,15 +6,15 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.DatabaseTable; public class EnumIntegerTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/EnumStringTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/EnumStringTypeTest.java similarity index 90% rename from src/test/java/com/j256/ormlite/field/types/EnumStringTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/EnumStringTypeTest.java index f1788291d..a41b5fff8 100644 --- a/src/test/java/com/j256/ormlite/field/types/EnumStringTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/EnumStringTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -8,15 +8,15 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.DatabaseTable; public class EnumStringTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/EnumToStringTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/EnumToStringTypeTest.java similarity index 88% rename from src/test/java/com/j256/ormlite/field/types/EnumToStringTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/EnumToStringTypeTest.java index f0c5d80b7..240e3a3e3 100644 --- a/src/test/java/com/j256/ormlite/field/types/EnumToStringTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/EnumToStringTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -9,14 +9,14 @@ import org.junit.Test; -import com.j256.ormlite.dao.CloseableIterator; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.GenericRawResults; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.CloseableIterator; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.GenericRawResults; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.table.DatabaseTable; public class EnumToStringTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/FloatObjectTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/FloatObjectTypeTest.java similarity index 85% rename from src/test/java/com/j256/ormlite/field/types/FloatObjectTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/FloatObjectTypeTest.java index 10f8b5676..607d7c9f6 100644 --- a/src/test/java/com/j256/ormlite/field/types/FloatObjectTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/FloatObjectTypeTest.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.table.DatabaseTable; public class FloatObjectTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/FloatTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/FloatTypeTest.java similarity index 85% rename from src/test/java/com/j256/ormlite/field/types/FloatTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/FloatTypeTest.java index 05bc936bc..bf09c5faa 100644 --- a/src/test/java/com/j256/ormlite/field/types/FloatTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/FloatTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; @@ -6,11 +6,11 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class FloatTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/IntTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/IntTypeTest.java similarity index 86% rename from src/test/java/com/j256/ormlite/field/types/IntTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/IntTypeTest.java index 9956be5df..b8f60b9ff 100644 --- a/src/test/java/com/j256/ormlite/field/types/IntTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/IntTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; @@ -6,11 +6,11 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class IntTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/IntegerObjectTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/IntegerObjectTypeTest.java similarity index 84% rename from src/test/java/com/j256/ormlite/field/types/IntegerObjectTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/IntegerObjectTypeTest.java index 968db1d09..11c829d12 100644 --- a/src/test/java/com/j256/ormlite/field/types/IntegerObjectTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/IntegerObjectTypeTest.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.table.DatabaseTable; public class IntegerObjectTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/LongObjectTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/LongObjectTypeTest.java similarity index 88% rename from src/test/java/com/j256/ormlite/field/types/LongObjectTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/LongObjectTypeTest.java index 6fe8e5c97..46c913d61 100644 --- a/src/test/java/com/j256/ormlite/field/types/LongObjectTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/LongObjectTypeTest.java @@ -1,14 +1,14 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.table.DatabaseTable; public class LongObjectTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/LongStringTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/LongStringTypeTest.java similarity index 79% rename from src/test/java/com/j256/ormlite/field/types/LongStringTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/LongStringTypeTest.java index acdf7e394..11ecfb662 100644 --- a/src/test/java/com/j256/ormlite/field/types/LongStringTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/LongStringTypeTest.java @@ -1,14 +1,14 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class LongStringTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/LongTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/LongTypeTest.java similarity index 86% rename from src/test/java/com/j256/ormlite/field/types/LongTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/LongTypeTest.java index bf244b7e5..56b92adb4 100644 --- a/src/test/java/com/j256/ormlite/field/types/LongTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/LongTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; @@ -6,11 +6,11 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class LongTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/SerializableTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/SerializableTypeTest.java similarity index 92% rename from src/test/java/com/j256/ormlite/field/types/SerializableTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/SerializableTypeTest.java index 8faaaf561..bb03d8a00 100644 --- a/src/test/java/com/j256/ormlite/field/types/SerializableTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/SerializableTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -14,17 +14,17 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.stmt.UpdateBuilder; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.stmt.UpdateBuilder; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.DatabaseTable; public class SerializableTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/ShortObjectTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/ShortObjectTypeTest.java similarity index 89% rename from src/test/java/com/j256/ormlite/field/types/ShortObjectTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/ShortObjectTypeTest.java index 3ffc33555..91427de30 100644 --- a/src/test/java/com/j256/ormlite/field/types/ShortObjectTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/ShortObjectTypeTest.java @@ -1,14 +1,14 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.table.DatabaseTable; public class ShortObjectTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/ShortTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/ShortTypeTest.java similarity index 85% rename from src/test/java/com/j256/ormlite/field/types/ShortTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/ShortTypeTest.java index 3b4cc0904..20cd85b99 100644 --- a/src/test/java/com/j256/ormlite/field/types/ShortTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/ShortTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; @@ -6,11 +6,11 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class ShortTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/SqlDateTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/SqlDateTypeTest.java similarity index 89% rename from src/test/java/com/j256/ormlite/field/types/SqlDateTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/SqlDateTypeTest.java index b9fa23d29..d3ce26b2e 100644 --- a/src/test/java/com/j256/ormlite/field/types/SqlDateTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/SqlDateTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; @@ -10,12 +10,12 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class SqlDateTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/StringBytesTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/StringBytesTypeTest.java similarity index 89% rename from src/test/java/com/j256/ormlite/field/types/StringBytesTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/StringBytesTypeTest.java index ec1f92078..2f85a44c5 100644 --- a/src/test/java/com/j256/ormlite/field/types/StringBytesTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/StringBytesTypeTest.java @@ -1,14 +1,14 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class StringBytesTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/StringTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/StringTypeTest.java similarity index 79% rename from src/test/java/com/j256/ormlite/field/types/StringTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/StringTypeTest.java index a91c38a91..a59496a6f 100644 --- a/src/test/java/com/j256/ormlite/field/types/StringTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/StringTypeTest.java @@ -1,13 +1,13 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.table.DatabaseTable; public class StringTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/TimeStampTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/TimeStampTypeTest.java similarity index 93% rename from src/test/java/com/j256/ormlite/field/types/TimeStampTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/TimeStampTypeTest.java index 6429c8ffb..c75ed62b3 100644 --- a/src/test/java/com/j256/ormlite/field/types/TimeStampTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/TimeStampTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -11,13 +11,13 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.field.types.DateTypeTest.LocalDate; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.field.types.DateTypeTest.LocalDate; +import com.j256.ormlite.core.table.DatabaseTable; public class TimeStampTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/UnknownTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/UnknownTypeTest.java similarity index 74% rename from src/test/java/com/j256/ormlite/field/types/UnknownTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/UnknownTypeTest.java index 7593f2a15..fd73972fb 100644 --- a/src/test/java/com/j256/ormlite/field/types/UnknownTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/UnknownTypeTest.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertNull; import org.junit.Test; -import com.j256.ormlite.field.DataType; +import com.j256.ormlite.core.field.DataType; public class UnknownTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/UuidTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/UuidTypeTest.java similarity index 92% rename from src/test/java/com/j256/ormlite/field/types/UuidTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/UuidTypeTest.java index bd299cf5a..5c89ccbf5 100644 --- a/src/test/java/com/j256/ormlite/field/types/UuidTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/UuidTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -9,11 +9,11 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.table.DatabaseTable; public class UuidTypeTest extends BaseTypeTest { diff --git a/src/test/java/com/j256/ormlite/field/types/VoidTypeTest.java b/src/test/java/com/j256/ormlite/core/field/types/VoidTypeTest.java similarity index 90% rename from src/test/java/com/j256/ormlite/field/types/VoidTypeTest.java rename to src/test/java/com/j256/ormlite/core/field/types/VoidTypeTest.java index 2f876c85f..42f794b64 100644 --- a/src/test/java/com/j256/ormlite/field/types/VoidTypeTest.java +++ b/src/test/java/com/j256/ormlite/core/field/types/VoidTypeTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.field.types; +package com.j256.ormlite.core.field.types; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; diff --git a/src/test/java/com/j256/ormlite/h2/H2CompiledStatement.java b/src/test/java/com/j256/ormlite/core/h2/H2CompiledStatement.java similarity index 91% rename from src/test/java/com/j256/ormlite/h2/H2CompiledStatement.java rename to src/test/java/com/j256/ormlite/core/h2/H2CompiledStatement.java index b4483dc34..e982e1084 100644 --- a/src/test/java/com/j256/ormlite/h2/H2CompiledStatement.java +++ b/src/test/java/com/j256/ormlite/core/h2/H2CompiledStatement.java @@ -1,15 +1,15 @@ -package com.j256.ormlite.h2; +package com.j256.ormlite.core.h2; import java.io.IOException; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Types; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.DatabaseResults; /** * H2 compiled statement. diff --git a/src/test/java/com/j256/ormlite/h2/H2ConnectionSource.java b/src/test/java/com/j256/ormlite/core/h2/H2ConnectionSource.java similarity index 88% rename from src/test/java/com/j256/ormlite/h2/H2ConnectionSource.java rename to src/test/java/com/j256/ormlite/core/h2/H2ConnectionSource.java index e67c41b02..05cbfa3f8 100644 --- a/src/test/java/com/j256/ormlite/h2/H2ConnectionSource.java +++ b/src/test/java/com/j256/ormlite/core/h2/H2ConnectionSource.java @@ -1,14 +1,14 @@ -package com.j256.ormlite.h2; +package com.j256.ormlite.core.h2; import java.io.IOException; import java.sql.DriverManager; import java.sql.SQLException; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseConnectionProxyFactory; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseConnectionProxyFactory; /** * H2 connection source. diff --git a/src/test/java/com/j256/ormlite/h2/H2DatabaseConnection.java b/src/test/java/com/j256/ormlite/core/h2/H2DatabaseConnection.java similarity index 93% rename from src/test/java/com/j256/ormlite/h2/H2DatabaseConnection.java rename to src/test/java/com/j256/ormlite/core/h2/H2DatabaseConnection.java index ce27d8b00..a42e131eb 100644 --- a/src/test/java/com/j256/ormlite/h2/H2DatabaseConnection.java +++ b/src/test/java/com/j256/ormlite/core/h2/H2DatabaseConnection.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.h2; +package com.j256.ormlite.core.h2; import java.io.IOException; import java.sql.Connection; @@ -11,15 +11,15 @@ import java.sql.Statement; import java.sql.Types; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.stmt.GenericRowMapper; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.support.GeneratedKeyHolder; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.stmt.GenericRowMapper; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.support.GeneratedKeyHolder; /** * H2 connection. Unfortunately, a good bit of this is copied from the JdbcDatabaseConnection. diff --git a/src/test/java/com/j256/ormlite/h2/H2DatabaseResults.java b/src/test/java/com/j256/ormlite/core/h2/H2DatabaseResults.java similarity index 96% rename from src/test/java/com/j256/ormlite/h2/H2DatabaseResults.java rename to src/test/java/com/j256/ormlite/core/h2/H2DatabaseResults.java index 9c2d30b6c..49e690ced 100644 --- a/src/test/java/com/j256/ormlite/h2/H2DatabaseResults.java +++ b/src/test/java/com/j256/ormlite/core/h2/H2DatabaseResults.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.h2; +package com.j256.ormlite.core.h2; import java.io.IOException; import java.io.InputStream; @@ -9,9 +9,9 @@ import java.sql.SQLException; import java.sql.Timestamp; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.support.DatabaseResults; /** * H2 database results. diff --git a/src/test/java/com/j256/ormlite/h2/H2DatabaseType.java b/src/test/java/com/j256/ormlite/core/h2/H2DatabaseType.java similarity index 92% rename from src/test/java/com/j256/ormlite/h2/H2DatabaseType.java rename to src/test/java/com/j256/ormlite/core/h2/H2DatabaseType.java index 993adf3af..b3a2eda20 100644 --- a/src/test/java/com/j256/ormlite/h2/H2DatabaseType.java +++ b/src/test/java/com/j256/ormlite/core/h2/H2DatabaseType.java @@ -1,11 +1,11 @@ -package com.j256.ormlite.h2; +package com.j256.ormlite.core.h2; import java.sql.DriverManager; import java.sql.SQLException; import java.util.List; -import com.j256.ormlite.db.BaseDatabaseType; -import com.j256.ormlite.field.FieldType; +import com.j256.ormlite.core.db.BaseDatabaseType; +import com.j256.ormlite.core.field.FieldType; /** * H2 database type. diff --git a/src/test/java/com/j256/ormlite/h2/README.txt b/src/test/java/com/j256/ormlite/core/h2/README.txt similarity index 100% rename from src/test/java/com/j256/ormlite/h2/README.txt rename to src/test/java/com/j256/ormlite/core/h2/README.txt diff --git a/src/test/java/com/j256/ormlite/logger/BaseLogTest.java b/src/test/java/com/j256/ormlite/core/logger/BaseLogTest.java similarity index 96% rename from src/test/java/com/j256/ormlite/logger/BaseLogTest.java rename to src/test/java/com/j256/ormlite/core/logger/BaseLogTest.java index 2e6755518..2d905369c 100644 --- a/src/test/java/com/j256/ormlite/logger/BaseLogTest.java +++ b/src/test/java/com/j256/ormlite/core/logger/BaseLogTest.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.logger; +package com.j256.ormlite.core.logger; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.j256.ormlite.logger.Log.Level; +import com.j256.ormlite.core.logger.Log.Level; public abstract class BaseLogTest { diff --git a/src/test/java/com/j256/ormlite/logger/CommonsLoggingLogTest.java b/src/test/java/com/j256/ormlite/core/logger/CommonsLoggingLogTest.java similarity index 80% rename from src/test/java/com/j256/ormlite/logger/CommonsLoggingLogTest.java rename to src/test/java/com/j256/ormlite/core/logger/CommonsLoggingLogTest.java index 5e6a2e653..8ce2709c0 100644 --- a/src/test/java/com/j256/ormlite/logger/CommonsLoggingLogTest.java +++ b/src/test/java/com/j256/ormlite/core/logger/CommonsLoggingLogTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.logger; +package com.j256.ormlite.core.logger; public class CommonsLoggingLogTest extends BaseLogTest { diff --git a/src/test/java/com/j256/ormlite/logger/JavaUtilLogTest.java b/src/test/java/com/j256/ormlite/core/logger/JavaUtilLogTest.java similarity index 77% rename from src/test/java/com/j256/ormlite/logger/JavaUtilLogTest.java rename to src/test/java/com/j256/ormlite/core/logger/JavaUtilLogTest.java index be1350187..e5ad97a53 100644 --- a/src/test/java/com/j256/ormlite/logger/JavaUtilLogTest.java +++ b/src/test/java/com/j256/ormlite/core/logger/JavaUtilLogTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.logger; +package com.j256.ormlite.core.logger; public class JavaUtilLogTest extends BaseLogTest { diff --git a/src/test/java/com/j256/ormlite/logger/LocalLogTest.java b/src/test/java/com/j256/ormlite/core/logger/LocalLogTest.java similarity index 97% rename from src/test/java/com/j256/ormlite/logger/LocalLogTest.java rename to src/test/java/com/j256/ormlite/core/logger/LocalLogTest.java index a1b25bd48..9782e3a2d 100644 --- a/src/test/java/com/j256/ormlite/logger/LocalLogTest.java +++ b/src/test/java/com/j256/ormlite/core/logger/LocalLogTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.logger; +package com.j256.ormlite.core.logger; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -11,7 +11,7 @@ import org.junit.Test; -import com.j256.ormlite.logger.Log.Level; +import com.j256.ormlite.core.logger.Log.Level; public class LocalLogTest extends BaseLogTest { diff --git a/src/test/java/com/j256/ormlite/logger/LoggerFactoryTest.java b/src/test/java/com/j256/ormlite/core/logger/LoggerFactoryTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/logger/LoggerFactoryTest.java rename to src/test/java/com/j256/ormlite/core/logger/LoggerFactoryTest.java index 3ad4b778a..3febfb017 100644 --- a/src/test/java/com/j256/ormlite/logger/LoggerFactoryTest.java +++ b/src/test/java/com/j256/ormlite/core/logger/LoggerFactoryTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.logger; +package com.j256.ormlite.core.logger; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/src/test/java/com/j256/ormlite/logger/LoggerTest.java b/src/test/java/com/j256/ormlite/core/logger/LoggerTest.java similarity index 99% rename from src/test/java/com/j256/ormlite/logger/LoggerTest.java rename to src/test/java/com/j256/ormlite/core/logger/LoggerTest.java index 358514767..7e9d3b7ba 100644 --- a/src/test/java/com/j256/ormlite/logger/LoggerTest.java +++ b/src/test/java/com/j256/ormlite/core/logger/LoggerTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.logger; +package com.j256.ormlite.core.logger; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -16,7 +16,7 @@ import org.junit.Before; import org.junit.Test; -import com.j256.ormlite.logger.Log.Level; +import com.j256.ormlite.core.logger.Log.Level; public class LoggerTest { diff --git a/src/test/java/com/j256/ormlite/logger/Slf4jLoggingLogTest.java b/src/test/java/com/j256/ormlite/core/logger/Slf4jLoggingLogTest.java similarity index 79% rename from src/test/java/com/j256/ormlite/logger/Slf4jLoggingLogTest.java rename to src/test/java/com/j256/ormlite/core/logger/Slf4jLoggingLogTest.java index 5914f9619..d65418fd0 100644 --- a/src/test/java/com/j256/ormlite/logger/Slf4jLoggingLogTest.java +++ b/src/test/java/com/j256/ormlite/core/logger/Slf4jLoggingLogTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.logger; +package com.j256.ormlite.core.logger; public class Slf4jLoggingLogTest extends BaseLogTest { diff --git a/src/test/java/com/j256/ormlite/misc/BaseDaoEnabledTest.java b/src/test/java/com/j256/ormlite/core/misc/BaseDaoEnabledTest.java similarity index 96% rename from src/test/java/com/j256/ormlite/misc/BaseDaoEnabledTest.java rename to src/test/java/com/j256/ormlite/core/misc/BaseDaoEnabledTest.java index 795b9cf15..e7e19c80f 100644 --- a/src/test/java/com/j256/ormlite/misc/BaseDaoEnabledTest.java +++ b/src/test/java/com/j256/ormlite/core/misc/BaseDaoEnabledTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.misc; +package com.j256.ormlite.core.misc; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -9,9 +9,9 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DatabaseField; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DatabaseField; public class BaseDaoEnabledTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/misc/JavaxPersistenceTest.java b/src/test/java/com/j256/ormlite/core/misc/JavaxPersistenceTest.java similarity index 97% rename from src/test/java/com/j256/ormlite/misc/JavaxPersistenceTest.java rename to src/test/java/com/j256/ormlite/core/misc/JavaxPersistenceTest.java index bfc00e0b4..2c2c8dd54 100644 --- a/src/test/java/com/j256/ormlite/misc/JavaxPersistenceTest.java +++ b/src/test/java/com/j256/ormlite/core/misc/JavaxPersistenceTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.misc; +package com.j256.ormlite.core.misc; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -23,11 +23,11 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.field.DatabaseFieldConfig; -import com.j256.ormlite.field.types.EnumIntegerType; -import com.j256.ormlite.field.types.EnumStringType; -import com.j256.ormlite.h2.H2DatabaseType; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.field.DatabaseFieldConfig; +import com.j256.ormlite.core.field.types.EnumIntegerType; +import com.j256.ormlite.core.field.types.EnumStringType; +import com.j256.ormlite.core.h2.H2DatabaseType; public class JavaxPersistenceTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/misc/SqlExceptionUtilTest.java b/src/test/java/com/j256/ormlite/core/misc/SqlExceptionUtilTest.java similarity index 96% rename from src/test/java/com/j256/ormlite/misc/SqlExceptionUtilTest.java rename to src/test/java/com/j256/ormlite/core/misc/SqlExceptionUtilTest.java index 85404e841..5eb152230 100644 --- a/src/test/java/com/j256/ormlite/misc/SqlExceptionUtilTest.java +++ b/src/test/java/com/j256/ormlite/core/misc/SqlExceptionUtilTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.misc; +package com.j256.ormlite.core.misc; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/j256/ormlite/misc/TransactionManagerTest.java b/src/test/java/com/j256/ormlite/core/misc/TransactionManagerTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/misc/TransactionManagerTest.java rename to src/test/java/com/j256/ormlite/core/misc/TransactionManagerTest.java index 584d3d54c..f0796bfba 100644 --- a/src/test/java/com/j256/ormlite/misc/TransactionManagerTest.java +++ b/src/test/java/com/j256/ormlite/core/misc/TransactionManagerTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.misc; +package com.j256.ormlite.core.misc; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -19,10 +19,10 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; public class TransactionManagerTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/misc/VersionUtilsTest.java b/src/test/java/com/j256/ormlite/core/misc/VersionUtilsTest.java similarity index 95% rename from src/test/java/com/j256/ormlite/misc/VersionUtilsTest.java rename to src/test/java/com/j256/ormlite/core/misc/VersionUtilsTest.java index f06de99fb..2e4a8e580 100644 --- a/src/test/java/com/j256/ormlite/misc/VersionUtilsTest.java +++ b/src/test/java/com/j256/ormlite/core/misc/VersionUtilsTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.misc; +package com.j256.ormlite.core.misc; import org.junit.Test; diff --git a/src/test/java/com/j256/ormlite/stmt/BaseCoreStmtTest.java b/src/test/java/com/j256/ormlite/core/stmt/BaseCoreStmtTest.java similarity index 88% rename from src/test/java/com/j256/ormlite/stmt/BaseCoreStmtTest.java rename to src/test/java/com/j256/ormlite/core/stmt/BaseCoreStmtTest.java index fa260d798..a493894c7 100644 --- a/src/test/java/com/j256/ormlite/stmt/BaseCoreStmtTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/BaseCoreStmtTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import static org.junit.Assert.assertEquals; @@ -6,9 +6,9 @@ import org.junit.Before; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.table.TableInfo; public abstract class BaseCoreStmtTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/stmt/DeleteBuilderTest.java b/src/test/java/com/j256/ormlite/core/stmt/DeleteBuilderTest.java similarity index 94% rename from src/test/java/com/j256/ormlite/stmt/DeleteBuilderTest.java rename to src/test/java/com/j256/ormlite/core/stmt/DeleteBuilderTest.java index 7a3946f23..97c2ae53e 100644 --- a/src/test/java/com/j256/ormlite/stmt/DeleteBuilderTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/DeleteBuilderTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -6,7 +6,7 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; +import com.j256.ormlite.core.dao.Dao; public class DeleteBuilderTest extends BaseCoreStmtTest { diff --git a/src/test/java/com/j256/ormlite/stmt/NullArgHolderTest.java b/src/test/java/com/j256/ormlite/core/stmt/NullArgHolderTest.java similarity index 84% rename from src/test/java/com/j256/ormlite/stmt/NullArgHolderTest.java rename to src/test/java/com/j256/ormlite/core/stmt/NullArgHolderTest.java index f0aef7209..896727827 100644 --- a/src/test/java/com/j256/ormlite/stmt/NullArgHolderTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/NullArgHolderTest.java @@ -1,10 +1,10 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.j256.ormlite.field.FieldType; +import com.j256.ormlite.core.field.FieldType; public class NullArgHolderTest { diff --git a/src/test/java/com/j256/ormlite/stmt/QueryBuilderTest.java b/src/test/java/com/j256/ormlite/core/stmt/QueryBuilderTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/stmt/QueryBuilderTest.java rename to src/test/java/com/j256/ormlite/core/stmt/QueryBuilderTest.java index fbadbcd4c..6a371a09e 100644 --- a/src/test/java/com/j256/ormlite/stmt/QueryBuilderTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/QueryBuilderTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -14,17 +14,17 @@ import org.junit.Test; -import com.j256.ormlite.dao.CloseableIterator; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.ForeignCollection; -import com.j256.ormlite.dao.GenericRawResults; -import com.j256.ormlite.db.BaseDatabaseType; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.ForeignCollectionField; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.stmt.QueryBuilder.JoinType; -import com.j256.ormlite.stmt.QueryBuilder.JoinWhereOperation; +import com.j256.ormlite.core.dao.CloseableIterator; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.ForeignCollection; +import com.j256.ormlite.core.dao.GenericRawResults; +import com.j256.ormlite.core.db.BaseDatabaseType; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.ForeignCollectionField; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.stmt.QueryBuilder.JoinType; +import com.j256.ormlite.core.stmt.QueryBuilder.JoinWhereOperation; public class QueryBuilderTest extends BaseCoreStmtTest { diff --git a/src/test/java/com/j256/ormlite/stmt/RawResultsImplTest.java b/src/test/java/com/j256/ormlite/core/stmt/RawResultsImplTest.java similarity index 95% rename from src/test/java/com/j256/ormlite/stmt/RawResultsImplTest.java rename to src/test/java/com/j256/ormlite/core/stmt/RawResultsImplTest.java index e6a51500e..b1796d110 100644 --- a/src/test/java/com/j256/ormlite/stmt/RawResultsImplTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/RawResultsImplTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -8,10 +8,10 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.GenericRawResults; -import com.j256.ormlite.dao.RawRowMapper; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.GenericRawResults; +import com.j256.ormlite.core.dao.RawRowMapper; public class RawResultsImplTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/stmt/SelectArgTest.java b/src/test/java/com/j256/ormlite/core/stmt/SelectArgTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/stmt/SelectArgTest.java rename to src/test/java/com/j256/ormlite/core/stmt/SelectArgTest.java index 90f5f23ac..af5251fad 100644 --- a/src/test/java/com/j256/ormlite/stmt/SelectArgTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/SelectArgTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; diff --git a/src/test/java/com/j256/ormlite/stmt/SelectIteratorTest.java b/src/test/java/com/j256/ormlite/core/stmt/SelectIteratorTest.java similarity index 97% rename from src/test/java/com/j256/ormlite/stmt/SelectIteratorTest.java rename to src/test/java/com/j256/ormlite/core/stmt/SelectIteratorTest.java index d6b3cefc8..9147cf367 100644 --- a/src/test/java/com/j256/ormlite/stmt/SelectIteratorTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/SelectIteratorTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -17,12 +17,12 @@ import org.junit.Test; -import com.j256.ormlite.dao.CloseableIterator; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.GenericRawResults; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.dao.CloseableIterator; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.GenericRawResults; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseResults; public class SelectIteratorTest extends BaseCoreStmtTest { diff --git a/src/test/java/com/j256/ormlite/stmt/StatementBuilderTest.java b/src/test/java/com/j256/ormlite/core/stmt/StatementBuilderTest.java similarity index 93% rename from src/test/java/com/j256/ormlite/stmt/StatementBuilderTest.java rename to src/test/java/com/j256/ormlite/core/stmt/StatementBuilderTest.java index 2a7ff4b75..b2146f3ec 100644 --- a/src/test/java/com/j256/ormlite/stmt/StatementBuilderTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/StatementBuilderTest.java @@ -1,11 +1,11 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; public class StatementBuilderTest { diff --git a/src/test/java/com/j256/ormlite/stmt/StatementExecutorTest.java b/src/test/java/com/j256/ormlite/core/stmt/StatementExecutorTest.java similarity index 96% rename from src/test/java/com/j256/ormlite/stmt/StatementExecutorTest.java rename to src/test/java/com/j256/ormlite/core/stmt/StatementExecutorTest.java index dab10b880..8651f9ac0 100644 --- a/src/test/java/com/j256/ormlite/stmt/StatementExecutorTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/StatementExecutorTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -16,13 +16,13 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.table.TableInfo; public class StatementExecutorTest extends BaseCoreStmtTest { diff --git a/src/test/java/com/j256/ormlite/stmt/ThreadLocalSelectArgTest.java b/src/test/java/com/j256/ormlite/core/stmt/ThreadLocalSelectArgTest.java similarity index 93% rename from src/test/java/com/j256/ormlite/stmt/ThreadLocalSelectArgTest.java rename to src/test/java/com/j256/ormlite/core/stmt/ThreadLocalSelectArgTest.java index e135f10c3..654d0f59c 100644 --- a/src/test/java/com/j256/ormlite/stmt/ThreadLocalSelectArgTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/ThreadLocalSelectArgTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -7,7 +7,7 @@ import org.junit.Test; -import com.j256.ormlite.field.SqlType; +import com.j256.ormlite.core.field.SqlType; public class ThreadLocalSelectArgTest { diff --git a/src/test/java/com/j256/ormlite/stmt/UpdateBuilderTest.java b/src/test/java/com/j256/ormlite/core/stmt/UpdateBuilderTest.java similarity index 96% rename from src/test/java/com/j256/ormlite/stmt/UpdateBuilderTest.java rename to src/test/java/com/j256/ormlite/core/stmt/UpdateBuilderTest.java index e56da50b8..419a88e57 100644 --- a/src/test/java/com/j256/ormlite/stmt/UpdateBuilderTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/UpdateBuilderTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -9,11 +9,11 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.ForeignCollection; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.ForeignCollectionField; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.ForeignCollection; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.ForeignCollectionField; +import com.j256.ormlite.core.table.TableInfo; public class UpdateBuilderTest extends BaseCoreStmtTest { diff --git a/src/test/java/com/j256/ormlite/stmt/WhereTest.java b/src/test/java/com/j256/ormlite/core/stmt/WhereTest.java similarity index 98% rename from src/test/java/com/j256/ormlite/stmt/WhereTest.java rename to src/test/java/com/j256/ormlite/core/stmt/WhereTest.java index cdf2a12be..bb1a05ebf 100644 --- a/src/test/java/com/j256/ormlite/stmt/WhereTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/WhereTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt; +package com.j256.ormlite.core.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -11,15 +11,15 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.BaseDaoImpl; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.field.SqlType; -import com.j256.ormlite.stmt.query.SimpleComparison; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.BaseDaoImpl; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.field.SqlType; +import com.j256.ormlite.core.stmt.query.SimpleComparison; +import com.j256.ormlite.core.table.TableInfo; public class WhereTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/stmt/mapped/BaseMappedQueryTest.java b/src/test/java/com/j256/ormlite/core/stmt/mapped/BaseMappedQueryTest.java similarity index 93% rename from src/test/java/com/j256/ormlite/stmt/mapped/BaseMappedQueryTest.java rename to src/test/java/com/j256/ormlite/core/stmt/mapped/BaseMappedQueryTest.java index 6b61cd900..eef82a2b0 100644 --- a/src/test/java/com/j256/ormlite/stmt/mapped/BaseMappedQueryTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/mapped/BaseMappedQueryTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.eq; @@ -15,13 +15,13 @@ import org.junit.Test; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.dao.ObjectCache; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.BaseCoreStmtTest; -import com.j256.ormlite.stmt.QueryBuilder; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.dao.ObjectCache; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.BaseCoreStmtTest; +import com.j256.ormlite.core.stmt.QueryBuilder; +import com.j256.ormlite.core.support.DatabaseResults; public class BaseMappedQueryTest extends BaseCoreStmtTest { diff --git a/src/test/java/com/j256/ormlite/stmt/mapped/MappedCreateTest.java b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedCreateTest.java similarity index 96% rename from src/test/java/com/j256/ormlite/stmt/mapped/MappedCreateTest.java rename to src/test/java/com/j256/ormlite/core/stmt/mapped/MappedCreateTest.java index a3f4a15e4..6ff415bf4 100644 --- a/src/test/java/com/j256/ormlite/stmt/mapped/MappedCreateTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedCreateTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -19,18 +19,18 @@ import org.easymock.IAnswer; import org.junit.Test; -import com.j256.ormlite.dao.CloseableIterator; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.db.BaseDatabaseType; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.BaseCoreStmtTest; -import com.j256.ormlite.stmt.StatementExecutor; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.GeneratedKeyHolder; -import com.j256.ormlite.table.DatabaseTable; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.CloseableIterator; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.db.BaseDatabaseType; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.BaseCoreStmtTest; +import com.j256.ormlite.core.stmt.StatementExecutor; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.GeneratedKeyHolder; +import com.j256.ormlite.core.table.DatabaseTable; +import com.j256.ormlite.core.table.TableInfo; public class MappedCreateTest extends BaseCoreStmtTest { diff --git a/src/test/java/com/j256/ormlite/stmt/mapped/MappedDeleteCollectionTest.java b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedDeleteCollectionTest.java similarity index 78% rename from src/test/java/com/j256/ormlite/stmt/mapped/MappedDeleteCollectionTest.java rename to src/test/java/com/j256/ormlite/core/stmt/mapped/MappedDeleteCollectionTest.java index 0a8841840..00e2462d6 100644 --- a/src/test/java/com/j256/ormlite/stmt/mapped/MappedDeleteCollectionTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedDeleteCollectionTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -9,12 +9,12 @@ import org.junit.Test; -import com.j256.ormlite.db.BaseDatabaseType; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.db.BaseDatabaseType; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.table.TableInfo; public class MappedDeleteCollectionTest { diff --git a/src/test/java/com/j256/ormlite/stmt/mapped/MappedDeleteTest.java b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedDeleteTest.java similarity index 81% rename from src/test/java/com/j256/ormlite/stmt/mapped/MappedDeleteTest.java rename to src/test/java/com/j256/ormlite/core/stmt/mapped/MappedDeleteTest.java index 6578c72a8..b72171af9 100644 --- a/src/test/java/com/j256/ormlite/stmt/mapped/MappedDeleteTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedDeleteTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -8,13 +8,13 @@ import org.junit.Test; -import com.j256.ormlite.db.BaseDatabaseType; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.stmt.StatementExecutor; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.table.DatabaseTable; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.db.BaseDatabaseType; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.stmt.StatementExecutor; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.table.DatabaseTable; +import com.j256.ormlite.core.table.TableInfo; public class MappedDeleteTest { diff --git a/src/test/java/com/j256/ormlite/stmt/mapped/MappedPreparedQueryTest.java b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedPreparedQueryTest.java similarity index 85% rename from src/test/java/com/j256/ormlite/stmt/mapped/MappedPreparedQueryTest.java rename to src/test/java/com/j256/ormlite/core/stmt/mapped/MappedPreparedQueryTest.java index 3923f0142..987cbcdac 100644 --- a/src/test/java/com/j256/ormlite/stmt/mapped/MappedPreparedQueryTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedPreparedQueryTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import static org.junit.Assert.assertEquals; @@ -8,18 +8,18 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.misc.IOUtils; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; -import com.j256.ormlite.table.DatabaseTable; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.misc.IOUtils; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; +import com.j256.ormlite.core.table.DatabaseTable; +import com.j256.ormlite.core.table.TableInfo; public class MappedPreparedQueryTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/stmt/mapped/MappedQueryForIdTest.java b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedQueryForIdTest.java similarity index 91% rename from src/test/java/com/j256/ormlite/stmt/mapped/MappedQueryForIdTest.java rename to src/test/java/com/j256/ormlite/core/stmt/mapped/MappedQueryForIdTest.java index c2b2cbdf9..387cde229 100644 --- a/src/test/java/com/j256/ormlite/stmt/mapped/MappedQueryForIdTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedQueryForIdTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -7,13 +7,13 @@ import org.junit.Test; -import com.j256.ormlite.dao.CloseableIterator; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.stmt.BaseCoreStmtTest; -import com.j256.ormlite.stmt.StatementExecutor; -import com.j256.ormlite.table.DatabaseTable; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.dao.CloseableIterator; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.stmt.BaseCoreStmtTest; +import com.j256.ormlite.core.stmt.StatementExecutor; +import com.j256.ormlite.core.table.DatabaseTable; +import com.j256.ormlite.core.table.TableInfo; public class MappedQueryForIdTest extends BaseCoreStmtTest { diff --git a/src/test/java/com/j256/ormlite/stmt/mapped/MappedRefreshTest.java b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedRefreshTest.java similarity index 88% rename from src/test/java/com/j256/ormlite/stmt/mapped/MappedRefreshTest.java rename to src/test/java/com/j256/ormlite/core/stmt/mapped/MappedRefreshTest.java index dfcea6a52..8ed1977f8 100644 --- a/src/test/java/com/j256/ormlite/stmt/mapped/MappedRefreshTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedRefreshTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import static org.junit.Assert.assertEquals; @@ -6,10 +6,10 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.table.DatabaseTable; public class MappedRefreshTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/stmt/mapped/MappedUpdateIdTest.java b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedUpdateIdTest.java similarity index 79% rename from src/test/java/com/j256/ormlite/stmt/mapped/MappedUpdateIdTest.java rename to src/test/java/com/j256/ormlite/core/stmt/mapped/MappedUpdateIdTest.java index 05d4776a9..b1ebd017b 100644 --- a/src/test/java/com/j256/ormlite/stmt/mapped/MappedUpdateIdTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedUpdateIdTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -8,11 +8,11 @@ import org.junit.Test; -import com.j256.ormlite.db.BaseDatabaseType; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.db.BaseDatabaseType; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.table.TableInfo; public class MappedUpdateIdTest { diff --git a/src/test/java/com/j256/ormlite/stmt/mapped/MappedUpdateTest.java b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedUpdateTest.java similarity index 85% rename from src/test/java/com/j256/ormlite/stmt/mapped/MappedUpdateTest.java rename to src/test/java/com/j256/ormlite/core/stmt/mapped/MappedUpdateTest.java index f4f3c13c0..05bffa187 100644 --- a/src/test/java/com/j256/ormlite/stmt/mapped/MappedUpdateTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/mapped/MappedUpdateTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.mapped; +package com.j256.ormlite.core.stmt.mapped; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -9,12 +9,12 @@ import org.junit.Test; -import com.j256.ormlite.db.BaseDatabaseType; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.stmt.StatementExecutor; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.table.TableInfo; +import com.j256.ormlite.core.db.BaseDatabaseType; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.stmt.StatementExecutor; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.table.TableInfo; public class MappedUpdateTest { diff --git a/src/test/java/com/j256/ormlite/stmt/query/BaseComparisonTest.java b/src/test/java/com/j256/ormlite/core/stmt/query/BaseComparisonTest.java similarity index 93% rename from src/test/java/com/j256/ormlite/stmt/query/BaseComparisonTest.java rename to src/test/java/com/j256/ormlite/core/stmt/query/BaseComparisonTest.java index c11db733f..0e7b54019 100644 --- a/src/test/java/com/j256/ormlite/stmt/query/BaseComparisonTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/query/BaseComparisonTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.replay; @@ -13,12 +13,12 @@ import org.junit.Test; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.BaseCoreStmtTest; -import com.j256.ormlite.stmt.SelectArg; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.BaseCoreStmtTest; +import com.j256.ormlite.core.stmt.SelectArg; public class BaseComparisonTest extends BaseCoreStmtTest { diff --git a/src/test/java/com/j256/ormlite/stmt/query/BetweenTest.java b/src/test/java/com/j256/ormlite/core/stmt/query/BetweenTest.java similarity index 88% rename from src/test/java/com/j256/ormlite/stmt/query/BetweenTest.java rename to src/test/java/com/j256/ormlite/core/stmt/query/BetweenTest.java index 2434734fd..de418e83c 100644 --- a/src/test/java/com/j256/ormlite/stmt/query/BetweenTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/query/BetweenTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -7,8 +7,8 @@ import org.junit.Test; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.BaseCoreStmtTest; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.BaseCoreStmtTest; public class BetweenTest extends BaseCoreStmtTest { diff --git a/src/test/java/com/j256/ormlite/stmt/query/InSubQueryTest.java b/src/test/java/com/j256/ormlite/core/stmt/query/InSubQueryTest.java similarity index 86% rename from src/test/java/com/j256/ormlite/stmt/query/InSubQueryTest.java rename to src/test/java/com/j256/ormlite/core/stmt/query/InSubQueryTest.java index 47fbf4b28..c3efbf064 100644 --- a/src/test/java/com/j256/ormlite/stmt/query/InSubQueryTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/query/InSubQueryTest.java @@ -1,14 +1,14 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import java.sql.SQLException; import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.BaseDaoImpl; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.stmt.QueryBuilder; -import com.j256.ormlite.stmt.Where; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.BaseDaoImpl; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.stmt.QueryBuilder; +import com.j256.ormlite.core.stmt.Where; public class InSubQueryTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/stmt/query/InTest.java b/src/test/java/com/j256/ormlite/core/stmt/query/InTest.java similarity index 88% rename from src/test/java/com/j256/ormlite/stmt/query/InTest.java rename to src/test/java/com/j256/ormlite/core/stmt/query/InTest.java index 84eb2235b..40e4c303a 100644 --- a/src/test/java/com/j256/ormlite/stmt/query/InTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/query/InTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import static org.junit.Assert.assertEquals; @@ -8,8 +8,8 @@ import org.junit.Test; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.BaseCoreStmtTest; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.BaseCoreStmtTest; public class InTest extends BaseCoreStmtTest { diff --git a/src/test/java/com/j256/ormlite/stmt/query/NotTest.java b/src/test/java/com/j256/ormlite/core/stmt/query/NotTest.java similarity index 89% rename from src/test/java/com/j256/ormlite/stmt/query/NotTest.java rename to src/test/java/com/j256/ormlite/core/stmt/query/NotTest.java index 3ccc8286d..588fde3c7 100644 --- a/src/test/java/com/j256/ormlite/stmt/query/NotTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/query/NotTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import static org.junit.Assert.assertTrue; @@ -7,9 +7,9 @@ import org.junit.Test; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.stmt.ArgumentHolder; -import com.j256.ormlite.stmt.BaseCoreStmtTest; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.stmt.ArgumentHolder; +import com.j256.ormlite.core.stmt.BaseCoreStmtTest; /** * Oh yes it _is_ a test, just of the NOT operation. diff --git a/src/test/java/com/j256/ormlite/stmt/query/SetValueTest.java b/src/test/java/com/j256/ormlite/core/stmt/query/SetValueTest.java similarity index 85% rename from src/test/java/com/j256/ormlite/stmt/query/SetValueTest.java rename to src/test/java/com/j256/ormlite/core/stmt/query/SetValueTest.java index ed9c85236..6a2d61b40 100644 --- a/src/test/java/com/j256/ormlite/stmt/query/SetValueTest.java +++ b/src/test/java/com/j256/ormlite/core/stmt/query/SetValueTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.stmt.query; +package com.j256.ormlite.core.stmt.query; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -7,11 +7,11 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.stmt.UpdateBuilder; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.stmt.UpdateBuilder; public class SetValueTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/support/BaseConnectionSourceTest.java b/src/test/java/com/j256/ormlite/core/support/BaseConnectionSourceTest.java similarity index 94% rename from src/test/java/com/j256/ormlite/support/BaseConnectionSourceTest.java rename to src/test/java/com/j256/ormlite/core/support/BaseConnectionSourceTest.java index 2529ce9ae..a3ccc8bc1 100644 --- a/src/test/java/com/j256/ormlite/support/BaseConnectionSourceTest.java +++ b/src/test/java/com/j256/ormlite/core/support/BaseConnectionSourceTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.support; +package com.j256.ormlite.core.support; import static org.easymock.EasyMock.createMock; import static org.junit.Assert.assertEquals; @@ -12,10 +12,10 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.logger.Logger; -import com.j256.ormlite.logger.LoggerFactory; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.logger.Logger; +import com.j256.ormlite.core.logger.LoggerFactory; public class BaseConnectionSourceTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/support/DatabaseConnectionProxyFactoryTest.java b/src/test/java/com/j256/ormlite/core/support/DatabaseConnectionProxyFactoryTest.java similarity index 93% rename from src/test/java/com/j256/ormlite/support/DatabaseConnectionProxyFactoryTest.java rename to src/test/java/com/j256/ormlite/core/support/DatabaseConnectionProxyFactoryTest.java index d38d2ab9d..aabfb81ae 100644 --- a/src/test/java/com/j256/ormlite/support/DatabaseConnectionProxyFactoryTest.java +++ b/src/test/java/com/j256/ormlite/core/support/DatabaseConnectionProxyFactoryTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.support; +package com.j256.ormlite.core.support; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -9,10 +9,10 @@ import org.junit.AfterClass; import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.h2.H2ConnectionSource; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.h2.H2ConnectionSource; /** * This test class is also a demonstration of how the {@link DatabaseConnectionProxyFactory} and diff --git a/src/test/java/com/j256/ormlite/support/DatabaseConnectionProxyTest.java b/src/test/java/com/j256/ormlite/core/support/DatabaseConnectionProxyTest.java similarity index 99% rename from src/test/java/com/j256/ormlite/support/DatabaseConnectionProxyTest.java rename to src/test/java/com/j256/ormlite/core/support/DatabaseConnectionProxyTest.java index ce5e91724..ad7ea85a3 100644 --- a/src/test/java/com/j256/ormlite/support/DatabaseConnectionProxyTest.java +++ b/src/test/java/com/j256/ormlite/core/support/DatabaseConnectionProxyTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.support; +package com.j256.ormlite.core.support; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -11,7 +11,7 @@ import org.junit.Test; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; public class DatabaseConnectionProxyTest { diff --git a/src/test/java/com/j256/ormlite/support/ReflectionDatabaseConnectionProxyFactoryTest.java b/src/test/java/com/j256/ormlite/core/support/ReflectionDatabaseConnectionProxyFactoryTest.java similarity index 88% rename from src/test/java/com/j256/ormlite/support/ReflectionDatabaseConnectionProxyFactoryTest.java rename to src/test/java/com/j256/ormlite/core/support/ReflectionDatabaseConnectionProxyFactoryTest.java index bad8d7dfc..ca33f7127 100644 --- a/src/test/java/com/j256/ormlite/support/ReflectionDatabaseConnectionProxyFactoryTest.java +++ b/src/test/java/com/j256/ormlite/core/support/ReflectionDatabaseConnectionProxyFactoryTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.support; +package com.j256.ormlite.core.support; import static org.junit.Assert.assertEquals; @@ -9,10 +9,10 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.h2.H2ConnectionSource; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.h2.H2ConnectionSource; public class ReflectionDatabaseConnectionProxyFactoryTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/table/DatabaseTableConfigLoaderTest.java b/src/test/java/com/j256/ormlite/core/table/DatabaseTableConfigLoaderTest.java similarity index 96% rename from src/test/java/com/j256/ormlite/table/DatabaseTableConfigLoaderTest.java rename to src/test/java/com/j256/ormlite/core/table/DatabaseTableConfigLoaderTest.java index 38dab87d0..78c5265da 100644 --- a/src/test/java/com/j256/ormlite/table/DatabaseTableConfigLoaderTest.java +++ b/src/test/java/com/j256/ormlite/core/table/DatabaseTableConfigLoaderTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.table; +package com.j256.ormlite.core.table; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -14,9 +14,9 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.junit.Test; -import com.j256.ormlite.field.DatabaseFieldConfig; -import com.j256.ormlite.field.DatabaseFieldConfigLoader; -import com.j256.ormlite.table.DatabaseTableConfigTest.NoFields; +import com.j256.ormlite.core.field.DatabaseFieldConfig; +import com.j256.ormlite.core.field.DatabaseFieldConfigLoader; +import com.j256.ormlite.core.table.DatabaseTableConfigTest.NoFields; public class DatabaseTableConfigLoaderTest { diff --git a/src/test/java/com/j256/ormlite/table/DatabaseTableConfigTest.java b/src/test/java/com/j256/ormlite/core/table/DatabaseTableConfigTest.java similarity index 96% rename from src/test/java/com/j256/ormlite/table/DatabaseTableConfigTest.java rename to src/test/java/com/j256/ormlite/core/table/DatabaseTableConfigTest.java index dbaa05a7c..c5fc92df0 100644 --- a/src/test/java/com/j256/ormlite/table/DatabaseTableConfigTest.java +++ b/src/test/java/com/j256/ormlite/core/table/DatabaseTableConfigTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.table; +package com.j256.ormlite.core.table; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -15,13 +15,13 @@ import org.junit.Test; -import com.j256.ormlite.db.BaseDatabaseType; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DataType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.DatabaseFieldConfig; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.support.ConnectionSource; +import com.j256.ormlite.core.db.BaseDatabaseType; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DataType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.DatabaseFieldConfig; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.support.ConnectionSource; public class DatabaseTableConfigTest { diff --git a/src/test/java/com/j256/ormlite/table/NoConstructor.java b/src/test/java/com/j256/ormlite/core/table/NoConstructor.java similarity index 76% rename from src/test/java/com/j256/ormlite/table/NoConstructor.java rename to src/test/java/com/j256/ormlite/core/table/NoConstructor.java index 73b9b000d..c61dbc47c 100644 --- a/src/test/java/com/j256/ormlite/table/NoConstructor.java +++ b/src/test/java/com/j256/ormlite/core/table/NoConstructor.java @@ -1,8 +1,8 @@ -package com.j256.ormlite.table; +package com.j256.ormlite.core.table; import org.junit.Ignore; -import com.j256.ormlite.field.DatabaseField; +import com.j256.ormlite.core.field.DatabaseField; /** * We have to have this here so the constructor can be invisible to the {@link DatabaseTableConfigTest}. diff --git a/src/test/java/com/j256/ormlite/table/TableInfoTest.java b/src/test/java/com/j256/ormlite/core/table/TableInfoTest.java similarity index 95% rename from src/test/java/com/j256/ormlite/table/TableInfoTest.java rename to src/test/java/com/j256/ormlite/core/table/TableInfoTest.java index 711901828..b834d0ba9 100644 --- a/src/test/java/com/j256/ormlite/table/TableInfoTest.java +++ b/src/test/java/com/j256/ormlite/core/table/TableInfoTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.table; +package com.j256.ormlite.core.table; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -12,11 +12,11 @@ import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.BaseDaoImpl; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.DatabaseFieldConfig; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.BaseDaoImpl; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.DatabaseFieldConfig; public class TableInfoTest extends BaseCoreTest { diff --git a/src/test/java/com/j256/ormlite/table/TableUtilsTest.java b/src/test/java/com/j256/ormlite/core/table/TableUtilsTest.java similarity index 97% rename from src/test/java/com/j256/ormlite/table/TableUtilsTest.java rename to src/test/java/com/j256/ormlite/core/table/TableUtilsTest.java index 1d66b404f..440ae156c 100644 --- a/src/test/java/com/j256/ormlite/table/TableUtilsTest.java +++ b/src/test/java/com/j256/ormlite/core/table/TableUtilsTest.java @@ -1,4 +1,4 @@ -package com.j256.ormlite.table; +package com.j256.ormlite.core.table; import static org.easymock.EasyMock.anyBoolean; import static org.easymock.EasyMock.anyInt; @@ -22,17 +22,17 @@ import org.easymock.IAnswer; import org.junit.Test; -import com.j256.ormlite.BaseCoreTest; -import com.j256.ormlite.dao.Dao; -import com.j256.ormlite.db.DatabaseType; -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.field.FieldType; -import com.j256.ormlite.h2.H2DatabaseType; -import com.j256.ormlite.stmt.StatementBuilder.StatementType; -import com.j256.ormlite.support.CompiledStatement; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.support.DatabaseConnection; -import com.j256.ormlite.support.DatabaseResults; +import com.j256.ormlite.core.BaseCoreTest; +import com.j256.ormlite.core.dao.Dao; +import com.j256.ormlite.core.db.DatabaseType; +import com.j256.ormlite.core.field.DatabaseField; +import com.j256.ormlite.core.field.FieldType; +import com.j256.ormlite.core.h2.H2DatabaseType; +import com.j256.ormlite.core.stmt.StatementBuilder.StatementType; +import com.j256.ormlite.core.support.CompiledStatement; +import com.j256.ormlite.core.support.ConnectionSource; +import com.j256.ormlite.core.support.DatabaseConnection; +import com.j256.ormlite.core.support.DatabaseResults; public class TableUtilsTest extends BaseCoreTest {