diff --git a/.idea/misc.xml b/.idea/misc.xml index 4fd4e788..4e260bb6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,7 @@ - + diff --git a/.idea/scopes/Dialects.xml b/.idea/scopes/Dialects.xml index b4658411..858693e3 100644 --- a/.idea/scopes/Dialects.xml +++ b/.idea/scopes/Dialects.xml @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/.idea/scopes/Support_and_tests.xml b/.idea/scopes/Support_and_tests.xml index ffe10a30..ace3de7e 100644 --- a/.idea/scopes/Support_and_tests.xml +++ b/.idea/scopes/Support_and_tests.xml @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index ec7bccc8..cb39397a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +## x.x.x (yyyy-mm-dd) + +### Breaking changes + + - Renamed base package `fi.evident.dalesbred` to `org.dalesbred`. + - Other package renames: + - `fi.evident.dalesbred.dialects` -> `org.dalesbred.dialect` + - `fi.evident.dalesbred.lob` -> `org.dalesbred.datatype` + - `fi.evident.dalesbred.results` -> `org.dalesbred.result` + - `fi.evident.dalesbred.support` -> `org.dalesbred.integration` + - `fi.evident.dalesbred.tx` -> `org.dalesbred.transaction` + - Moved some classes to new packages: + - All annotations to `org.dalesbred.annotation` + - All transaction-related classes to `org.dalesbred.transaction`. + - `fi.evident.dalesbred.SqlQuery` -> `org.dalesbred.query.SqlQuery` + - `fi.evident.dalesbred.SqlArray` -> `org.dalesbred.datatype.SqlArray` + + - Moved classes that are technically `public`, but are not part of Dalesbred's supported + API to `org.dalesbred.internal`. + ## 0.8.0 (2015-04-08) - Support instantiating arrays and collections of instantiable types from database arrays. diff --git a/dalesbred-junit/src/main/java/org/dalesbred/junit/TestDatabaseProvider.java b/dalesbred-junit/src/main/java/org/dalesbred/junit/TestDatabaseProvider.java index d7f103a4..071b78b3 100644 --- a/dalesbred-junit/src/main/java/org/dalesbred/junit/TestDatabaseProvider.java +++ b/dalesbred-junit/src/main/java/org/dalesbred/junit/TestDatabaseProvider.java @@ -24,7 +24,7 @@ import org.dalesbred.Database; import org.dalesbred.connection.DriverManagerDataSourceProvider; -import org.dalesbred.dialects.Dialect; +import org.dalesbred.dialect.Dialect; import org.dalesbred.transaction.TransactionCallback; import org.jetbrains.annotations.NotNull; import org.junit.internal.AssumptionViolatedException; diff --git a/dalesbred-junit/src/test/java/org/dalesbred/junit/TestDatabaseProviderTest.java b/dalesbred-junit/src/test/java/org/dalesbred/junit/TestDatabaseProviderTest.java index 6fe45ef1..5df32c5b 100644 --- a/dalesbred-junit/src/test/java/org/dalesbred/junit/TestDatabaseProviderTest.java +++ b/dalesbred-junit/src/test/java/org/dalesbred/junit/TestDatabaseProviderTest.java @@ -23,7 +23,7 @@ package org.dalesbred.junit; import org.dalesbred.Database; -import org.dalesbred.dialects.DefaultDialect; +import org.dalesbred.dialect.DefaultDialect; import org.jetbrains.annotations.NotNull; import org.junit.Test; diff --git a/dalesbred/src/main/java/org/dalesbred/Database.java b/dalesbred/src/main/java/org/dalesbred/Database.java index 5aa1ad3d..a2c4de9f 100644 --- a/dalesbred/src/main/java/org/dalesbred/Database.java +++ b/dalesbred/src/main/java/org/dalesbred/Database.java @@ -22,15 +22,18 @@ package org.dalesbred; +import org.dalesbred.annotation.SQL; import org.dalesbred.connection.ConnectionProvider; import org.dalesbred.connection.DataSourceConnectionProvider; import org.dalesbred.connection.DriverManagerDataSourceProvider; -import org.dalesbred.dialects.Dialect; +import org.dalesbred.datatype.ConfidentialValue; +import org.dalesbred.dialect.Dialect; import org.dalesbred.instantiation.DefaultInstantiatorRegistry; import org.dalesbred.instantiation.InstantiatorRegistry; import org.dalesbred.instantiation.TypeConversionRegistry; -import org.dalesbred.results.*; -import org.dalesbred.support.proxy.TransactionalProxyFactory; +import org.dalesbred.integration.proxy.TransactionalProxyFactory; +import org.dalesbred.query.SqlQuery; +import org.dalesbred.result.*; import org.dalesbred.transaction.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -282,8 +285,8 @@ public T executeQuery(@NotNull ResultSetProcessor processor, @NotNull Sql return withCurrentTransaction(query, tx -> { logQuery(query); - try (PreparedStatement ps = tx.getConnection().prepareStatement(query.sql)) { - bindArguments(ps, query.args); + try (PreparedStatement ps = tx.getConnection().prepareStatement(query.getSql())) { + bindArguments(ps, query.getArguments()); long startTime = currentTimeMillis(); try (ResultSet resultSet = ps.executeQuery()) { @@ -495,8 +498,8 @@ public int update(@NotNull SqlQuery query) { return withCurrentTransaction(query, tx -> { logQuery(query); - try (PreparedStatement ps = tx.getConnection().prepareStatement(query.sql)) { - bindArguments(ps, query.args); + try (PreparedStatement ps = tx.getConnection().prepareStatement(query.getSql())) { + bindArguments(ps, query.getArguments()); long startTime = currentTimeMillis(); int count = ps.executeUpdate(); logQueryExecution(query, currentTimeMillis() - startTime); @@ -525,8 +528,8 @@ public T updateAndProcessGeneratedKeys(@NotNull ResultSetProcessor genera return withCurrentTransaction(query, tx -> { logQuery(query); - try (PreparedStatement ps = prepareStatement(tx.getConnection(), query.sql, columnNames)) { - bindArguments(ps, query.args); + try (PreparedStatement ps = prepareStatement(tx.getConnection(), query.getSql(), columnNames)) { + bindArguments(ps, query.getArguments()); long startTime = currentTimeMillis(); ps.executeUpdate(); logQueryExecution(query, currentTimeMillis() - startTime); @@ -590,7 +593,18 @@ private void bindArguments(@NotNull PreparedStatement ps, @NotNull Iterable a int i = 1; for (Object arg : args) - dialect.bindArgument(ps, i++, instantiatorRegistry.valueToDatabase(SqlQuery.unwrapConfidential(arg))); + dialect.bindArgument(ps, i++, instantiatorRegistry.valueToDatabase(unwrapConfidential(arg))); + } + + /** + * If the argument is a confidential value, returns it unwrapped, otherwise returns the value as it is. + */ + @Nullable + private static Object unwrapConfidential(@Nullable Object arg) { + if (arg instanceof ConfidentialValue) + return ((ConfidentialValue) arg).getValue(); + else + return arg; } @NotNull diff --git a/dalesbred/src/main/java/org/dalesbred/DatabaseException.java b/dalesbred/src/main/java/org/dalesbred/DatabaseException.java index ba68c04e..2cd68789 100644 --- a/dalesbred/src/main/java/org/dalesbred/DatabaseException.java +++ b/dalesbred/src/main/java/org/dalesbred/DatabaseException.java @@ -22,6 +22,7 @@ package org.dalesbred; +import org.dalesbred.query.SqlQuery; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/dalesbred/src/main/java/org/dalesbred/DebugContext.java b/dalesbred/src/main/java/org/dalesbred/DebugContext.java index 0a153017..4118a8b7 100644 --- a/dalesbred/src/main/java/org/dalesbred/DebugContext.java +++ b/dalesbred/src/main/java/org/dalesbred/DebugContext.java @@ -22,6 +22,7 @@ package org.dalesbred; +import org.dalesbred.query.SqlQuery; import org.jetbrains.annotations.Nullable; final class DebugContext { diff --git a/dalesbred/src/main/java/org/dalesbred/NonUniqueResultException.java b/dalesbred/src/main/java/org/dalesbred/NonUniqueResultException.java index fb27fbaa..4e52d1a7 100644 --- a/dalesbred/src/main/java/org/dalesbred/NonUniqueResultException.java +++ b/dalesbred/src/main/java/org/dalesbred/NonUniqueResultException.java @@ -22,6 +22,8 @@ package org.dalesbred; +import org.dalesbred.query.SqlQuery; + /** * Exception thrown when expecting a unique result from a call, but invalid number * of results was returned by the database. diff --git a/dalesbred/src/main/java/org/dalesbred/DalesbredIgnore.java b/dalesbred/src/main/java/org/dalesbred/annotation/DalesbredIgnore.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/DalesbredIgnore.java rename to dalesbred/src/main/java/org/dalesbred/annotation/DalesbredIgnore.java index 89a2b400..52833707 100644 --- a/dalesbred/src/main/java/org/dalesbred/DalesbredIgnore.java +++ b/dalesbred/src/main/java/org/dalesbred/annotation/DalesbredIgnore.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred; +package org.dalesbred.annotation; import java.lang.annotation.*; diff --git a/dalesbred/src/main/java/org/dalesbred/Reflective.java b/dalesbred/src/main/java/org/dalesbred/annotation/Reflective.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/Reflective.java rename to dalesbred/src/main/java/org/dalesbred/annotation/Reflective.java index c7ffec6d..2951a93a 100644 --- a/dalesbred/src/main/java/org/dalesbred/Reflective.java +++ b/dalesbred/src/main/java/org/dalesbred/annotation/Reflective.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred; +package org.dalesbred.annotation; /** * Annotation used for marking members that are only accessed reflectively, e.g. constructors diff --git a/dalesbred/src/main/java/org/dalesbred/SQL.java b/dalesbred/src/main/java/org/dalesbred/annotation/SQL.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/SQL.java rename to dalesbred/src/main/java/org/dalesbred/annotation/SQL.java index 153e11e0..c392792a 100644 --- a/dalesbred/src/main/java/org/dalesbred/SQL.java +++ b/dalesbred/src/main/java/org/dalesbred/annotation/SQL.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred; +package org.dalesbred.annotation; import org.intellij.lang.annotations.Language; diff --git a/dalesbred/src/main/java/org/dalesbred/datatype/ConfidentialValue.java b/dalesbred/src/main/java/org/dalesbred/datatype/ConfidentialValue.java new file mode 100644 index 00000000..09389a96 --- /dev/null +++ b/dalesbred/src/main/java/org/dalesbred/datatype/ConfidentialValue.java @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2015 Evident Solutions Oy + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +package org.dalesbred.datatype; + +import org.jetbrains.annotations.Nullable; + +/** + * Confidential wrapper for objects. You can bind ConfidentialValues as query + * parameters which will execute th + * will not reveal their representation in toString, but + */ +public final class ConfidentialValue { + + @Nullable + private final Object value; + + public ConfidentialValue(@Nullable Object value) { + this.value = value; + } + + /** + * Wraps the value in a confidential wrapper which prevents it from ever being shown + * in any logs or stack-traces, but it can still be used normally as a query-parameter. + */ + public static Object confidential(Object value) { + return new ConfidentialValue(value); + } + + @Nullable + public Object getValue() { + return value; + } + + @Override + public String toString() { + return "****"; + } + + @Override + public boolean equals(Object obj) { + if (obj == this) return true; + + if (obj instanceof ConfidentialValue) { + ConfidentialValue rhs = (ConfidentialValue) obj; + return (value == null) ? rhs.value == null : value.equals(rhs.value); + } + + return false; + } + + @Override + public int hashCode() { + return (value != null) ? value.hashCode() : 0; + } +} diff --git a/dalesbred/src/main/java/org/dalesbred/lob/InputStreamWithSize.java b/dalesbred/src/main/java/org/dalesbred/datatype/InputStreamWithSize.java similarity index 98% rename from dalesbred/src/main/java/org/dalesbred/lob/InputStreamWithSize.java rename to dalesbred/src/main/java/org/dalesbred/datatype/InputStreamWithSize.java index 97922d26..a61a9819 100644 --- a/dalesbred/src/main/java/org/dalesbred/lob/InputStreamWithSize.java +++ b/dalesbred/src/main/java/org/dalesbred/datatype/InputStreamWithSize.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.lob; +package org.dalesbred.datatype; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/main/java/org/dalesbred/lob/ReaderWithSize.java b/dalesbred/src/main/java/org/dalesbred/datatype/ReaderWithSize.java similarity index 98% rename from dalesbred/src/main/java/org/dalesbred/lob/ReaderWithSize.java rename to dalesbred/src/main/java/org/dalesbred/datatype/ReaderWithSize.java index b603f968..a9eb8bd1 100644 --- a/dalesbred/src/main/java/org/dalesbred/lob/ReaderWithSize.java +++ b/dalesbred/src/main/java/org/dalesbred/datatype/ReaderWithSize.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.lob; +package org.dalesbred.datatype; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/main/java/org/dalesbred/SqlArray.java b/dalesbred/src/main/java/org/dalesbred/datatype/SqlArray.java similarity index 99% rename from dalesbred/src/main/java/org/dalesbred/SqlArray.java rename to dalesbred/src/main/java/org/dalesbred/datatype/SqlArray.java index 2228cb07..39023456 100644 --- a/dalesbred/src/main/java/org/dalesbred/SqlArray.java +++ b/dalesbred/src/main/java/org/dalesbred/datatype/SqlArray.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred; +package org.dalesbred.datatype; import org.dalesbred.internal.utils.Require; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/main/java/org/dalesbred/lob/package-info.java b/dalesbred/src/main/java/org/dalesbred/datatype/package-info.java similarity index 94% rename from dalesbred/src/main/java/org/dalesbred/lob/package-info.java rename to dalesbred/src/main/java/org/dalesbred/datatype/package-info.java index 0fcf469f..474fd722 100644 --- a/dalesbred/src/main/java/org/dalesbred/lob/package-info.java +++ b/dalesbred/src/main/java/org/dalesbred/datatype/package-info.java @@ -21,6 +21,6 @@ */ /** - * Support for handling large objects. + * Special data types. */ -package org.dalesbred.lob; +package org.dalesbred.datatype; diff --git a/dalesbred/src/main/java/org/dalesbred/dialects/ArgumentBinder.java b/dalesbred/src/main/java/org/dalesbred/dialect/ArgumentBinder.java similarity index 96% rename from dalesbred/src/main/java/org/dalesbred/dialects/ArgumentBinder.java rename to dalesbred/src/main/java/org/dalesbred/dialect/ArgumentBinder.java index eff6cd52..e9cafe36 100644 --- a/dalesbred/src/main/java/org/dalesbred/dialects/ArgumentBinder.java +++ b/dalesbred/src/main/java/org/dalesbred/dialect/ArgumentBinder.java @@ -20,11 +20,11 @@ * THE SOFTWARE. */ -package org.dalesbred.dialects; +package org.dalesbred.dialect; -import org.dalesbred.SqlArray; -import org.dalesbred.lob.InputStreamWithSize; -import org.dalesbred.lob.ReaderWithSize; +import org.dalesbred.datatype.InputStreamWithSize; +import org.dalesbred.datatype.ReaderWithSize; +import org.dalesbred.datatype.SqlArray; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.w3c.dom.Document; diff --git a/dalesbred/src/main/java/org/dalesbred/dialects/DefaultDialect.java b/dalesbred/src/main/java/org/dalesbred/dialect/DefaultDialect.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/dialects/DefaultDialect.java rename to dalesbred/src/main/java/org/dalesbred/dialect/DefaultDialect.java index 6a10a3a0..3787e373 100644 --- a/dalesbred/src/main/java/org/dalesbred/dialects/DefaultDialect.java +++ b/dalesbred/src/main/java/org/dalesbred/dialect/DefaultDialect.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.dialects; +package org.dalesbred.dialect; /** * Default dialect used for databases that don't have special support. diff --git a/dalesbred/src/main/java/org/dalesbred/dialects/Dialect.java b/dalesbred/src/main/java/org/dalesbred/dialect/Dialect.java similarity index 99% rename from dalesbred/src/main/java/org/dalesbred/dialects/Dialect.java rename to dalesbred/src/main/java/org/dalesbred/dialect/Dialect.java index 87dad9c6..e9fd3ce3 100644 --- a/dalesbred/src/main/java/org/dalesbred/dialects/Dialect.java +++ b/dalesbred/src/main/java/org/dalesbred/dialect/Dialect.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.dialects; +package org.dalesbred.dialect; import org.dalesbred.DatabaseException; import org.dalesbred.DatabaseSQLException; diff --git a/dalesbred/src/main/java/org/dalesbred/dialects/HsqldbDialect.java b/dalesbred/src/main/java/org/dalesbred/dialect/HsqldbDialect.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/dialects/HsqldbDialect.java rename to dalesbred/src/main/java/org/dalesbred/dialect/HsqldbDialect.java index 294adc98..ca938faa 100644 --- a/dalesbred/src/main/java/org/dalesbred/dialects/HsqldbDialect.java +++ b/dalesbred/src/main/java/org/dalesbred/dialect/HsqldbDialect.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.dialects; +package org.dalesbred.dialect; /** * Support for HSQLDB. diff --git a/dalesbred/src/main/java/org/dalesbred/dialects/MySQLDialect.java b/dalesbred/src/main/java/org/dalesbred/dialect/MySQLDialect.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/dialects/MySQLDialect.java rename to dalesbred/src/main/java/org/dalesbred/dialect/MySQLDialect.java index 7136f690..521235f3 100644 --- a/dalesbred/src/main/java/org/dalesbred/dialects/MySQLDialect.java +++ b/dalesbred/src/main/java/org/dalesbred/dialect/MySQLDialect.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.dialects; +package org.dalesbred.dialect; /** * Support for MySQL. diff --git a/dalesbred/src/main/java/org/dalesbred/dialects/OracleDialect.java b/dalesbred/src/main/java/org/dalesbred/dialect/OracleDialect.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/dialects/OracleDialect.java rename to dalesbred/src/main/java/org/dalesbred/dialect/OracleDialect.java index 65c4c72d..d6c57338 100644 --- a/dalesbred/src/main/java/org/dalesbred/dialects/OracleDialect.java +++ b/dalesbred/src/main/java/org/dalesbred/dialect/OracleDialect.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.dialects; +package org.dalesbred.dialect; /** * Support for Oracle. diff --git a/dalesbred/src/main/java/org/dalesbred/dialects/PostgreSQLDialect.java b/dalesbred/src/main/java/org/dalesbred/dialect/PostgreSQLDialect.java similarity index 98% rename from dalesbred/src/main/java/org/dalesbred/dialects/PostgreSQLDialect.java rename to dalesbred/src/main/java/org/dalesbred/dialect/PostgreSQLDialect.java index 5bd9c85c..c98bb7c8 100644 --- a/dalesbred/src/main/java/org/dalesbred/dialects/PostgreSQLDialect.java +++ b/dalesbred/src/main/java/org/dalesbred/dialect/PostgreSQLDialect.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.dialects; +package org.dalesbred.dialect; import org.dalesbred.instantiation.TypeConversion; import org.dalesbred.instantiation.TypeConversionRegistry; diff --git a/dalesbred/src/main/java/org/dalesbred/dialects/SQLServerDialect.java b/dalesbred/src/main/java/org/dalesbred/dialect/SQLServerDialect.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/dialects/SQLServerDialect.java rename to dalesbred/src/main/java/org/dalesbred/dialect/SQLServerDialect.java index e60d43e1..caa3450a 100644 --- a/dalesbred/src/main/java/org/dalesbred/dialects/SQLServerDialect.java +++ b/dalesbred/src/main/java/org/dalesbred/dialect/SQLServerDialect.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.dialects; +package org.dalesbred.dialect; /** * Support for Microsoft SQL Server. diff --git a/dalesbred/src/main/java/org/dalesbred/dialects/package-info.java b/dalesbred/src/main/java/org/dalesbred/dialect/package-info.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/dialects/package-info.java rename to dalesbred/src/main/java/org/dalesbred/dialect/package-info.java index ece22e7e..47e5fc03 100644 --- a/dalesbred/src/main/java/org/dalesbred/dialects/package-info.java +++ b/dalesbred/src/main/java/org/dalesbred/dialect/package-info.java @@ -23,4 +23,4 @@ /** * Support for different databases. */ -package org.dalesbred.dialects; +package org.dalesbred.dialect; diff --git a/dalesbred/src/main/java/org/dalesbred/instantiation/DefaultInstantiatorRegistry.java b/dalesbred/src/main/java/org/dalesbred/instantiation/DefaultInstantiatorRegistry.java index e1213177..f098fdf4 100644 --- a/dalesbred/src/main/java/org/dalesbred/instantiation/DefaultInstantiatorRegistry.java +++ b/dalesbred/src/main/java/org/dalesbred/instantiation/DefaultInstantiatorRegistry.java @@ -22,11 +22,11 @@ package org.dalesbred.instantiation; -import org.dalesbred.DalesbredIgnore; -import org.dalesbred.dialects.Dialect; -import org.dalesbred.support.java8.JavaTimeTypeConversions; -import org.dalesbred.support.joda.JodaTypeConversions; -import org.dalesbred.support.threeten.ThreeTenTypeConversions; +import org.dalesbred.annotation.DalesbredIgnore; +import org.dalesbred.dialect.Dialect; +import org.dalesbred.integration.java8.JavaTimeTypeConversions; +import org.dalesbred.integration.joda.JodaTypeConversions; +import org.dalesbred.integration.threeten.ThreeTenTypeConversions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/dalesbred/src/main/java/org/dalesbred/instantiation/PropertyAccessor.java b/dalesbred/src/main/java/org/dalesbred/instantiation/PropertyAccessor.java index c02ebbe7..e5e766b8 100644 --- a/dalesbred/src/main/java/org/dalesbred/instantiation/PropertyAccessor.java +++ b/dalesbred/src/main/java/org/dalesbred/instantiation/PropertyAccessor.java @@ -22,7 +22,7 @@ package org.dalesbred.instantiation; -import org.dalesbred.DalesbredIgnore; +import org.dalesbred.annotation.DalesbredIgnore; import org.dalesbred.internal.utils.Throwables; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/dalesbred/src/main/java/org/dalesbred/support/aopalliance/AopAllianceTransactionalMethodInterceptor.java b/dalesbred/src/main/java/org/dalesbred/integration/aopalliance/AopAllianceTransactionalMethodInterceptor.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/support/aopalliance/AopAllianceTransactionalMethodInterceptor.java rename to dalesbred/src/main/java/org/dalesbred/integration/aopalliance/AopAllianceTransactionalMethodInterceptor.java index 61e9896d..4214d39d 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/aopalliance/AopAllianceTransactionalMethodInterceptor.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/aopalliance/AopAllianceTransactionalMethodInterceptor.java @@ -20,13 +20,13 @@ * THE SOFTWARE. */ -package org.dalesbred.support.aopalliance; +package org.dalesbred.integration.aopalliance; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.dalesbred.Database; +import org.dalesbred.integration.guice.GuiceSupport; import org.dalesbred.internal.utils.Require; -import org.dalesbred.support.guice.GuiceSupport; import org.dalesbred.transaction.TransactionSettings; import org.dalesbred.transaction.Transactional; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/main/java/org/dalesbred/support/aopalliance/package-info.java b/dalesbred/src/main/java/org/dalesbred/integration/aopalliance/package-info.java similarity index 96% rename from dalesbred/src/main/java/org/dalesbred/support/aopalliance/package-info.java rename to dalesbred/src/main/java/org/dalesbred/integration/aopalliance/package-info.java index 751f8192..57836a99 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/aopalliance/package-info.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/aopalliance/package-info.java @@ -24,4 +24,4 @@ * Interceptors for AOP Alliance -compatible * containers (such as Guice and Spring). */ -package org.dalesbred.support.aopalliance; +package org.dalesbred.integration.aopalliance; diff --git a/dalesbred/src/main/java/org/dalesbred/support/guice/DataSourceDatabaseModule.java b/dalesbred/src/main/java/org/dalesbred/integration/guice/DataSourceDatabaseModule.java similarity index 94% rename from dalesbred/src/main/java/org/dalesbred/support/guice/DataSourceDatabaseModule.java rename to dalesbred/src/main/java/org/dalesbred/integration/guice/DataSourceDatabaseModule.java index 854a44b4..56131b56 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/guice/DataSourceDatabaseModule.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/guice/DataSourceDatabaseModule.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support.guice; +package org.dalesbred.integration.guice; import com.google.inject.AbstractModule; import com.google.inject.Key; @@ -29,8 +29,8 @@ import javax.inject.Singleton; +import static org.dalesbred.integration.guice.GuiceSupport.bindTransactionInterceptor; import static org.dalesbred.internal.utils.Require.requireNonNull; -import static org.dalesbred.support.guice.GuiceSupport.bindTransactionInterceptor; /** * A Guice module for configuring the database using a {@link javax.sql.DataSource}. diff --git a/dalesbred/src/main/java/org/dalesbred/support/guice/DatabaseProvider.java b/dalesbred/src/main/java/org/dalesbred/integration/guice/DatabaseProvider.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/support/guice/DatabaseProvider.java rename to dalesbred/src/main/java/org/dalesbred/integration/guice/DatabaseProvider.java index 76e09428..0c38710f 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/guice/DatabaseProvider.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/guice/DatabaseProvider.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support.guice; +package org.dalesbred.integration.guice; import com.google.inject.Injector; import com.google.inject.Provider; diff --git a/dalesbred/src/main/java/org/dalesbred/support/guice/DriverManagerDatabaseModule.java b/dalesbred/src/main/java/org/dalesbred/integration/guice/DriverManagerDatabaseModule.java similarity index 98% rename from dalesbred/src/main/java/org/dalesbred/support/guice/DriverManagerDatabaseModule.java rename to dalesbred/src/main/java/org/dalesbred/integration/guice/DriverManagerDatabaseModule.java index 9f9896b9..883e4299 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/guice/DriverManagerDatabaseModule.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/guice/DriverManagerDatabaseModule.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support.guice; +package org.dalesbred.integration.guice; import com.google.inject.AbstractModule; import com.google.inject.Key; diff --git a/dalesbred/src/main/java/org/dalesbred/support/guice/GuiceSupport.java b/dalesbred/src/main/java/org/dalesbred/integration/guice/GuiceSupport.java similarity index 94% rename from dalesbred/src/main/java/org/dalesbred/support/guice/GuiceSupport.java rename to dalesbred/src/main/java/org/dalesbred/integration/guice/GuiceSupport.java index bc5f5aab..19e06644 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/guice/GuiceSupport.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/guice/GuiceSupport.java @@ -20,14 +20,14 @@ * THE SOFTWARE. */ -package org.dalesbred.support.guice; +package org.dalesbred.integration.guice; import com.google.inject.Binder; import com.google.inject.Key; import com.google.inject.Provider; import org.aopalliance.intercept.MethodInterceptor; import org.dalesbred.Database; -import org.dalesbred.support.aopalliance.AopAllianceTransactionalMethodInterceptor; +import org.dalesbred.integration.aopalliance.AopAllianceTransactionalMethodInterceptor; import org.dalesbred.transaction.Transactional; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/main/java/org/dalesbred/support/guice/package-info.java b/dalesbred/src/main/java/org/dalesbred/integration/guice/package-info.java similarity index 96% rename from dalesbred/src/main/java/org/dalesbred/support/guice/package-info.java rename to dalesbred/src/main/java/org/dalesbred/integration/guice/package-info.java index 784a6577..329391c1 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/guice/package-info.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/guice/package-info.java @@ -23,4 +23,4 @@ /** * Support for Guice. */ -package org.dalesbred.support.guice; +package org.dalesbred.integration.guice; diff --git a/dalesbred/src/main/java/org/dalesbred/support/java8/JavaTimeTypeConversions.java b/dalesbred/src/main/java/org/dalesbred/integration/java8/JavaTimeTypeConversions.java similarity index 99% rename from dalesbred/src/main/java/org/dalesbred/support/java8/JavaTimeTypeConversions.java rename to dalesbred/src/main/java/org/dalesbred/integration/java8/JavaTimeTypeConversions.java index 288c1f97..cbdc9fda 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/java8/JavaTimeTypeConversions.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/java8/JavaTimeTypeConversions.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support.java8; +package org.dalesbred.integration.java8; import org.dalesbred.instantiation.TypeConversion; import org.dalesbred.instantiation.TypeConversionRegistry; diff --git a/dalesbred/src/main/java/org/dalesbred/support/java8/package-info.java b/dalesbred/src/main/java/org/dalesbred/integration/java8/package-info.java similarity index 96% rename from dalesbred/src/main/java/org/dalesbred/support/java8/package-info.java rename to dalesbred/src/main/java/org/dalesbred/integration/java8/package-info.java index 4b1a093c..0c33c437 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/java8/package-info.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/java8/package-info.java @@ -23,4 +23,4 @@ /** * Support for java.time classes included in Java8. */ -package org.dalesbred.support.java8; +package org.dalesbred.integration.java8; diff --git a/dalesbred/src/main/java/org/dalesbred/support/joda/JodaTypeConversions.java b/dalesbred/src/main/java/org/dalesbred/integration/joda/JodaTypeConversions.java similarity index 99% rename from dalesbred/src/main/java/org/dalesbred/support/joda/JodaTypeConversions.java rename to dalesbred/src/main/java/org/dalesbred/integration/joda/JodaTypeConversions.java index a53b75dc..d73d1e5d 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/joda/JodaTypeConversions.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/joda/JodaTypeConversions.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support.joda; +package org.dalesbred.integration.joda; import org.dalesbred.instantiation.TypeConversion; import org.dalesbred.instantiation.TypeConversionRegistry; diff --git a/dalesbred/src/main/java/org/dalesbred/support/joda/package-info.java b/dalesbred/src/main/java/org/dalesbred/integration/joda/package-info.java similarity index 96% rename from dalesbred/src/main/java/org/dalesbred/support/joda/package-info.java rename to dalesbred/src/main/java/org/dalesbred/integration/joda/package-info.java index 72d58a2a..a935cf08 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/joda/package-info.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/joda/package-info.java @@ -23,4 +23,4 @@ /** * Support for Joda Time. */ -package org.dalesbred.support.joda; +package org.dalesbred.integration.joda; diff --git a/dalesbred/src/main/java/org/dalesbred/support/proxy/TransactionalProxyFactory.java b/dalesbred/src/main/java/org/dalesbred/integration/proxy/TransactionalProxyFactory.java similarity index 99% rename from dalesbred/src/main/java/org/dalesbred/support/proxy/TransactionalProxyFactory.java rename to dalesbred/src/main/java/org/dalesbred/integration/proxy/TransactionalProxyFactory.java index 074c63e0..0d563390 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/proxy/TransactionalProxyFactory.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/proxy/TransactionalProxyFactory.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support.proxy; +package org.dalesbred.integration.proxy; import org.dalesbred.Database; import org.dalesbred.internal.utils.Require; diff --git a/dalesbred/src/main/java/org/dalesbred/support/proxy/package-info.java b/dalesbred/src/main/java/org/dalesbred/integration/proxy/package-info.java similarity index 96% rename from dalesbred/src/main/java/org/dalesbred/support/proxy/package-info.java rename to dalesbred/src/main/java/org/dalesbred/integration/proxy/package-info.java index 9bad44a0..b60e334b 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/proxy/package-info.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/proxy/package-info.java @@ -23,4 +23,4 @@ /** * Support for creating transactional proxies. */ -package org.dalesbred.support.proxy; +package org.dalesbred.integration.proxy; diff --git a/dalesbred/src/main/java/org/dalesbred/support/spring/DalesbredConfigurationSupport.java b/dalesbred/src/main/java/org/dalesbred/integration/spring/DalesbredConfigurationSupport.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/support/spring/DalesbredConfigurationSupport.java rename to dalesbred/src/main/java/org/dalesbred/integration/spring/DalesbredConfigurationSupport.java index 76ee9fa7..366b365d 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/spring/DalesbredConfigurationSupport.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/spring/DalesbredConfigurationSupport.java @@ -19,10 +19,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package org.dalesbred.support.spring; + +package org.dalesbred.integration.spring; import org.dalesbred.Database; -import org.dalesbred.dialects.Dialect; +import org.dalesbred.dialect.Dialect; import org.dalesbred.instantiation.InstantiatorRegistry; import org.dalesbred.instantiation.TypeConversionRegistry; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/main/java/org/dalesbred/support/spring/DalesbredSpringAnnotationParser.java b/dalesbred/src/main/java/org/dalesbred/integration/spring/DalesbredSpringAnnotationParser.java similarity index 98% rename from dalesbred/src/main/java/org/dalesbred/support/spring/DalesbredSpringAnnotationParser.java rename to dalesbred/src/main/java/org/dalesbred/integration/spring/DalesbredSpringAnnotationParser.java index 57efdfb4..1a0d70b4 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/spring/DalesbredSpringAnnotationParser.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/spring/DalesbredSpringAnnotationParser.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support.spring; +package org.dalesbred.integration.spring; import org.dalesbred.transaction.Transactional; import org.jetbrains.annotations.Nullable; diff --git a/dalesbred/src/main/java/org/dalesbred/support/spring/SpringTransactionContext.java b/dalesbred/src/main/java/org/dalesbred/integration/spring/SpringTransactionContext.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/support/spring/SpringTransactionContext.java rename to dalesbred/src/main/java/org/dalesbred/integration/spring/SpringTransactionContext.java index 574ddf6d..05ca6b62 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/spring/SpringTransactionContext.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/spring/SpringTransactionContext.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support.spring; +package org.dalesbred.integration.spring; import org.dalesbred.transaction.TransactionContext; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/main/java/org/dalesbred/support/spring/SpringTransactionManager.java b/dalesbred/src/main/java/org/dalesbred/integration/spring/SpringTransactionManager.java similarity index 98% rename from dalesbred/src/main/java/org/dalesbred/support/spring/SpringTransactionManager.java rename to dalesbred/src/main/java/org/dalesbred/integration/spring/SpringTransactionManager.java index ac2a114f..68d59bff 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/spring/SpringTransactionManager.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/spring/SpringTransactionManager.java @@ -20,11 +20,11 @@ * THE SOFTWARE. */ -package org.dalesbred.support.spring; +package org.dalesbred.integration.spring; import org.dalesbred.DatabaseException; import org.dalesbred.connection.ConnectionProvider; -import org.dalesbred.dialects.Dialect; +import org.dalesbred.dialect.Dialect; import org.dalesbred.internal.utils.Require; import org.dalesbred.transaction.*; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/main/java/org/dalesbred/support/spring/package-info.java b/dalesbred/src/main/java/org/dalesbred/integration/spring/package-info.java similarity index 96% rename from dalesbred/src/main/java/org/dalesbred/support/spring/package-info.java rename to dalesbred/src/main/java/org/dalesbred/integration/spring/package-info.java index a810564a..63f37234 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/spring/package-info.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/spring/package-info.java @@ -23,4 +23,4 @@ /** * Support for Spring Framework. */ -package org.dalesbred.support.spring; +package org.dalesbred.integration.spring; diff --git a/dalesbred/src/main/java/org/dalesbred/support/threeten/ThreeTenTypeConversions.java b/dalesbred/src/main/java/org/dalesbred/integration/threeten/ThreeTenTypeConversions.java similarity index 99% rename from dalesbred/src/main/java/org/dalesbred/support/threeten/ThreeTenTypeConversions.java rename to dalesbred/src/main/java/org/dalesbred/integration/threeten/ThreeTenTypeConversions.java index badd1544..2723dac0 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/threeten/ThreeTenTypeConversions.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/threeten/ThreeTenTypeConversions.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support.threeten; +package org.dalesbred.integration.threeten; import org.dalesbred.instantiation.TypeConversion; import org.dalesbred.instantiation.TypeConversionRegistry; diff --git a/dalesbred/src/main/java/org/dalesbred/support/threeten/package-info.java b/dalesbred/src/main/java/org/dalesbred/integration/threeten/package-info.java similarity index 96% rename from dalesbred/src/main/java/org/dalesbred/support/threeten/package-info.java rename to dalesbred/src/main/java/org/dalesbred/integration/threeten/package-info.java index 9e181d43..8dc6dac9 100644 --- a/dalesbred/src/main/java/org/dalesbred/support/threeten/package-info.java +++ b/dalesbred/src/main/java/org/dalesbred/integration/threeten/package-info.java @@ -23,4 +23,4 @@ /** * Support for ThreeTen. */ -package org.dalesbred.support.threeten; +package org.dalesbred.integration.threeten; diff --git a/dalesbred/src/main/java/org/dalesbred/internal/utils/package-info.java b/dalesbred/src/main/java/org/dalesbred/internal/utils/package-info.java index a3dc512d..912fef33 100644 --- a/dalesbred/src/main/java/org/dalesbred/internal/utils/package-info.java +++ b/dalesbred/src/main/java/org/dalesbred/internal/utils/package-info.java @@ -21,6 +21,6 @@ */ /** - * Various utility-classes. + * Internal utility classes. */ package org.dalesbred.internal.utils; diff --git a/dalesbred/src/main/java/org/dalesbred/query/NamedParameterQueries.java b/dalesbred/src/main/java/org/dalesbred/query/NamedParameterQueries.java index 2a228108..dae04d2e 100644 --- a/dalesbred/src/main/java/org/dalesbred/query/NamedParameterQueries.java +++ b/dalesbred/src/main/java/org/dalesbred/query/NamedParameterQueries.java @@ -22,8 +22,7 @@ package org.dalesbred.query; -import org.dalesbred.SQL; -import org.dalesbred.SqlQuery; +import org.dalesbred.annotation.SQL; import org.jetbrains.annotations.NotNull; public final class NamedParameterQueries { diff --git a/dalesbred/src/main/java/org/dalesbred/query/NamedParameterSql.java b/dalesbred/src/main/java/org/dalesbred/query/NamedParameterSql.java index 06069aaa..98953b51 100644 --- a/dalesbred/src/main/java/org/dalesbred/query/NamedParameterSql.java +++ b/dalesbred/src/main/java/org/dalesbred/query/NamedParameterSql.java @@ -22,8 +22,7 @@ package org.dalesbred.query; -import org.dalesbred.SQL; -import org.dalesbred.SqlQuery; +import org.dalesbred.annotation.SQL; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; diff --git a/dalesbred/src/main/java/org/dalesbred/query/NamedParameterSqlParser.java b/dalesbred/src/main/java/org/dalesbred/query/NamedParameterSqlParser.java index da60f488..66a6276b 100644 --- a/dalesbred/src/main/java/org/dalesbred/query/NamedParameterSqlParser.java +++ b/dalesbred/src/main/java/org/dalesbred/query/NamedParameterSqlParser.java @@ -22,8 +22,8 @@ package org.dalesbred.query; -import org.dalesbred.SQL; import org.dalesbred.SqlSyntaxException; +import org.dalesbred.annotation.SQL; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/dalesbred/src/main/java/org/dalesbred/query/QueryBuilder.java b/dalesbred/src/main/java/org/dalesbred/query/QueryBuilder.java index 6fc19049..a7a939e5 100644 --- a/dalesbred/src/main/java/org/dalesbred/query/QueryBuilder.java +++ b/dalesbred/src/main/java/org/dalesbred/query/QueryBuilder.java @@ -22,7 +22,7 @@ package org.dalesbred.query; -import org.dalesbred.SqlQuery; +import org.dalesbred.datatype.ConfidentialValue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -135,7 +135,7 @@ public QueryBuilder addArgument(@Nullable Object argument) { */ @NotNull public QueryBuilder addConfidentialArgument(@Nullable Object argument) { - arguments.add(SqlQuery.confidential(argument)); + arguments.add(ConfidentialValue.confidential(argument)); return this; } diff --git a/dalesbred/src/main/java/org/dalesbred/SqlQuery.java b/dalesbred/src/main/java/org/dalesbred/query/SqlQuery.java similarity index 74% rename from dalesbred/src/main/java/org/dalesbred/SqlQuery.java rename to dalesbred/src/main/java/org/dalesbred/query/SqlQuery.java index 81f51283..4aee9272 100644 --- a/dalesbred/src/main/java/org/dalesbred/SqlQuery.java +++ b/dalesbred/src/main/java/org/dalesbred/query/SqlQuery.java @@ -20,14 +20,11 @@ * THE SOFTWARE. */ -package org.dalesbred; +package org.dalesbred.query; -import org.dalesbred.query.NamedParameterQueries; -import org.dalesbred.query.VariableResolutionException; -import org.dalesbred.query.VariableResolver; -import org.dalesbred.query.VariableResolvers; +import org.dalesbred.SqlSyntaxException; +import org.dalesbred.annotation.SQL; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.io.Serializable; import java.util.Iterator; @@ -45,8 +42,12 @@ */ public final class SqlQuery implements Serializable { - final String sql; - final List args; + @NotNull + private final String sql; + + @NotNull + private final List args; + private static final long serialVersionUID = 1; private SqlQuery(@NotNull @SQL String sql, @NotNull List args) { @@ -156,55 +157,4 @@ public boolean equals(Object obj) { public int hashCode() { return sql.hashCode() * 31 + args.hashCode(); } - - /** - * If the argument is a confidential value, returns it unwrapped, otherwise returns the value as it is. - */ - @Nullable - static Object unwrapConfidential(@Nullable Object arg) { - if (arg instanceof ConfidentialValue) - return ((ConfidentialValue) arg).value; - else - return arg; - } - - /** - * Wraps the value in a confidential wrapper which prevents it from ever being shown - * in any logs or stack-traces, but it can still be used normally as a query-parameter. - */ - public static Object confidential(Object value) { - return new ConfidentialValue(value); - } - - private static class ConfidentialValue { - - @Nullable - private final Object value; - - private ConfidentialValue(@Nullable Object value) { - this.value = value; - } - - @Override - public String toString() { - return "****"; - } - - @Override - public boolean equals(Object obj) { - if (obj == this) return true; - - if (obj instanceof ConfidentialValue) { - ConfidentialValue rhs = (ConfidentialValue) obj; - return (value == null) ? rhs.value == null : value.equals(rhs.value); - } - - return false; - } - - @Override - public int hashCode() { - return (value != null) ? value.hashCode() : 0; - } - } } diff --git a/dalesbred/src/main/java/org/dalesbred/query/package-info.java b/dalesbred/src/main/java/org/dalesbred/query/package-info.java index 7ea01f10..c0d55b35 100644 --- a/dalesbred/src/main/java/org/dalesbred/query/package-info.java +++ b/dalesbred/src/main/java/org/dalesbred/query/package-info.java @@ -21,6 +21,6 @@ */ /** - * Helpers for building {@link org.dalesbred.SqlQuery}-objects. + * Helpers for building {@link org.dalesbred.query.SqlQuery}-objects. */ package org.dalesbred.query; diff --git a/dalesbred/src/main/java/org/dalesbred/results/ListWithRowMapperResultSetProcessor.java b/dalesbred/src/main/java/org/dalesbred/result/ListWithRowMapperResultSetProcessor.java similarity index 98% rename from dalesbred/src/main/java/org/dalesbred/results/ListWithRowMapperResultSetProcessor.java rename to dalesbred/src/main/java/org/dalesbred/result/ListWithRowMapperResultSetProcessor.java index e2d7999b..3147e2e7 100644 --- a/dalesbred/src/main/java/org/dalesbred/results/ListWithRowMapperResultSetProcessor.java +++ b/dalesbred/src/main/java/org/dalesbred/result/ListWithRowMapperResultSetProcessor.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.results; +package org.dalesbred.result; import org.dalesbred.internal.utils.Require; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/main/java/org/dalesbred/results/MapResultSetProcessor.java b/dalesbred/src/main/java/org/dalesbred/result/MapResultSetProcessor.java similarity index 99% rename from dalesbred/src/main/java/org/dalesbred/results/MapResultSetProcessor.java rename to dalesbred/src/main/java/org/dalesbred/result/MapResultSetProcessor.java index d4cb7260..2fe6b44b 100644 --- a/dalesbred/src/main/java/org/dalesbred/results/MapResultSetProcessor.java +++ b/dalesbred/src/main/java/org/dalesbred/result/MapResultSetProcessor.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.results; +package org.dalesbred.result; import org.dalesbred.UnexpectedResultException; import org.dalesbred.instantiation.DefaultInstantiatorRegistry; diff --git a/dalesbred/src/main/java/org/dalesbred/results/ReflectionResultSetProcessor.java b/dalesbred/src/main/java/org/dalesbred/result/ReflectionResultSetProcessor.java similarity index 99% rename from dalesbred/src/main/java/org/dalesbred/results/ReflectionResultSetProcessor.java rename to dalesbred/src/main/java/org/dalesbred/result/ReflectionResultSetProcessor.java index f18c190b..40d70444 100644 --- a/dalesbred/src/main/java/org/dalesbred/results/ReflectionResultSetProcessor.java +++ b/dalesbred/src/main/java/org/dalesbred/result/ReflectionResultSetProcessor.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.results; +package org.dalesbred.result; import org.dalesbred.UnexpectedResultException; import org.dalesbred.instantiation.DefaultInstantiatorRegistry; diff --git a/dalesbred/src/main/java/org/dalesbred/results/ResultSetProcessor.java b/dalesbred/src/main/java/org/dalesbred/result/ResultSetProcessor.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/results/ResultSetProcessor.java rename to dalesbred/src/main/java/org/dalesbred/result/ResultSetProcessor.java index e384f631..4a624c94 100644 --- a/dalesbred/src/main/java/org/dalesbred/results/ResultSetProcessor.java +++ b/dalesbred/src/main/java/org/dalesbred/result/ResultSetProcessor.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.results; +package org.dalesbred.result; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/main/java/org/dalesbred/results/ResultTableResultSetProcessor.java b/dalesbred/src/main/java/org/dalesbred/result/ResultTableResultSetProcessor.java similarity index 98% rename from dalesbred/src/main/java/org/dalesbred/results/ResultTableResultSetProcessor.java rename to dalesbred/src/main/java/org/dalesbred/result/ResultTableResultSetProcessor.java index af869c60..a0f85f80 100644 --- a/dalesbred/src/main/java/org/dalesbred/results/ResultTableResultSetProcessor.java +++ b/dalesbred/src/main/java/org/dalesbred/result/ResultTableResultSetProcessor.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.results; +package org.dalesbred.result; import org.dalesbred.ResultTable; import org.dalesbred.ResultTable.ColumnMetadata; diff --git a/dalesbred/src/main/java/org/dalesbred/results/RowMapper.java b/dalesbred/src/main/java/org/dalesbred/result/RowMapper.java similarity index 98% rename from dalesbred/src/main/java/org/dalesbred/results/RowMapper.java rename to dalesbred/src/main/java/org/dalesbred/result/RowMapper.java index 97071f13..41ffb60d 100644 --- a/dalesbred/src/main/java/org/dalesbred/results/RowMapper.java +++ b/dalesbred/src/main/java/org/dalesbred/result/RowMapper.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.results; +package org.dalesbred.result; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/main/java/org/dalesbred/results/UniqueResultSetProcessor.java b/dalesbred/src/main/java/org/dalesbred/result/UniqueResultSetProcessor.java similarity index 98% rename from dalesbred/src/main/java/org/dalesbred/results/UniqueResultSetProcessor.java rename to dalesbred/src/main/java/org/dalesbred/result/UniqueResultSetProcessor.java index 00699880..a1923e6a 100644 --- a/dalesbred/src/main/java/org/dalesbred/results/UniqueResultSetProcessor.java +++ b/dalesbred/src/main/java/org/dalesbred/result/UniqueResultSetProcessor.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.results; +package org.dalesbred.result; import org.dalesbred.NonUniqueResultException; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/main/java/org/dalesbred/results/package-info.java b/dalesbred/src/main/java/org/dalesbred/result/package-info.java similarity index 97% rename from dalesbred/src/main/java/org/dalesbred/results/package-info.java rename to dalesbred/src/main/java/org/dalesbred/result/package-info.java index 781f9c83..6b70f71a 100644 --- a/dalesbred/src/main/java/org/dalesbred/results/package-info.java +++ b/dalesbred/src/main/java/org/dalesbred/result/package-info.java @@ -23,4 +23,4 @@ /** * Handling database-results. */ -package org.dalesbred.results; +package org.dalesbred.result; diff --git a/dalesbred/src/main/java/org/dalesbred/transaction/AbstractTransactionManager.java b/dalesbred/src/main/java/org/dalesbred/transaction/AbstractTransactionManager.java index 2c63fe69..69b0802c 100644 --- a/dalesbred/src/main/java/org/dalesbred/transaction/AbstractTransactionManager.java +++ b/dalesbred/src/main/java/org/dalesbred/transaction/AbstractTransactionManager.java @@ -22,7 +22,7 @@ package org.dalesbred.transaction; -import org.dalesbred.dialects.Dialect; +import org.dalesbred.dialect.Dialect; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/dalesbred/src/main/java/org/dalesbred/transaction/DefaultTransaction.java b/dalesbred/src/main/java/org/dalesbred/transaction/DefaultTransaction.java index c939217d..c34f1aa1 100644 --- a/dalesbred/src/main/java/org/dalesbred/transaction/DefaultTransaction.java +++ b/dalesbred/src/main/java/org/dalesbred/transaction/DefaultTransaction.java @@ -22,7 +22,7 @@ package org.dalesbred.transaction; -import org.dalesbred.dialects.Dialect; +import org.dalesbred.dialect.Dialect; import org.dalesbred.internal.utils.Throwables; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/main/java/org/dalesbred/transaction/DefaultTransactionManager.java b/dalesbred/src/main/java/org/dalesbred/transaction/DefaultTransactionManager.java index ae9b1b55..aa41fed4 100644 --- a/dalesbred/src/main/java/org/dalesbred/transaction/DefaultTransactionManager.java +++ b/dalesbred/src/main/java/org/dalesbred/transaction/DefaultTransactionManager.java @@ -23,7 +23,7 @@ package org.dalesbred.transaction; import org.dalesbred.connection.ConnectionProvider; -import org.dalesbred.dialects.Dialect; +import org.dalesbred.dialect.Dialect; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/dalesbred/src/main/java/org/dalesbred/transaction/SingleConnectionTransactionManager.java b/dalesbred/src/main/java/org/dalesbred/transaction/SingleConnectionTransactionManager.java index e200bc9e..cfa69b70 100644 --- a/dalesbred/src/main/java/org/dalesbred/transaction/SingleConnectionTransactionManager.java +++ b/dalesbred/src/main/java/org/dalesbred/transaction/SingleConnectionTransactionManager.java @@ -24,7 +24,7 @@ import org.dalesbred.Database; import org.dalesbred.DatabaseException; -import org.dalesbred.dialects.Dialect; +import org.dalesbred.dialect.Dialect; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/dalesbred/src/main/java/org/dalesbred/transaction/TransactionManager.java b/dalesbred/src/main/java/org/dalesbred/transaction/TransactionManager.java index 37b966f3..623334d6 100644 --- a/dalesbred/src/main/java/org/dalesbred/transaction/TransactionManager.java +++ b/dalesbred/src/main/java/org/dalesbred/transaction/TransactionManager.java @@ -22,7 +22,7 @@ package org.dalesbred.transaction; -import org.dalesbred.dialects.Dialect; +import org.dalesbred.dialect.Dialect; import org.jetbrains.annotations.NotNull; /** diff --git a/dalesbred/src/test/java/org/dalesbred/BuiltinConversionsTest.java b/dalesbred/src/test/java/org/dalesbred/BuiltinConversionsTest.java index 878c41b6..b49e023c 100644 --- a/dalesbred/src/test/java/org/dalesbred/BuiltinConversionsTest.java +++ b/dalesbred/src/test/java/org/dalesbred/BuiltinConversionsTest.java @@ -22,6 +22,7 @@ package org.dalesbred; +import org.dalesbred.annotation.Reflective; import org.junit.Rule; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/DatabaseArraysTest.java b/dalesbred/src/test/java/org/dalesbred/DatabaseArraysTest.java index 4ff56f37..8d51151a 100644 --- a/dalesbred/src/test/java/org/dalesbred/DatabaseArraysTest.java +++ b/dalesbred/src/test/java/org/dalesbred/DatabaseArraysTest.java @@ -22,6 +22,7 @@ package org.dalesbred; +import org.dalesbred.datatype.SqlArray; import org.jetbrains.annotations.NotNull; import org.junit.Rule; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/DatabaseBatchUpdatesTest.java b/dalesbred/src/test/java/org/dalesbred/DatabaseBatchUpdatesTest.java index 540abe9e..1bc4f060 100644 --- a/dalesbred/src/test/java/org/dalesbred/DatabaseBatchUpdatesTest.java +++ b/dalesbred/src/test/java/org/dalesbred/DatabaseBatchUpdatesTest.java @@ -22,6 +22,7 @@ package org.dalesbred; +import org.dalesbred.query.SqlQuery; import org.junit.Rule; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/DatabaseCustomDialectTest.java b/dalesbred/src/test/java/org/dalesbred/DatabaseCustomDialectTest.java index 6b24aac2..2043310b 100644 --- a/dalesbred/src/test/java/org/dalesbred/DatabaseCustomDialectTest.java +++ b/dalesbred/src/test/java/org/dalesbred/DatabaseCustomDialectTest.java @@ -22,7 +22,7 @@ package org.dalesbred; -import org.dalesbred.dialects.DefaultDialect; +import org.dalesbred.dialect.DefaultDialect; import org.jetbrains.annotations.NotNull; import org.junit.Rule; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/DatabaseExceptionTest.java b/dalesbred/src/test/java/org/dalesbred/DatabaseExceptionTest.java index 02442407..c5524fe5 100644 --- a/dalesbred/src/test/java/org/dalesbred/DatabaseExceptionTest.java +++ b/dalesbred/src/test/java/org/dalesbred/DatabaseExceptionTest.java @@ -22,6 +22,7 @@ package org.dalesbred; +import org.dalesbred.query.SqlQuery; import org.junit.After; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/DatabaseExceptionsTest.java b/dalesbred/src/test/java/org/dalesbred/DatabaseExceptionsTest.java index 204c7ea0..05b74eef 100644 --- a/dalesbred/src/test/java/org/dalesbred/DatabaseExceptionsTest.java +++ b/dalesbred/src/test/java/org/dalesbred/DatabaseExceptionsTest.java @@ -22,6 +22,7 @@ package org.dalesbred; +import org.dalesbred.query.SqlQuery; import org.junit.Rule; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/DatabaseGeneratedKeysTest.java b/dalesbred/src/test/java/org/dalesbred/DatabaseGeneratedKeysTest.java index c62330f5..886f96fe 100644 --- a/dalesbred/src/test/java/org/dalesbred/DatabaseGeneratedKeysTest.java +++ b/dalesbred/src/test/java/org/dalesbred/DatabaseGeneratedKeysTest.java @@ -22,7 +22,7 @@ package org.dalesbred; -import org.dalesbred.results.ResultSetProcessor; +import org.dalesbred.result.ResultSetProcessor; import org.jetbrains.annotations.NotNull; import org.junit.Rule; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/DatabaseJndiLookupTest.java b/dalesbred/src/test/java/org/dalesbred/DatabaseJndiLookupTest.java index d4925e3e..47c62ccd 100644 --- a/dalesbred/src/test/java/org/dalesbred/DatabaseJndiLookupTest.java +++ b/dalesbred/src/test/java/org/dalesbred/DatabaseJndiLookupTest.java @@ -22,8 +22,8 @@ package org.dalesbred; -import org.dalesbred.support.MemoryContext; -import org.dalesbred.support.SystemPropertyRule; +import org.dalesbred.integration.MemoryContext; +import org.dalesbred.integration.SystemPropertyRule; import org.jetbrains.annotations.NotNull; import org.junit.Rule; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/DatabaseReflectiveInstantiationTest.java b/dalesbred/src/test/java/org/dalesbred/DatabaseReflectiveInstantiationTest.java index 3ef1f011..114de9fc 100644 --- a/dalesbred/src/test/java/org/dalesbred/DatabaseReflectiveInstantiationTest.java +++ b/dalesbred/src/test/java/org/dalesbred/DatabaseReflectiveInstantiationTest.java @@ -19,8 +19,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ + package org.dalesbred; +import org.dalesbred.annotation.Reflective; import org.joda.time.DateTime; import org.junit.Rule; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/DatabaseTest.java b/dalesbred/src/test/java/org/dalesbred/DatabaseTest.java index 4e9c1b8f..735cc17e 100644 --- a/dalesbred/src/test/java/org/dalesbred/DatabaseTest.java +++ b/dalesbred/src/test/java/org/dalesbred/DatabaseTest.java @@ -22,9 +22,11 @@ package org.dalesbred; -import org.dalesbred.dialects.HsqldbDialect; -import org.dalesbred.results.ResultSetProcessor; -import org.dalesbred.results.RowMapper; +import org.dalesbred.annotation.Reflective; +import org.dalesbred.datatype.ConfidentialValue; +import org.dalesbred.dialect.HsqldbDialect; +import org.dalesbred.result.ResultSetProcessor; +import org.dalesbred.result.RowMapper; import org.dalesbred.transaction.Isolation; import org.dalesbred.transaction.Propagation; import org.junit.Rule; @@ -172,7 +174,7 @@ public void creatingDatabaseWithJndiDataSourceThrowsExceptionWhenContextIsNotCon @Test public void confidentialValuesWorkLikeNormals() { - assertThat(db.findUnique(String.class, "values (?)", SqlQuery.confidential("foo")), is("foo")); + assertThat(db.findUnique(String.class, "values (?)", ConfidentialValue.confidential("foo")), is("foo")); } @Test diff --git a/dalesbred/src/test/java/org/dalesbred/ReflectionRowMapperTest.java b/dalesbred/src/test/java/org/dalesbred/ReflectionRowMapperTest.java index 661c7762..39cde481 100644 --- a/dalesbred/src/test/java/org/dalesbred/ReflectionRowMapperTest.java +++ b/dalesbred/src/test/java/org/dalesbred/ReflectionRowMapperTest.java @@ -22,9 +22,10 @@ package org.dalesbred; -import org.dalesbred.dialects.DefaultDialect; +import org.dalesbred.annotation.Reflective; +import org.dalesbred.dialect.DefaultDialect; import org.dalesbred.instantiation.DefaultInstantiatorRegistry; -import org.dalesbred.results.ReflectionResultSetProcessor; +import org.dalesbred.result.ReflectionResultSetProcessor; import org.jetbrains.annotations.NotNull; import org.junit.Test; import org.mockito.stubbing.OngoingStubbing; diff --git a/dalesbred/src/test/java/org/dalesbred/SqlQueryTest.java b/dalesbred/src/test/java/org/dalesbred/SqlQueryTest.java index bee13ef3..0fa5f1c4 100644 --- a/dalesbred/src/test/java/org/dalesbred/SqlQueryTest.java +++ b/dalesbred/src/test/java/org/dalesbred/SqlQueryTest.java @@ -22,6 +22,9 @@ package org.dalesbred; +import org.dalesbred.annotation.Reflective; +import org.dalesbred.datatype.ConfidentialValue; +import org.dalesbred.query.SqlQuery; import org.hamcrest.CoreMatchers; import org.junit.Test; @@ -66,7 +69,7 @@ public void accessors() { @Test public void secretValuesAreNotShownInToString() { - SqlQuery query = SqlQuery.query("select * from foo where login=? and password=?", "foo", SqlQuery.confidential("bar")); + SqlQuery query = SqlQuery.query("select * from foo where login=? and password=?", "foo", ConfidentialValue.confidential("bar")); assertEquals("select * from foo where login=? and password=? [foo, ****]", query.toString()); } diff --git a/dalesbred/src/test/java/org/dalesbred/dialects/HsqldbDialectTest.java b/dalesbred/src/test/java/org/dalesbred/dialect/HsqldbDialectTest.java similarity index 97% rename from dalesbred/src/test/java/org/dalesbred/dialects/HsqldbDialectTest.java rename to dalesbred/src/test/java/org/dalesbred/dialect/HsqldbDialectTest.java index d8f516ab..8e6cf788 100644 --- a/dalesbred/src/test/java/org/dalesbred/dialects/HsqldbDialectTest.java +++ b/dalesbred/src/test/java/org/dalesbred/dialect/HsqldbDialectTest.java @@ -20,11 +20,11 @@ * THE SOFTWARE. */ -package org.dalesbred.dialects; +package org.dalesbred.dialect; import org.dalesbred.Database; -import org.dalesbred.Reflective; import org.dalesbred.TransactionalTestsRule; +import org.dalesbred.annotation.Reflective; import org.junit.Rule; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/dialects/MySQLDialectTest.java b/dalesbred/src/test/java/org/dalesbred/dialect/MySQLDialectTest.java similarity index 98% rename from dalesbred/src/test/java/org/dalesbred/dialects/MySQLDialectTest.java rename to dalesbred/src/test/java/org/dalesbred/dialect/MySQLDialectTest.java index e98ae50f..e886b7d2 100644 --- a/dalesbred/src/test/java/org/dalesbred/dialects/MySQLDialectTest.java +++ b/dalesbred/src/test/java/org/dalesbred/dialect/MySQLDialectTest.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.dialects; +package org.dalesbred.dialect; import org.dalesbred.Database; import org.dalesbred.TestDatabaseProvider; diff --git a/dalesbred/src/test/java/org/dalesbred/dialects/PostgreSQLDialectTest.java b/dalesbred/src/test/java/org/dalesbred/dialect/PostgreSQLDialectTest.java similarity index 97% rename from dalesbred/src/test/java/org/dalesbred/dialects/PostgreSQLDialectTest.java rename to dalesbred/src/test/java/org/dalesbred/dialect/PostgreSQLDialectTest.java index d1d19695..603320f8 100644 --- a/dalesbred/src/test/java/org/dalesbred/dialects/PostgreSQLDialectTest.java +++ b/dalesbred/src/test/java/org/dalesbred/dialect/PostgreSQLDialectTest.java @@ -20,12 +20,12 @@ * THE SOFTWARE. */ -package org.dalesbred.dialects; +package org.dalesbred.dialect; import org.dalesbred.Database; -import org.dalesbred.Reflective; import org.dalesbred.TestDatabaseProvider; import org.dalesbred.TransactionalTestsRule; +import org.dalesbred.annotation.Reflective; import org.junit.Rule; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/dialects/PostgreSQLLargeObjectTest.java b/dalesbred/src/test/java/org/dalesbred/dialect/PostgreSQLLargeObjectTest.java similarity index 95% rename from dalesbred/src/test/java/org/dalesbred/dialects/PostgreSQLLargeObjectTest.java rename to dalesbred/src/test/java/org/dalesbred/dialect/PostgreSQLLargeObjectTest.java index f5daae05..3fb5e8a7 100644 --- a/dalesbred/src/test/java/org/dalesbred/dialects/PostgreSQLLargeObjectTest.java +++ b/dalesbred/src/test/java/org/dalesbred/dialect/PostgreSQLLargeObjectTest.java @@ -20,13 +20,13 @@ * THE SOFTWARE. */ -package org.dalesbred.dialects; +package org.dalesbred.dialect; import org.dalesbred.Database; import org.dalesbred.TestDatabaseProvider; import org.dalesbred.TransactionalTestsRule; -import org.dalesbred.lob.InputStreamWithSize; -import org.dalesbred.lob.ReaderWithSize; +import org.dalesbred.datatype.InputStreamWithSize; +import org.dalesbred.datatype.ReaderWithSize; import org.junit.Rule; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/instantiation/DefaultInstantiatorRegistryTest.java b/dalesbred/src/test/java/org/dalesbred/instantiation/DefaultInstantiatorRegistryTest.java index 5ef18d2d..2c571ea6 100644 --- a/dalesbred/src/test/java/org/dalesbred/instantiation/DefaultInstantiatorRegistryTest.java +++ b/dalesbred/src/test/java/org/dalesbred/instantiation/DefaultInstantiatorRegistryTest.java @@ -22,9 +22,9 @@ package org.dalesbred.instantiation; -import org.dalesbred.DalesbredIgnore; -import org.dalesbred.Reflective; -import org.dalesbred.dialects.DefaultDialect; +import org.dalesbred.annotation.DalesbredIgnore; +import org.dalesbred.annotation.Reflective; +import org.dalesbred.dialect.DefaultDialect; import org.dalesbred.instantiation.test.InaccessibleClassRef; import org.dalesbred.internal.utils.TypeUtils; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/test/java/org/dalesbred/instantiation/PropertyAccessorTest.java b/dalesbred/src/test/java/org/dalesbred/instantiation/PropertyAccessorTest.java index b2f1ccf1..29bf21f5 100644 --- a/dalesbred/src/test/java/org/dalesbred/instantiation/PropertyAccessorTest.java +++ b/dalesbred/src/test/java/org/dalesbred/instantiation/PropertyAccessorTest.java @@ -22,8 +22,8 @@ package org.dalesbred.instantiation; -import org.dalesbred.DalesbredIgnore; -import org.dalesbred.Reflective; +import org.dalesbred.annotation.DalesbredIgnore; +import org.dalesbred.annotation.Reflective; import org.junit.Test; import static org.junit.Assert.assertNotNull; diff --git a/dalesbred/src/test/java/org/dalesbred/instantiation/test/InaccessibleClass.java b/dalesbred/src/test/java/org/dalesbred/instantiation/test/InaccessibleClass.java index 59468824..9f39337e 100644 --- a/dalesbred/src/test/java/org/dalesbred/instantiation/test/InaccessibleClass.java +++ b/dalesbred/src/test/java/org/dalesbred/instantiation/test/InaccessibleClass.java @@ -22,7 +22,7 @@ package org.dalesbred.instantiation.test; -import org.dalesbred.Reflective; +import org.dalesbred.annotation.Reflective; class InaccessibleClass { diff --git a/dalesbred/src/test/java/org/dalesbred/support/MemoryContext.java b/dalesbred/src/test/java/org/dalesbred/integration/MemoryContext.java similarity index 99% rename from dalesbred/src/test/java/org/dalesbred/support/MemoryContext.java rename to dalesbred/src/test/java/org/dalesbred/integration/MemoryContext.java index f78fd6a0..4510320a 100644 --- a/dalesbred/src/test/java/org/dalesbred/support/MemoryContext.java +++ b/dalesbred/src/test/java/org/dalesbred/integration/MemoryContext.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support; +package org.dalesbred.integration; import org.jetbrains.annotations.NotNull; diff --git a/dalesbred/src/test/java/org/dalesbred/support/SystemPropertyRule.java b/dalesbred/src/test/java/org/dalesbred/integration/SystemPropertyRule.java similarity index 98% rename from dalesbred/src/test/java/org/dalesbred/support/SystemPropertyRule.java rename to dalesbred/src/test/java/org/dalesbred/integration/SystemPropertyRule.java index 78d76cf6..46894652 100644 --- a/dalesbred/src/test/java/org/dalesbred/support/SystemPropertyRule.java +++ b/dalesbred/src/test/java/org/dalesbred/integration/SystemPropertyRule.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support; +package org.dalesbred.integration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/dalesbred/src/test/java/org/dalesbred/support/aopalliance/AopAllianceTransactionalMethodInterceptorTest.java b/dalesbred/src/test/java/org/dalesbred/integration/aopalliance/AopAllianceTransactionalMethodInterceptorTest.java similarity index 97% rename from dalesbred/src/test/java/org/dalesbred/support/aopalliance/AopAllianceTransactionalMethodInterceptorTest.java rename to dalesbred/src/test/java/org/dalesbred/integration/aopalliance/AopAllianceTransactionalMethodInterceptorTest.java index bfdbb92a..62d57e8e 100644 --- a/dalesbred/src/test/java/org/dalesbred/support/aopalliance/AopAllianceTransactionalMethodInterceptorTest.java +++ b/dalesbred/src/test/java/org/dalesbred/integration/aopalliance/AopAllianceTransactionalMethodInterceptorTest.java @@ -20,14 +20,14 @@ * THE SOFTWARE. */ -package org.dalesbred.support.aopalliance; +package org.dalesbred.integration.aopalliance; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; import org.dalesbred.Database; import org.dalesbred.TestDatabaseProvider; -import org.dalesbred.support.guice.DriverManagerDatabaseModule; +import org.dalesbred.integration.guice.DriverManagerDatabaseModule; import org.dalesbred.transaction.Isolation; import org.dalesbred.transaction.Propagation; import org.dalesbred.transaction.Transactional; diff --git a/dalesbred/src/test/java/org/dalesbred/support/guice/DataSourceDatabaseModuleTest.java b/dalesbred/src/test/java/org/dalesbred/integration/guice/DataSourceDatabaseModuleTest.java similarity index 98% rename from dalesbred/src/test/java/org/dalesbred/support/guice/DataSourceDatabaseModuleTest.java rename to dalesbred/src/test/java/org/dalesbred/integration/guice/DataSourceDatabaseModuleTest.java index 9e75cb44..509730f7 100644 --- a/dalesbred/src/test/java/org/dalesbred/support/guice/DataSourceDatabaseModuleTest.java +++ b/dalesbred/src/test/java/org/dalesbred/integration/guice/DataSourceDatabaseModuleTest.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support.guice; +package org.dalesbred.integration.guice; import com.google.inject.AbstractModule; import com.google.inject.Guice; diff --git a/dalesbred/src/test/java/org/dalesbred/support/guice/DriverManagerDatabaseModuleTest.java b/dalesbred/src/test/java/org/dalesbred/integration/guice/DriverManagerDatabaseModuleTest.java similarity index 97% rename from dalesbred/src/test/java/org/dalesbred/support/guice/DriverManagerDatabaseModuleTest.java rename to dalesbred/src/test/java/org/dalesbred/integration/guice/DriverManagerDatabaseModuleTest.java index 5cce4791..67e04a57 100644 --- a/dalesbred/src/test/java/org/dalesbred/support/guice/DriverManagerDatabaseModuleTest.java +++ b/dalesbred/src/test/java/org/dalesbred/integration/guice/DriverManagerDatabaseModuleTest.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support.guice; +package org.dalesbred.integration.guice; import com.google.inject.Guice; import com.google.inject.Injector; diff --git a/dalesbred/src/test/java/org/dalesbred/support/guice/GuiceAutomaticInjectionTest.java b/dalesbred/src/test/java/org/dalesbred/integration/guice/GuiceAutomaticInjectionTest.java similarity index 98% rename from dalesbred/src/test/java/org/dalesbred/support/guice/GuiceAutomaticInjectionTest.java rename to dalesbred/src/test/java/org/dalesbred/integration/guice/GuiceAutomaticInjectionTest.java index e4d71413..82a065a6 100644 --- a/dalesbred/src/test/java/org/dalesbred/support/guice/GuiceAutomaticInjectionTest.java +++ b/dalesbred/src/test/java/org/dalesbred/integration/guice/GuiceAutomaticInjectionTest.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support.guice; +package org.dalesbred.integration.guice; import com.google.inject.Guice; import com.google.inject.Injector; diff --git a/dalesbred/src/test/java/org/dalesbred/support/java8/JavaTimeIntegrationTest.java b/dalesbred/src/test/java/org/dalesbred/integration/java8/JavaTimeIntegrationTest.java similarity index 98% rename from dalesbred/src/test/java/org/dalesbred/support/java8/JavaTimeIntegrationTest.java rename to dalesbred/src/test/java/org/dalesbred/integration/java8/JavaTimeIntegrationTest.java index 2e82da39..59ee0f2a 100644 --- a/dalesbred/src/test/java/org/dalesbred/support/java8/JavaTimeIntegrationTest.java +++ b/dalesbred/src/test/java/org/dalesbred/integration/java8/JavaTimeIntegrationTest.java @@ -20,12 +20,12 @@ * THE SOFTWARE. */ -package org.dalesbred.support.java8; +package org.dalesbred.integration.java8; import org.dalesbred.Database; -import org.dalesbred.Reflective; import org.dalesbred.TestDatabaseProvider; import org.dalesbred.TransactionalTestsRule; +import org.dalesbred.annotation.Reflective; import org.junit.Rule; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/support/joda/JodaIntegrationTest.java b/dalesbred/src/test/java/org/dalesbred/integration/joda/JodaIntegrationTest.java similarity index 98% rename from dalesbred/src/test/java/org/dalesbred/support/joda/JodaIntegrationTest.java rename to dalesbred/src/test/java/org/dalesbred/integration/joda/JodaIntegrationTest.java index 5200b729..ac6b782f 100644 --- a/dalesbred/src/test/java/org/dalesbred/support/joda/JodaIntegrationTest.java +++ b/dalesbred/src/test/java/org/dalesbred/integration/joda/JodaIntegrationTest.java @@ -20,12 +20,12 @@ * THE SOFTWARE. */ -package org.dalesbred.support.joda; +package org.dalesbred.integration.joda; import org.dalesbred.Database; -import org.dalesbred.Reflective; import org.dalesbred.TestDatabaseProvider; import org.dalesbred.TransactionalTestsRule; +import org.dalesbred.annotation.Reflective; import org.jetbrains.annotations.NotNull; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/dalesbred/src/test/java/org/dalesbred/support/spring/SpringConfigurationTest.java b/dalesbred/src/test/java/org/dalesbred/integration/spring/SpringConfigurationTest.java similarity index 97% rename from dalesbred/src/test/java/org/dalesbred/support/spring/SpringConfigurationTest.java rename to dalesbred/src/test/java/org/dalesbred/integration/spring/SpringConfigurationTest.java index 08f62653..82d7fb71 100644 --- a/dalesbred/src/test/java/org/dalesbred/support/spring/SpringConfigurationTest.java +++ b/dalesbred/src/test/java/org/dalesbred/integration/spring/SpringConfigurationTest.java @@ -20,12 +20,12 @@ * THE SOFTWARE. */ -package org.dalesbred.support.spring; +package org.dalesbred.integration.spring; import org.dalesbred.Database; import org.dalesbred.TestDatabaseProvider; -import org.dalesbred.dialects.Dialect; -import org.dalesbred.dialects.PostgreSQLDialect; +import org.dalesbred.dialect.Dialect; +import org.dalesbred.dialect.PostgreSQLDialect; import org.dalesbred.transaction.Propagation; import org.jetbrains.annotations.Nullable; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/support/spring/SpringTransactionContextTest.java b/dalesbred/src/test/java/org/dalesbred/integration/spring/SpringTransactionContextTest.java similarity index 98% rename from dalesbred/src/test/java/org/dalesbred/support/spring/SpringTransactionContextTest.java rename to dalesbred/src/test/java/org/dalesbred/integration/spring/SpringTransactionContextTest.java index ba3aa3f6..583f964a 100644 --- a/dalesbred/src/test/java/org/dalesbred/support/spring/SpringTransactionContextTest.java +++ b/dalesbred/src/test/java/org/dalesbred/integration/spring/SpringTransactionContextTest.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support.spring; +package org.dalesbred.integration.spring; import org.dalesbred.TestDatabaseProvider; import org.junit.Test; diff --git a/dalesbred/src/test/java/org/dalesbred/support/spring/SpringTransactionsWithDalesbredAnnotationTest.java b/dalesbred/src/test/java/org/dalesbred/integration/spring/SpringTransactionsWithDalesbredAnnotationTest.java similarity index 98% rename from dalesbred/src/test/java/org/dalesbred/support/spring/SpringTransactionsWithDalesbredAnnotationTest.java rename to dalesbred/src/test/java/org/dalesbred/integration/spring/SpringTransactionsWithDalesbredAnnotationTest.java index d45d2d7f..764028f3 100644 --- a/dalesbred/src/test/java/org/dalesbred/support/spring/SpringTransactionsWithDalesbredAnnotationTest.java +++ b/dalesbred/src/test/java/org/dalesbred/integration/spring/SpringTransactionsWithDalesbredAnnotationTest.java @@ -20,7 +20,7 @@ * THE SOFTWARE. */ -package org.dalesbred.support.spring; +package org.dalesbred.integration.spring; import org.dalesbred.Database; import org.dalesbred.TestDatabaseProvider; diff --git a/dalesbred/src/test/java/org/dalesbred/support/threeten/ThreeTenIntegrationTest.java b/dalesbred/src/test/java/org/dalesbred/integration/threeten/ThreeTenIntegrationTest.java similarity index 98% rename from dalesbred/src/test/java/org/dalesbred/support/threeten/ThreeTenIntegrationTest.java rename to dalesbred/src/test/java/org/dalesbred/integration/threeten/ThreeTenIntegrationTest.java index c2e3bcf6..4e744f69 100644 --- a/dalesbred/src/test/java/org/dalesbred/support/threeten/ThreeTenIntegrationTest.java +++ b/dalesbred/src/test/java/org/dalesbred/integration/threeten/ThreeTenIntegrationTest.java @@ -20,12 +20,12 @@ * THE SOFTWARE. */ -package org.dalesbred.support.threeten; +package org.dalesbred.integration.threeten; import org.dalesbred.Database; -import org.dalesbred.Reflective; import org.dalesbred.TestDatabaseProvider; import org.dalesbred.TransactionalTestsRule; +import org.dalesbred.annotation.Reflective; import org.junit.Rule; import org.junit.Test; import org.threeten.bp.*; diff --git a/dalesbred/src/test/java/org/dalesbred/query/NamedParameterSqlParserTest.java b/dalesbred/src/test/java/org/dalesbred/query/NamedParameterSqlParserTest.java index a3b0a7b8..f199e584 100644 --- a/dalesbred/src/test/java/org/dalesbred/query/NamedParameterSqlParserTest.java +++ b/dalesbred/src/test/java/org/dalesbred/query/NamedParameterSqlParserTest.java @@ -22,7 +22,7 @@ package org.dalesbred.query; -import org.dalesbred.SQL; +import org.dalesbred.annotation.SQL; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/dalesbred/src/test/java/org/dalesbred/query/QueryBuilderTest.java b/dalesbred/src/test/java/org/dalesbred/query/QueryBuilderTest.java index 7e8ac55f..bab7a2ed 100644 --- a/dalesbred/src/test/java/org/dalesbred/query/QueryBuilderTest.java +++ b/dalesbred/src/test/java/org/dalesbred/query/QueryBuilderTest.java @@ -22,10 +22,9 @@ package org.dalesbred.query; -import org.dalesbred.SqlQuery; import org.junit.Test; -import static org.dalesbred.SqlQuery.query; +import static org.dalesbred.query.SqlQuery.query; import static org.junit.Assert.assertEquals; public class QueryBuilderTest { diff --git a/src/asciidoc/index.adoc b/src/asciidoc/index.adoc index 89f62e6f..32339889 100644 --- a/src/asciidoc/index.adoc +++ b/src/asciidoc/index.adoc @@ -129,14 +129,14 @@ SqlQuery vs. query parameters ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ All methods come in two variants: there's an implementation that takes -an {javadocBase}org/dalesbred/SqlQuery.html[SqlQuery] as a parameter and there's another +an {javadocBase}org/dalesbred/query/SqlQuery.html[SqlQuery] as a parameter and there's another implementation that takes {jdkJavadocBase}java/lang/String.html[String] and variable arguments of parameters. The latter is just convenience method for the further, meaning that the following code fragments are identical in functionality: [source,java,indent=0] ---- - import static org.dalesbred.SqlQuery.query; + import static org.dalesbred.query.SqlQuery.query; SqlQuery query = query("select id, name from department where update_timestamp > ?", date); db.findAll(Department.class, query); @@ -162,7 +162,7 @@ In addition to using positional parameters in your SQL statements, you can also [source,java,indent=0] ---- - import static org.dalesbred.SqlQuery.namedQuery; + import static org.dalesbred.query.SqlQuery.namedQuery; Map values = new HashMap(); values.put("firstName", "John"); @@ -326,17 +326,17 @@ Confidential values Dalesbred tries to provide detailed exceptions and logs which include all the parameters of queries. While this is generally useful, it could mean that sensitive information such as passwords or credit card numbers -might end up in logs or error messages. When building a query, you can wrap such values with `SqlQuery.confidential` +might end up in logs or error messages. When building a query, you can wrap such values with `ConfidentialValue` so that only asterisks will be displayed whenever those values are printed, but they are still sent to database correctly: [source,java,indent=0] ---- - import static org.dalesbred.SqlQuery.confidential; + import org.dalesbred.datatype.ConfidentialValue; ... - db.update("insert into credit_card (number) values (?)", confidential(creditCardNumber)); + db.update("insert into credit_card (number) values (?)", new ConfidentialValue(creditCardNumber)); ---- Custom type-conversions