diff --git a/src/main/asciidoc/reference/r2dbc-core.adoc b/src/main/asciidoc/reference/r2dbc-core.adoc index 249c4cb..aa90869 100644 --- a/src/main/asciidoc/reference/r2dbc-core.adoc +++ b/src/main/asciidoc/reference/r2dbc-core.adoc @@ -140,31 +140,31 @@ public class R2dbcApp { DatabaseClient client = DatabaseClient.create(connectionFactory); client.execute() - .sql("CREATE TABLE person" + - "(id VARCHAR(255) PRIMARY KEY," + - "name VARCHAR(255)," + - "age INT)") - .fetch() - .rowsUpdated() - .as(StepVerifier::create) - .expectNextCount(1) - .verifyComplete(); + .sql("CREATE TABLE person" + + "(id VARCHAR(255) PRIMARY KEY," + + "name VARCHAR(255)," + + "age INT)") + .fetch() + .rowsUpdated() + .as(StepVerifier::create) + .expectNextCount(1) + .verifyComplete(); client.insert() - .into(Person.class) - .using(new Person("joe", "Joe", 34)) - .then() - .as(StepVerifier::create) - .verifyComplete(); + .into(Person.class) + .using(new Person("joe", "Joe", 34)) + .then() + .as(StepVerifier::create) + .verifyComplete(); client.select() - .from(Person.class) - .fetch() - .first() - .doOnNext(it -> log.info(it)) - .as(StepVerifier::create) - .expectNextCount(1) - .verifyComplete(); + .from(Person.class) + .fetch() + .first() + .doOnNext(it -> log.info(it)) + .as(StepVerifier::create) + .expectNextCount(1) + .verifyComplete(); } } ---- diff --git a/src/main/asciidoc/reference/r2dbc-databaseclient.adoc b/src/main/asciidoc/reference/r2dbc-databaseclient.adoc index 2809ac1..9419217 100644 --- a/src/main/asciidoc/reference/r2dbc-databaseclient.adoc +++ b/src/main/asciidoc/reference/r2dbc-databaseclient.adoc @@ -34,10 +34,10 @@ Once built, a `DatabaseClient` instance is immutable. However, you can clone it [source,java] ---- DatabaseClient client1 = DatabaseClient.builder() - .exceptionTranslator(exceptionTranslatorA).build(); + .exceptionTranslator(exceptionTranslatorA).build(); DatabaseClient client2 = client1.mutate() - .exceptionTranslator(exceptionTranslatorB).build(); + .exceptionTranslator(exceptionTranslatorB).build(); ---- == Controlling Database Connections @@ -98,12 +98,14 @@ You can extend `SqlErrorCodeR2dbcExceptionTranslator`, as the following example ---- public class CustomSqlErrorCodeR2dbcExceptionTranslator extends SqlErrorCodeR2dbcExceptionTranslator { - protected DataAccessException customTranslate(String task, String sql, R2dbcException r2dbcex) { - if (sqlex.getErrorCode() == -12345) { - return new DeadlockLoserDataAccessException(task, r2dbcex); - } - return null; + protected DataAccessException customTranslate(String task, String sql, R2dbcException r2dbcex) { + + if (sqlex.getErrorCode() == -12345) { + return new DeadlockLoserDataAccessException(task, r2dbcex); } + + return null; + } } ---- @@ -115,10 +117,11 @@ The following example shows how you can use this custom translator: ---- ConnectionFactory connectionFactory = …; -CustomSqlErrorCodeR2dbcExceptionTranslator exceptionTranslator = new CustomSqlErrorCodeR2dbcExceptionTranslator(); +CustomSqlErrorCodeR2dbcExceptionTranslator exceptionTranslator = + new CustomSqlErrorCodeR2dbcExceptionTranslator(); DatabaseClient client = DatabaseClient.builder() - .connectionFactory(connectionFactory) - .exceptionTranslator(exceptionTranslator) - .build(); + .connectionFactory(connectionFactory) + .exceptionTranslator(exceptionTranslator) + .build(); ---- diff --git a/src/main/asciidoc/reference/r2dbc-fluent.adoc b/src/main/asciidoc/reference/r2dbc-fluent.adoc index 7ac0ead..55f5a9a 100644 --- a/src/main/asciidoc/reference/r2dbc-fluent.adoc +++ b/src/main/asciidoc/reference/r2dbc-fluent.adoc @@ -12,9 +12,9 @@ Let's take a look at a simple query: [source,java] ---- Flux people = databaseClient.select() - .from(Person.class) <1> - .fetch() - .all(); <2> + .from(Person.class) <1> + .fetch() + .all(); <2> ---- <1> Using `Person` with the `from(…)` method sets the `FROM` table based on mapping metadata. It also maps tabular results on `Person` result objects. <2> Fetching `all()` rows returns a `Flux` without limiting results. @@ -26,13 +26,13 @@ The following example declares a more complex query that specifies the table nam [source,java] ---- Mono first = databaseClient.select() - .from("legoset") <1> - .matching(where("firstname").is("John") <2> - .and("lastname").in("Doe", "White")) - .orderBy(desc("id")) <3> - .as(Person.class) - .fetch() - .one(); <4> + .from("legoset") <1> + .matching(where("firstname").is("John") <2> + .and("lastname").in("Doe", "White")) + .orderBy(desc("id")) <3> + .as(Person.class) + .fetch() + .one(); <4> ---- <1> Selecting from a table by name returns row results as `Map` with case-insensitive column name matching. <2> The issued query declares a `WHERE` condition on `firstname` and `lastname` columns to filter results. @@ -166,9 +166,9 @@ Take a look at a simple typed update operation: Person modified = … Mono update = databaseClient.update() - .table(Person.class) <1> - .using(modified) <2> - .then(); <3> + .table(Person.class) <1> + .using(modified) <2> + .then(); <3> ---- <1> Using `Person` with the `table(…)` method sets the table to update based on mapping metadata. <2> Provide a scalar `Person` object value. `using(…)` accepts the modified object and derives primary keys and updates all column values. @@ -181,10 +181,10 @@ Update also support untyped operations: [source,java] ---- Mono update = databaseClient.update() - .table("person") <1> - .using(Update.update("firstname", "Jane")) <2> - .matching(where("firstname").is("John")) <3> - .then(); <4> + .table("person") <1> + .using(Update.update("firstname", "Jane")) <2> + .matching(where("firstname").is("John")) <3> + .then(); <4> ---- <1> Update table `person`. <2> Provide a `Update` definition, which columns to update. @@ -217,10 +217,10 @@ Take a look at a simple insert operation: [source,java] ---- Mono delete = databaseClient.delete() - .from(Person.class) <1> - .matching(where("firstname").is("John") <2> - .and("lastname").in("Doe", "White")) - .then(); <3> + .from(Person.class) <1> + .matching(where("firstname").is("John") <2> + .and("lastname").in("Doe", "White")) + .then(); <3> ---- <1> Using `Person` with the `from(…)` method sets the `FROM` table based on mapping metadata. <2> The issued query declares a `WHERE` condition on `firstname` and `lastname` columns to filter rows to delete. diff --git a/src/main/asciidoc/reference/r2dbc-repositories.adoc b/src/main/asciidoc/reference/r2dbc-repositories.adoc index 3a243ae..90d5dc9 100644 --- a/src/main/asciidoc/reference/r2dbc-repositories.adoc +++ b/src/main/asciidoc/reference/r2dbc-repositories.adoc @@ -74,16 +74,16 @@ Consequently, you can retrieve all `Person` objects would resemble the following @ContextConfiguration public class PersonRepositoryTests { - @Autowired PersonRepository repository; + @Autowired PersonRepository repository; - @Test - public void readsAllEntitiesCorrectly() { + @Test + public void readsAllEntitiesCorrectly() { - repository.findAll() - .as(StepVerifier::create) - .expectNextCount(1) - .verifyComplete(); - } + repository.findAll() + .as(StepVerifier::create) + .expectNextCount(1) + .verifyComplete(); + } } ---- ==== @@ -104,11 +104,11 @@ Defining such a query is a matter of declaring a method on the repository interf ---- public interface PersonRepository extends ReactiveCrudRepository { - @Query("SELECT * FROM person WHERE lastname = :lastname") - Flux findByLastname(String lastname); <1> + @Query("SELECT * FROM person WHERE lastname = :lastname") + Flux findByLastname(String lastname); <1> - @Query("SELECT firstname, lastname FROM person WHERE lastname = $1") - Mono findFirstByLastname(String lastname) <2> + @Query("SELECT firstname, lastname FROM person WHERE lastname = $1") + Mono findFirstByLastname(String lastname) <2> } ---- diff --git a/src/main/asciidoc/reference/r2dbc-transactions.adoc b/src/main/asciidoc/reference/r2dbc-transactions.adoc index 0f0fdba..9379b51 100644 --- a/src/main/asciidoc/reference/r2dbc-transactions.adoc +++ b/src/main/asciidoc/reference/r2dbc-transactions.adoc @@ -6,14 +6,14 @@ Relational databases typically associate a transaction with a single transport c Using different connections hence results in utilizing different transactions. Spring Data R2DBC includes transaction-awareness in `DatabaseClient` that allows you to group multiple statements within the same transaction using https://docs.spring.io/spring/docs/current/spring-framework-reference/data-access.html#transaction[Spring's Transaction Management]. -Spring Data R2DBC provides a implementation for `ReactiveTransactionManager` with `ConnectionFactoryTransactionManager`. -See <> for further details. +Spring Data R2DBC provides a implementation for `ReactiveTransactionManager` with `R2dbcTransactionManager`. +See <> for further details. .Programmatic Transaction Management ==== [source,java] ---- -ReactiveTransactionManager tm = new ConnectionFactoryTransactionManager(connectionFactory); +ReactiveTransactionManager tm = new R2dbcTransactionManager(connectionFactory); TransactionalOperator operator = TransactionalOperator.create(tm); <1> DatabaseClient client = DatabaseClient.create(connectionFactory); @@ -43,7 +43,7 @@ is a less invasive, annotation-based approach to transaction demarcation. [source,java] ---- @Configuration -@EnableTransactionManagement <1> +@EnableTransactionManagement <1> class Config extends AbstractR2dbcConfiguration { @Override @@ -52,8 +52,8 @@ class Config extends AbstractR2dbcConfiguration { } @Bean - ReactiveTransactionManager txMgr(ConnectionFactory connectionFactory) { <2> - return new ConnectionFactoryTransactionManager(connectionFactory); + ReactiveTransactionManager transactionManager(ConnectionFactory connectionFactory) { <2> + return new R2dbcTransactionManager(connectionFactory); } } @@ -83,5 +83,5 @@ class MyService { } ---- <1> Enable declarative transaction management. -<2> Provide a `ReactiveTransactionManager` implementation to back reactive tansaction features. +<2> Provide a `ReactiveTransactionManager` implementation to back reactive transaction features. ==== diff --git a/src/main/java/org/springframework/data/r2dbc/InvalidResultAccessException.java b/src/main/java/org/springframework/data/r2dbc/InvalidResultAccessException.java index 1900509..e4023ad 100644 --- a/src/main/java/org/springframework/data/r2dbc/InvalidResultAccessException.java +++ b/src/main/java/org/springframework/data/r2dbc/InvalidResultAccessException.java @@ -24,7 +24,7 @@ import org.springframework.lang.Nullable; * Exception thrown when a {@link io.r2dbc.spi.Result} has been accessed in an invalid fashion. Such exceptions always * have a {@link io.r2dbc.spi.R2dbcException} root cause. *

- * This typically happens when an invalid {@link org.springframework.data.r2dbc.function.FetchSpec} column index or name + * This typically happens when an invalid {@link org.springframework.data.r2dbc.core.FetchSpec} column index or name * has been specified. * * @author Mark Paluch diff --git a/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java b/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java index 8504398..f5c048c 100644 --- a/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java +++ b/src/main/java/org/springframework/data/r2dbc/config/AbstractR2dbcConfiguration.java @@ -28,13 +28,13 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; import org.springframework.data.convert.CustomConversions; import org.springframework.data.convert.CustomConversions.StoreConversions; +import org.springframework.data.r2dbc.convert.MappingR2dbcConverter; +import org.springframework.data.r2dbc.convert.R2dbcCustomConversions; +import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy; +import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy; import org.springframework.data.r2dbc.dialect.Database; import org.springframework.data.r2dbc.dialect.Dialect; -import org.springframework.data.r2dbc.function.DatabaseClient; -import org.springframework.data.r2dbc.function.DefaultReactiveDataAccessStrategy; -import org.springframework.data.r2dbc.function.ReactiveDataAccessStrategy; -import org.springframework.data.r2dbc.function.convert.MappingR2dbcConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcCustomConversions; import org.springframework.data.r2dbc.support.R2dbcExceptionSubclassTranslator; import org.springframework.data.r2dbc.support.R2dbcExceptionTranslator; import org.springframework.data.r2dbc.support.SqlStateR2dbcExceptionTranslator; diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionFactoryUtils.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/ConnectionFactoryUtils.java similarity index 99% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionFactoryUtils.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/ConnectionFactoryUtils.java index f54db09..a0199f9 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionFactoryUtils.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/ConnectionFactoryUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import io.r2dbc.spi.Connection; import io.r2dbc.spi.ConnectionFactory; @@ -35,7 +35,7 @@ import reactor.util.function.Tuples; * Helper class that provides static methods for obtaining R2DBC Connections from a * {@link io.r2dbc.spi.ConnectionFactory}. *

- * Used internally by Spring's {@link org.springframework.data.r2dbc.function.DatabaseClient}, Spring's R2DBC operation + * Used internally by Spring's {@link org.springframework.data.r2dbc.core.DatabaseClient}, Spring's R2DBC operation * objects. Can also be used directly in application code. * * @author Mark Paluch diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionHandle.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/ConnectionHandle.java similarity index 95% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionHandle.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/ConnectionHandle.java index ed5a4e6..fb05552 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionHandle.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/ConnectionHandle.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import io.r2dbc.spi.Connection; diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionHolder.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/ConnectionHolder.java similarity index 95% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionHolder.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/ConnectionHolder.java index f84f6c7..1db09c4 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionHolder.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/ConnectionHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import io.r2dbc.spi.Connection; import io.r2dbc.spi.ConnectionFactory; @@ -22,7 +22,7 @@ import org.springframework.transaction.support.ResourceHolderSupport; import org.springframework.util.Assert; /** - * Resource holder wrapping a R2DBC {@link Connection}. {@link ConnectionFactoryTransactionManager} binds instances of + * Resource holder wrapping a R2DBC {@link Connection}. {@link R2dbcTransactionManager} binds instances of * this class to the thread, for a specific {@link ConnectionFactory}. *

* Inherits rollback-only support for nested R2DBC transactions and reference count functionality from the base class. @@ -31,7 +31,7 @@ import org.springframework.util.Assert; * * @author Mark Paluch * @author Christoph Strobl - * @see ConnectionFactoryTransactionManager + * @see R2dbcTransactionManager * @see ConnectionFactoryUtils */ public class ConnectionHolder extends ResourceHolderSupport { @@ -86,7 +86,7 @@ public class ConnectionHolder extends ResourceHolderSupport { /** * Set whether this holder represents an active, R2DBC-managed transaction. * - * @see ConnectionFactoryTransactionManager + * @see R2dbcTransactionManager */ protected void setTransactionActive(boolean transactionActive) { this.transactionActive = transactionActive; diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionProxy.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/ConnectionProxy.java similarity index 95% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionProxy.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/ConnectionProxy.java index 38bd461..ff55b56 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionProxy.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/ConnectionProxy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import io.r2dbc.spi.Connection; import io.r2dbc.spi.Wrapped; diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/DefaultTransactionResources.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/DefaultTransactionResources.java similarity index 95% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/DefaultTransactionResources.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/DefaultTransactionResources.java index 74c0219..5730454 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/DefaultTransactionResources.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/DefaultTransactionResources.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/DelegatingConnectionFactory.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/DelegatingConnectionFactory.java similarity index 97% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/DelegatingConnectionFactory.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/DelegatingConnectionFactory.java index 3b57769..692ce10 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/DelegatingConnectionFactory.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/DelegatingConnectionFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import io.r2dbc.spi.Connection; import io.r2dbc.spi.ConnectionFactory; diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionFactoryTransactionManager.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/R2dbcTransactionManager.java similarity index 97% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionFactoryTransactionManager.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/R2dbcTransactionManager.java index 4bb0caf..e1b92df 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionFactoryTransactionManager.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/R2dbcTransactionManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import io.r2dbc.spi.Connection; import io.r2dbc.spi.ConnectionFactory; @@ -24,7 +24,7 @@ import reactor.core.publisher.Mono; import java.time.Duration; import org.springframework.beans.factory.InitializingBean; -import org.springframework.data.r2dbc.function.DatabaseClient; +import org.springframework.data.r2dbc.core.DatabaseClient; import org.springframework.lang.Nullable; import org.springframework.transaction.CannotCreateTransactionException; import org.springframework.transaction.TransactionDefinition; @@ -70,7 +70,7 @@ import org.springframework.util.Assert; * @see TransactionAwareConnectionFactoryProxy * @see DatabaseClient */ -public class ConnectionFactoryTransactionManager extends AbstractReactiveTransactionManager +public class R2dbcTransactionManager extends AbstractReactiveTransactionManager implements InitializingBean { private ConnectionFactory connectionFactory; @@ -83,14 +83,14 @@ public class ConnectionFactoryTransactionManager extends AbstractReactiveTransac * * @see #setConnectionFactory */ - public ConnectionFactoryTransactionManager() {} + public R2dbcTransactionManager() {} /** - * Create a new {@link ConnectionFactoryTransactionManager} instance. + * Create a new {@link R2dbcTransactionManager} instance. * * @param connectionFactory the R2DBC ConnectionFactory to manage transactions for */ - public ConnectionFactoryTransactionManager(ConnectionFactory connectionFactory) { + public R2dbcTransactionManager(ConnectionFactory connectionFactory) { this(); setConnectionFactory(connectionFactory); afterPropertiesSet(); diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/R2dbcTransactionObjectSupport.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/R2dbcTransactionObjectSupport.java similarity index 94% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/R2dbcTransactionObjectSupport.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/R2dbcTransactionObjectSupport.java index 4c38689..9226f18 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/R2dbcTransactionObjectSupport.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/R2dbcTransactionObjectSupport.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import io.r2dbc.spi.IsolationLevel; import org.springframework.lang.Nullable; @@ -24,7 +24,7 @@ import org.springframework.util.Assert; * {@link io.r2dbc.spi.Connection}. * * @author Mark Paluch - * @see ConnectionFactoryTransactionManager + * @see R2dbcTransactionManager */ public abstract class R2dbcTransactionObjectSupport { diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ReactiveTransactionSynchronization.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/ReactiveTransactionSynchronization.java similarity index 97% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ReactiveTransactionSynchronization.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/ReactiveTransactionSynchronization.java index a476097..4c8487a 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/ReactiveTransactionSynchronization.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/ReactiveTransactionSynchronization.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import java.util.Stack; diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/SimpleConnectionHandle.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/SimpleConnectionHandle.java similarity index 95% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/SimpleConnectionHandle.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/SimpleConnectionHandle.java index 3ef2336..20857a0 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/SimpleConnectionHandle.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/SimpleConnectionHandle.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import io.r2dbc.spi.Connection; diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/SingletonConnectionFactory.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/SingletonConnectionFactory.java similarity index 93% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/SingletonConnectionFactory.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/SingletonConnectionFactory.java index 355688c..ed993ff 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/SingletonConnectionFactory.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/SingletonConnectionFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import io.r2dbc.spi.Connection; import io.r2dbc.spi.ConnectionFactoryMetadata; @@ -25,7 +25,7 @@ import org.reactivestreams.Publisher; /** * Connection holder, wrapping a R2DBC Connection. - * {@link org.springframework.data.r2dbc.function.TransactionalDatabaseClient} binds instances of this class to the + * {@link org.springframework.data.r2dbc.core.TransactionalDatabaseClient} binds instances of this class to the * {@link TransactionResources} for a specific subscription. * * @author Mark Paluch diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/SmartConnectionFactory.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/SmartConnectionFactory.java similarity index 96% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/SmartConnectionFactory.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/SmartConnectionFactory.java index 39a3bbe..d257c8b 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/SmartConnectionFactory.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/SmartConnectionFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import io.r2dbc.spi.Connection; import io.r2dbc.spi.ConnectionFactory; diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/TransactionAwareConnectionFactoryProxy.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/TransactionAwareConnectionFactoryProxy.java similarity index 95% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/TransactionAwareConnectionFactoryProxy.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/TransactionAwareConnectionFactoryProxy.java index 0568a78..ad8650e 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/TransactionAwareConnectionFactoryProxy.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/TransactionAwareConnectionFactoryProxy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import static org.springframework.util.ReflectionUtils.*; @@ -25,7 +25,8 @@ import java.lang.reflect.Proxy; import io.r2dbc.spi.Connection; import io.r2dbc.spi.ConnectionFactory; import io.r2dbc.spi.Wrapped; -import org.springframework.data.r2dbc.function.DatabaseClient; + +import org.springframework.data.r2dbc.core.DatabaseClient; import org.springframework.lang.Nullable; import org.springframework.util.ReflectionUtils; import reactor.core.publisher.Mono; @@ -36,7 +37,7 @@ import reactor.util.function.Tuple2; *

* Data access code that should remain unaware of Spring's data access support can work with this proxy to seamlessly * participate in Spring-managed transactions. Note that the transaction manager, for example - * {@link ConnectionFactoryTransactionManager}, still needs to work with the underlying {@link ConnectionFactory}, + * {@link R2dbcTransactionManager}, still needs to work with the underlying {@link ConnectionFactory}, * not with this proxy. *

* Make sure that {@link TransactionAwareConnectionFactoryProxy} is the outermost {@link ConnectionFactory} of a @@ -44,7 +45,7 @@ import reactor.util.function.Tuple2; * either directly to the target connection pool or to some intermediary proxy/adapter. *

* Delegates to {@link ConnectionFactoryUtils} for automatically participating in thread-bound transactions, for example - * managed by {@link ConnectionFactoryTransactionManager}. {@link #create()} calls and {@code close} calls on returned + * managed by {@link R2dbcTransactionManager}. {@link #create()} calls and {@code close} calls on returned * {@link Connection} will behave properly within a transaction, i.e. always operate on the transactional Connection. If * not within a transaction, normal {@link ConnectionFactory} behavior applies. *

diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/TransactionResources.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/TransactionResources.java similarity index 93% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/TransactionResources.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/TransactionResources.java index 1ae45cc..5324ae2 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/TransactionResources.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/TransactionResources.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import reactor.core.publisher.Mono; -import org.springframework.data.r2dbc.function.TransactionalDatabaseClient; +import org.springframework.data.r2dbc.core.TransactionalDatabaseClient; /** * Transaction context for an ongoing transaction synchronization allowing to register transactional resources. diff --git a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/package-info.java b/src/main/java/org/springframework/data/r2dbc/connectionfactory/package-info.java similarity index 67% rename from src/main/java/org/springframework/data/r2dbc/function/connectionfactory/package-info.java rename to src/main/java/org/springframework/data/r2dbc/connectionfactory/package-info.java index bc8fcfb..6e09329 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/connectionfactory/package-info.java +++ b/src/main/java/org/springframework/data/r2dbc/connectionfactory/package-info.java @@ -3,4 +3,4 @@ */ @org.springframework.lang.NonNullApi @org.springframework.lang.NonNullFields -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; diff --git a/src/main/java/org/springframework/data/r2dbc/function/convert/ColumnMapRowMapper.java b/src/main/java/org/springframework/data/r2dbc/convert/ColumnMapRowMapper.java similarity index 98% rename from src/main/java/org/springframework/data/r2dbc/function/convert/ColumnMapRowMapper.java rename to src/main/java/org/springframework/data/r2dbc/convert/ColumnMapRowMapper.java index 4015f86..3997d02 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/convert/ColumnMapRowMapper.java +++ b/src/main/java/org/springframework/data/r2dbc/convert/ColumnMapRowMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.convert; +package org.springframework.data.r2dbc.convert; import io.r2dbc.spi.ColumnMetadata; import io.r2dbc.spi.Row; diff --git a/src/main/java/org/springframework/data/r2dbc/function/convert/EntityRowMapper.java b/src/main/java/org/springframework/data/r2dbc/convert/EntityRowMapper.java similarity index 96% rename from src/main/java/org/springframework/data/r2dbc/function/convert/EntityRowMapper.java rename to src/main/java/org/springframework/data/r2dbc/convert/EntityRowMapper.java index 5e2b9f2..a551d9c 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/convert/EntityRowMapper.java +++ b/src/main/java/org/springframework/data/r2dbc/convert/EntityRowMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.convert; +package org.springframework.data.r2dbc.convert; import io.r2dbc.spi.Row; import io.r2dbc.spi.RowMetadata; diff --git a/src/main/java/org/springframework/data/r2dbc/function/convert/IterableUtils.java b/src/main/java/org/springframework/data/r2dbc/convert/IterableUtils.java similarity index 96% rename from src/main/java/org/springframework/data/r2dbc/function/convert/IterableUtils.java rename to src/main/java/org/springframework/data/r2dbc/convert/IterableUtils.java index a1de338..a2a8976 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/convert/IterableUtils.java +++ b/src/main/java/org/springframework/data/r2dbc/convert/IterableUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.convert; +package org.springframework.data.r2dbc.convert; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/org/springframework/data/r2dbc/function/convert/MappingR2dbcConverter.java b/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java similarity index 98% rename from src/main/java/org/springframework/data/r2dbc/function/convert/MappingR2dbcConverter.java rename to src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java index 003d327..4224c55 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/convert/MappingR2dbcConverter.java +++ b/src/main/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.convert; +package org.springframework.data.r2dbc.convert; import io.r2dbc.spi.ColumnMetadata; import io.r2dbc.spi.Row; @@ -39,8 +39,8 @@ import org.springframework.data.mapping.context.MappingContext; import org.springframework.data.mapping.model.ConvertingPropertyAccessor; import org.springframework.data.mapping.model.ParameterValueProvider; import org.springframework.data.r2dbc.dialect.ArrayColumns; -import org.springframework.data.r2dbc.domain.OutboundRow; -import org.springframework.data.r2dbc.domain.SettableValue; +import org.springframework.data.r2dbc.mapping.OutboundRow; +import org.springframework.data.r2dbc.mapping.SettableValue; import org.springframework.data.relational.core.conversion.BasicRelationalConverter; import org.springframework.data.relational.core.conversion.RelationalConverter; import org.springframework.data.relational.core.mapping.RelationalPersistentEntity; diff --git a/src/main/java/org/springframework/data/r2dbc/function/convert/R2dbcConverter.java b/src/main/java/org/springframework/data/r2dbc/convert/R2dbcConverter.java similarity index 95% rename from src/main/java/org/springframework/data/r2dbc/function/convert/R2dbcConverter.java rename to src/main/java/org/springframework/data/r2dbc/convert/R2dbcConverter.java index 6f8083a..4852235 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/convert/R2dbcConverter.java +++ b/src/main/java/org/springframework/data/r2dbc/convert/R2dbcConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.convert; +package org.springframework.data.r2dbc.convert; import io.r2dbc.spi.Row; import io.r2dbc.spi.RowMetadata; @@ -25,7 +25,7 @@ import org.springframework.data.convert.EntityReader; import org.springframework.data.convert.EntityWriter; import org.springframework.data.mapping.context.MappingContext; import org.springframework.data.r2dbc.dialect.ArrayColumns; -import org.springframework.data.r2dbc.domain.OutboundRow; +import org.springframework.data.r2dbc.mapping.OutboundRow; import org.springframework.data.relational.core.conversion.RelationalConverter; import org.springframework.data.relational.core.mapping.RelationalPersistentEntity; import org.springframework.data.relational.core.mapping.RelationalPersistentProperty; diff --git a/src/main/java/org/springframework/data/r2dbc/function/convert/R2dbcConverters.java b/src/main/java/org/springframework/data/r2dbc/convert/R2dbcConverters.java similarity index 88% rename from src/main/java/org/springframework/data/r2dbc/function/convert/R2dbcConverters.java rename to src/main/java/org/springframework/data/r2dbc/convert/R2dbcConverters.java index 8315fbd..37ea447 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/convert/R2dbcConverters.java +++ b/src/main/java/org/springframework/data/r2dbc/convert/R2dbcConverters.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.r2dbc.function.convert; +package org.springframework.data.r2dbc.convert; import io.r2dbc.spi.Row; @@ -33,13 +33,13 @@ import org.springframework.core.convert.converter.ConverterFactory; import org.springframework.data.convert.CustomConversions; import org.springframework.data.convert.Jsr310Converters; import org.springframework.data.convert.WritingConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.LocalDateConverterOverride; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.LocalDateTimeConverterOverride; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.LocalTimeConverterOverride; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.RowToOffsetDateTimeConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.RowToStringConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.RowToUuidConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.RowToZonedDateTimeConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.LocalDateConverterOverride; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.LocalDateTimeConverterOverride; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.LocalTimeConverterOverride; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.RowToOffsetDateTimeConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.RowToStringConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.RowToUuidConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.RowToZonedDateTimeConverter; import org.springframework.util.Assert; import org.springframework.util.NumberUtils; diff --git a/src/main/java/org/springframework/data/r2dbc/function/convert/R2dbcCustomConversions.java b/src/main/java/org/springframework/data/r2dbc/convert/R2dbcCustomConversions.java similarity index 94% rename from src/main/java/org/springframework/data/r2dbc/function/convert/R2dbcCustomConversions.java rename to src/main/java/org/springframework/data/r2dbc/convert/R2dbcCustomConversions.java index 57bacf3..1013a27 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/convert/R2dbcCustomConversions.java +++ b/src/main/java/org/springframework/data/r2dbc/convert/R2dbcCustomConversions.java @@ -1,4 +1,4 @@ -package org.springframework.data.r2dbc.function.convert; +package org.springframework.data.r2dbc.convert; import java.util.ArrayList; import java.util.Collection; @@ -7,7 +7,7 @@ import java.util.List; import org.springframework.data.convert.CustomConversions; import org.springframework.data.convert.JodaTimeConverters; -import org.springframework.data.r2dbc.dialect.R2dbcSimpleTypeHolder; +import org.springframework.data.r2dbc.mapping.R2dbcSimpleTypeHolder; /** * Value object to capture custom conversion. {@link R2dbcCustomConversions} also act as factory for diff --git a/src/main/java/org/springframework/data/r2dbc/function/convert/package-info.java b/src/main/java/org/springframework/data/r2dbc/convert/package-info.java similarity index 71% rename from src/main/java/org/springframework/data/r2dbc/function/convert/package-info.java rename to src/main/java/org/springframework/data/r2dbc/convert/package-info.java index 6839311..cb313f6 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/convert/package-info.java +++ b/src/main/java/org/springframework/data/r2dbc/convert/package-info.java @@ -3,4 +3,4 @@ */ @org.springframework.lang.NonNullApi @org.springframework.lang.NonNullFields -package org.springframework.data.r2dbc.function.convert; +package org.springframework.data.r2dbc.convert; diff --git a/src/main/java/org/springframework/data/r2dbc/function/BindParameterSource.java b/src/main/java/org/springframework/data/r2dbc/core/BindParameterSource.java similarity index 97% rename from src/main/java/org/springframework/data/r2dbc/function/BindParameterSource.java rename to src/main/java/org/springframework/data/r2dbc/core/BindParameterSource.java index ed709fa..0e9c877 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/BindParameterSource.java +++ b/src/main/java/org/springframework/data/r2dbc/core/BindParameterSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import org.springframework.lang.Nullable; diff --git a/src/main/java/org/springframework/data/r2dbc/domain/BindableOperation.java b/src/main/java/org/springframework/data/r2dbc/core/BindableOperation.java similarity index 90% rename from src/main/java/org/springframework/data/r2dbc/domain/BindableOperation.java rename to src/main/java/org/springframework/data/r2dbc/core/BindableOperation.java index 22f1baa..b7bf15f 100644 --- a/src/main/java/org/springframework/data/r2dbc/domain/BindableOperation.java +++ b/src/main/java/org/springframework/data/r2dbc/core/BindableOperation.java @@ -13,14 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.domain; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.Statement; -import org.springframework.data.r2dbc.domain.BindTarget; -import org.springframework.data.r2dbc.domain.PreparedOperation; -import org.springframework.data.r2dbc.domain.QueryOperation; -import org.springframework.data.r2dbc.domain.SettableValue; +import org.springframework.data.r2dbc.dialect.BindTarget; +import org.springframework.data.r2dbc.mapping.SettableValue; /** * Extension to {@link QueryOperation} for operations that allow parameter substitution by binding parameter values. diff --git a/src/main/java/org/springframework/data/r2dbc/function/ConnectionAccessor.java b/src/main/java/org/springframework/data/r2dbc/core/ConnectionAccessor.java similarity index 98% rename from src/main/java/org/springframework/data/r2dbc/function/ConnectionAccessor.java rename to src/main/java/org/springframework/data/r2dbc/core/ConnectionAccessor.java index 5a88dbf..ce21988 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/ConnectionAccessor.java +++ b/src/main/java/org/springframework/data/r2dbc/core/ConnectionAccessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.Connection; import reactor.core.publisher.Flux; diff --git a/src/main/java/org/springframework/data/r2dbc/function/DatabaseClient.java b/src/main/java/org/springframework/data/r2dbc/core/DatabaseClient.java similarity index 98% rename from src/main/java/org/springframework/data/r2dbc/function/DatabaseClient.java rename to src/main/java/org/springframework/data/r2dbc/core/DatabaseClient.java index 39f7c8b..1b787e3 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/DatabaseClient.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DatabaseClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.ConnectionFactory; import io.r2dbc.spi.Row; @@ -29,10 +29,9 @@ import org.reactivestreams.Publisher; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import org.springframework.data.r2dbc.domain.PreparedOperation; -import org.springframework.data.r2dbc.domain.SettableValue; -import org.springframework.data.r2dbc.function.query.Criteria; -import org.springframework.data.r2dbc.function.query.Update; +import org.springframework.data.r2dbc.mapping.SettableValue; +import org.springframework.data.r2dbc.query.Criteria; +import org.springframework.data.r2dbc.query.Update; import org.springframework.data.r2dbc.support.R2dbcExceptionTranslator; /** diff --git a/src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClient.java b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java similarity index 98% rename from src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClient.java rename to src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java index b0b7744..ce4923e 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClient.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.Connection; import io.r2dbc.spi.ConnectionFactory; @@ -51,16 +51,14 @@ import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.r2dbc.UncategorizedR2dbcException; -import org.springframework.data.r2dbc.domain.BindTarget; -import org.springframework.data.r2dbc.domain.BindableOperation; -import org.springframework.data.r2dbc.domain.OutboundRow; -import org.springframework.data.r2dbc.domain.PreparedOperation; -import org.springframework.data.r2dbc.domain.SettableValue; -import org.springframework.data.r2dbc.function.connectionfactory.ConnectionFactoryUtils; -import org.springframework.data.r2dbc.function.connectionfactory.ConnectionProxy; -import org.springframework.data.r2dbc.function.convert.ColumnMapRowMapper; -import org.springframework.data.r2dbc.function.query.Criteria; -import org.springframework.data.r2dbc.function.query.Update; +import org.springframework.data.r2dbc.connectionfactory.ConnectionFactoryUtils; +import org.springframework.data.r2dbc.connectionfactory.ConnectionProxy; +import org.springframework.data.r2dbc.convert.ColumnMapRowMapper; +import org.springframework.data.r2dbc.dialect.BindTarget; +import org.springframework.data.r2dbc.mapping.OutboundRow; +import org.springframework.data.r2dbc.mapping.SettableValue; +import org.springframework.data.r2dbc.query.Criteria; +import org.springframework.data.r2dbc.query.Update; import org.springframework.data.r2dbc.support.R2dbcExceptionTranslator; import org.springframework.lang.Nullable; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClientBuilder.java b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientBuilder.java similarity index 97% rename from src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClientBuilder.java rename to src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientBuilder.java index a8d18b5..8edd56d 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClientBuilder.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientBuilder.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.ConnectionFactory; import java.util.function.Consumer; +import org.springframework.data.r2dbc.core.DatabaseClient.Builder; import org.springframework.data.r2dbc.dialect.Database; import org.springframework.data.r2dbc.dialect.Dialect; -import org.springframework.data.r2dbc.function.DatabaseClient.Builder; import org.springframework.data.r2dbc.support.R2dbcExceptionSubclassTranslator; import org.springframework.data.r2dbc.support.R2dbcExceptionTranslator; import org.springframework.lang.Nullable; diff --git a/src/main/java/org/springframework/data/r2dbc/function/DefaultFetchSpec.java b/src/main/java/org/springframework/data/r2dbc/core/DefaultFetchSpec.java similarity index 97% rename from src/main/java/org/springframework/data/r2dbc/function/DefaultFetchSpec.java rename to src/main/java/org/springframework/data/r2dbc/core/DefaultFetchSpec.java index a1e8556..0f64b7e 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/DefaultFetchSpec.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultFetchSpec.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.Connection; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/org/springframework/data/r2dbc/function/DefaultReactiveDataAccessStrategy.java b/src/main/java/org/springframework/data/r2dbc/core/DefaultReactiveDataAccessStrategy.java similarity index 94% rename from src/main/java/org/springframework/data/r2dbc/function/DefaultReactiveDataAccessStrategy.java rename to src/main/java/org/springframework/data/r2dbc/core/DefaultReactiveDataAccessStrategy.java index a7b7af1..841c6c1 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/DefaultReactiveDataAccessStrategy.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultReactiveDataAccessStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.Row; import io.r2dbc.spi.RowMetadata; @@ -27,16 +27,16 @@ import java.util.function.Function; import org.springframework.dao.InvalidDataAccessResourceUsageException; import org.springframework.data.convert.CustomConversions.StoreConversions; import org.springframework.data.mapping.context.MappingContext; +import org.springframework.data.r2dbc.convert.EntityRowMapper; +import org.springframework.data.r2dbc.convert.MappingR2dbcConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverter; +import org.springframework.data.r2dbc.convert.R2dbcCustomConversions; import org.springframework.data.r2dbc.dialect.ArrayColumns; import org.springframework.data.r2dbc.dialect.BindMarkersFactory; import org.springframework.data.r2dbc.dialect.Dialect; -import org.springframework.data.r2dbc.domain.OutboundRow; -import org.springframework.data.r2dbc.domain.SettableValue; -import org.springframework.data.r2dbc.function.convert.EntityRowMapper; -import org.springframework.data.r2dbc.function.convert.MappingR2dbcConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcCustomConversions; -import org.springframework.data.r2dbc.function.query.UpdateMapper; +import org.springframework.data.r2dbc.mapping.OutboundRow; +import org.springframework.data.r2dbc.mapping.SettableValue; +import org.springframework.data.r2dbc.query.UpdateMapper; import org.springframework.data.relational.core.mapping.RelationalMappingContext; import org.springframework.data.relational.core.mapping.RelationalPersistentEntity; import org.springframework.data.relational.core.mapping.RelationalPersistentProperty; diff --git a/src/main/java/org/springframework/data/r2dbc/function/DefaultSqlResult.java b/src/main/java/org/springframework/data/r2dbc/core/DefaultSqlResult.java similarity index 98% rename from src/main/java/org/springframework/data/r2dbc/function/DefaultSqlResult.java rename to src/main/java/org/springframework/data/r2dbc/core/DefaultSqlResult.java index 294e5ce..bf31892 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/DefaultSqlResult.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultSqlResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.Connection; import io.r2dbc.spi.Result; diff --git a/src/main/java/org/springframework/data/r2dbc/function/DefaultStatementMapper.java b/src/main/java/org/springframework/data/r2dbc/core/DefaultStatementMapper.java similarity index 97% rename from src/main/java/org/springframework/data/r2dbc/function/DefaultStatementMapper.java rename to src/main/java/org/springframework/data/r2dbc/core/DefaultStatementMapper.java index bdf7c31..ae2d806 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/DefaultStatementMapper.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultStatementMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import lombok.RequiredArgsConstructor; @@ -26,13 +26,12 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.mapping.context.MappingContext; import org.springframework.data.r2dbc.dialect.BindMarkers; +import org.springframework.data.r2dbc.dialect.BindTarget; import org.springframework.data.r2dbc.dialect.Bindings; import org.springframework.data.r2dbc.dialect.Dialect; -import org.springframework.data.r2dbc.domain.BindTarget; -import org.springframework.data.r2dbc.domain.PreparedOperation; -import org.springframework.data.r2dbc.function.query.BoundAssignments; -import org.springframework.data.r2dbc.function.query.BoundCondition; -import org.springframework.data.r2dbc.function.query.UpdateMapper; +import org.springframework.data.r2dbc.query.BoundAssignments; +import org.springframework.data.r2dbc.query.BoundCondition; +import org.springframework.data.r2dbc.query.UpdateMapper; import org.springframework.data.r2dbc.support.StatementRenderUtil; import org.springframework.data.relational.core.mapping.RelationalPersistentEntity; import org.springframework.data.relational.core.mapping.RelationalPersistentProperty; diff --git a/src/main/java/org/springframework/data/r2dbc/function/DefaultTransactionalDatabaseClient.java b/src/main/java/org/springframework/data/r2dbc/core/DefaultTransactionalDatabaseClient.java similarity index 94% rename from src/main/java/org/springframework/data/r2dbc/function/DefaultTransactionalDatabaseClient.java rename to src/main/java/org/springframework/data/r2dbc/core/DefaultTransactionalDatabaseClient.java index 3d78303..741e61d 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/DefaultTransactionalDatabaseClient.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultTransactionalDatabaseClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.Connection; import io.r2dbc.spi.ConnectionFactory; @@ -25,10 +25,9 @@ import reactor.util.function.Tuple2; import java.util.function.Function; import org.reactivestreams.Publisher; - -import org.springframework.data.r2dbc.function.connectionfactory.ConnectionFactoryUtils; -import org.springframework.data.r2dbc.function.connectionfactory.ReactiveTransactionSynchronization; -import org.springframework.data.r2dbc.function.connectionfactory.TransactionResources; +import org.springframework.data.r2dbc.connectionfactory.ConnectionFactoryUtils; +import org.springframework.data.r2dbc.connectionfactory.ReactiveTransactionSynchronization; +import org.springframework.data.r2dbc.connectionfactory.TransactionResources; import org.springframework.data.r2dbc.support.R2dbcExceptionTranslator; import org.springframework.transaction.NoTransactionException; diff --git a/src/main/java/org/springframework/data/r2dbc/function/DefaultTransactionalDatabaseClientBuilder.java b/src/main/java/org/springframework/data/r2dbc/core/DefaultTransactionalDatabaseClientBuilder.java similarity index 96% rename from src/main/java/org/springframework/data/r2dbc/function/DefaultTransactionalDatabaseClientBuilder.java rename to src/main/java/org/springframework/data/r2dbc/core/DefaultTransactionalDatabaseClientBuilder.java index 444afd2..f7bbcfa 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/DefaultTransactionalDatabaseClientBuilder.java +++ b/src/main/java/org/springframework/data/r2dbc/core/DefaultTransactionalDatabaseClientBuilder.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.ConnectionFactory; import java.util.function.Consumer; -import org.springframework.data.r2dbc.function.DatabaseClient.Builder; +import org.springframework.data.r2dbc.core.DatabaseClient.Builder; import org.springframework.data.r2dbc.support.R2dbcExceptionTranslator; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/r2dbc/function/FetchSpec.java b/src/main/java/org/springframework/data/r2dbc/core/FetchSpec.java similarity index 94% rename from src/main/java/org/springframework/data/r2dbc/function/FetchSpec.java rename to src/main/java/org/springframework/data/r2dbc/core/FetchSpec.java index cf3080c..158945c 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/FetchSpec.java +++ b/src/main/java/org/springframework/data/r2dbc/core/FetchSpec.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; /** * Contract for fetching results. diff --git a/src/main/java/org/springframework/data/r2dbc/function/MapBindParameterSource.java b/src/main/java/org/springframework/data/r2dbc/core/MapBindParameterSource.java similarity index 96% rename from src/main/java/org/springframework/data/r2dbc/function/MapBindParameterSource.java rename to src/main/java/org/springframework/data/r2dbc/core/MapBindParameterSource.java index 2d03191..40717b7 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/MapBindParameterSource.java +++ b/src/main/java/org/springframework/data/r2dbc/core/MapBindParameterSource.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.data.r2dbc.domain.SettableValue; +import org.springframework.data.r2dbc.mapping.SettableValue; import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/r2dbc/function/NamedParameterExpander.java b/src/main/java/org/springframework/data/r2dbc/core/NamedParameterExpander.java similarity index 96% rename from src/main/java/org/springframework/data/r2dbc/function/NamedParameterExpander.java rename to src/main/java/org/springframework/data/r2dbc/core/NamedParameterExpander.java index a716206..e2f419d 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/NamedParameterExpander.java +++ b/src/main/java/org/springframework/data/r2dbc/core/NamedParameterExpander.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import java.util.LinkedHashMap; import java.util.Map; @@ -22,8 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.data.r2dbc.dialect.BindMarkersFactory; -import org.springframework.data.r2dbc.domain.BindTarget; -import org.springframework.data.r2dbc.domain.BindableOperation; +import org.springframework.data.r2dbc.dialect.BindTarget; /** * SQL translation support allowing the use of named parameters rather than native placeholders. diff --git a/src/main/java/org/springframework/data/r2dbc/function/NamedParameterUtils.java b/src/main/java/org/springframework/data/r2dbc/core/NamedParameterUtils.java similarity index 98% rename from src/main/java/org/springframework/data/r2dbc/function/NamedParameterUtils.java rename to src/main/java/org/springframework/data/r2dbc/core/NamedParameterUtils.java index 048d012..88ff313 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/NamedParameterUtils.java +++ b/src/main/java/org/springframework/data/r2dbc/core/NamedParameterUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import lombok.Value; @@ -30,8 +30,7 @@ import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.r2dbc.dialect.BindMarker; import org.springframework.data.r2dbc.dialect.BindMarkers; import org.springframework.data.r2dbc.dialect.BindMarkersFactory; -import org.springframework.data.r2dbc.domain.BindTarget; -import org.springframework.data.r2dbc.domain.BindableOperation; +import org.springframework.data.r2dbc.dialect.BindTarget; import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/r2dbc/function/ParsedSql.java b/src/main/java/org/springframework/data/r2dbc/core/ParsedSql.java similarity index 98% rename from src/main/java/org/springframework/data/r2dbc/function/ParsedSql.java rename to src/main/java/org/springframework/data/r2dbc/core/ParsedSql.java index 651be9c..e25df40 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/ParsedSql.java +++ b/src/main/java/org/springframework/data/r2dbc/core/ParsedSql.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/springframework/data/r2dbc/domain/PreparedOperation.java b/src/main/java/org/springframework/data/r2dbc/core/PreparedOperation.java similarity index 79% rename from src/main/java/org/springframework/data/r2dbc/domain/PreparedOperation.java rename to src/main/java/org/springframework/data/r2dbc/core/PreparedOperation.java index 5136580..1d21a1d 100644 --- a/src/main/java/org/springframework/data/r2dbc/domain/PreparedOperation.java +++ b/src/main/java/org/springframework/data/r2dbc/core/PreparedOperation.java @@ -13,21 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.domain; +package org.springframework.data.r2dbc.core; import java.util.function.Supplier; +import org.springframework.data.r2dbc.dialect.BindTarget; + /** * Extension to {@link QueryOperation} for a prepared SQL query {@link Supplier} with bound parameters. Contains * parameter bindings that can be {@link #bindTo bound} bound to a {@link BindTarget}. *

- * Can be executed with {@link org.springframework.data.r2dbc.function.DatabaseClient}. + * Can be executed with {@link org.springframework.data.r2dbc.core.DatabaseClient}. *

* * @param underlying operation source. * @author Mark Paluch - * @see org.springframework.data.r2dbc.function.DatabaseClient - * @see org.springframework.data.r2dbc.function.DatabaseClient.SqlSpec#sql(Supplier) + * @see org.springframework.data.r2dbc.core.DatabaseClient + * @see org.springframework.data.r2dbc.core.DatabaseClient.SqlSpec#sql(Supplier) */ public interface PreparedOperation extends QueryOperation { diff --git a/src/main/java/org/springframework/data/r2dbc/domain/QueryOperation.java b/src/main/java/org/springframework/data/r2dbc/core/QueryOperation.java similarity index 96% rename from src/main/java/org/springframework/data/r2dbc/domain/QueryOperation.java rename to src/main/java/org/springframework/data/r2dbc/core/QueryOperation.java index 05d70c9..698a9c8 100644 --- a/src/main/java/org/springframework/data/r2dbc/domain/QueryOperation.java +++ b/src/main/java/org/springframework/data/r2dbc/core/QueryOperation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.domain; +package org.springframework.data.r2dbc.core; import java.util.function.Supplier; diff --git a/src/main/java/org/springframework/data/r2dbc/function/ReactiveDataAccessStrategy.java b/src/main/java/org/springframework/data/r2dbc/core/ReactiveDataAccessStrategy.java similarity index 89% rename from src/main/java/org/springframework/data/r2dbc/function/ReactiveDataAccessStrategy.java rename to src/main/java/org/springframework/data/r2dbc/core/ReactiveDataAccessStrategy.java index 7e33154..0070cd6 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/ReactiveDataAccessStrategy.java +++ b/src/main/java/org/springframework/data/r2dbc/core/ReactiveDataAccessStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.Row; import io.r2dbc.spi.RowMetadata; @@ -21,12 +21,11 @@ import io.r2dbc.spi.RowMetadata; import java.util.List; import java.util.function.BiFunction; +import org.springframework.data.r2dbc.convert.R2dbcConverter; import org.springframework.data.r2dbc.dialect.BindMarkersFactory; import org.springframework.data.r2dbc.dialect.Dialect; -import org.springframework.data.r2dbc.domain.BindableOperation; -import org.springframework.data.r2dbc.domain.OutboundRow; -import org.springframework.data.r2dbc.domain.SettableValue; -import org.springframework.data.r2dbc.function.convert.R2dbcConverter; +import org.springframework.data.r2dbc.mapping.OutboundRow; +import org.springframework.data.r2dbc.mapping.SettableValue; /** * Data access strategy that generalizes convenience operations using mapped entities. Typically used internally by diff --git a/src/main/java/org/springframework/data/r2dbc/function/RowsFetchSpec.java b/src/main/java/org/springframework/data/r2dbc/core/RowsFetchSpec.java similarity index 96% rename from src/main/java/org/springframework/data/r2dbc/function/RowsFetchSpec.java rename to src/main/java/org/springframework/data/r2dbc/core/RowsFetchSpec.java index 6c96962..06f3030 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/RowsFetchSpec.java +++ b/src/main/java/org/springframework/data/r2dbc/core/RowsFetchSpec.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/src/main/java/org/springframework/data/r2dbc/function/SqlProvider.java b/src/main/java/org/springframework/data/r2dbc/core/SqlProvider.java similarity index 96% rename from src/main/java/org/springframework/data/r2dbc/function/SqlProvider.java rename to src/main/java/org/springframework/data/r2dbc/core/SqlProvider.java index 8384324..6a04e38 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/SqlProvider.java +++ b/src/main/java/org/springframework/data/r2dbc/core/SqlProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import org.springframework.lang.Nullable; diff --git a/src/main/java/org/springframework/data/r2dbc/function/SqlResult.java b/src/main/java/org/springframework/data/r2dbc/core/SqlResult.java similarity index 96% rename from src/main/java/org/springframework/data/r2dbc/function/SqlResult.java rename to src/main/java/org/springframework/data/r2dbc/core/SqlResult.java index 1c6cac0..fe4a6d4 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/SqlResult.java +++ b/src/main/java/org/springframework/data/r2dbc/core/SqlResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.Row; import io.r2dbc.spi.RowMetadata; diff --git a/src/main/java/org/springframework/data/r2dbc/function/StatementMapper.java b/src/main/java/org/springframework/data/r2dbc/core/StatementMapper.java similarity index 96% rename from src/main/java/org/springframework/data/r2dbc/function/StatementMapper.java rename to src/main/java/org/springframework/data/r2dbc/core/StatementMapper.java index 0f03e37..6641eb5 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/StatementMapper.java +++ b/src/main/java/org/springframework/data/r2dbc/core/StatementMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import java.util.ArrayList; import java.util.Collection; @@ -26,10 +26,9 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.r2dbc.dialect.BindMarkers; import org.springframework.data.r2dbc.dialect.Dialect; -import org.springframework.data.r2dbc.domain.PreparedOperation; -import org.springframework.data.r2dbc.domain.SettableValue; -import org.springframework.data.r2dbc.function.query.Criteria; -import org.springframework.data.r2dbc.function.query.Update; +import org.springframework.data.r2dbc.mapping.SettableValue; +import org.springframework.data.r2dbc.query.Criteria; +import org.springframework.data.r2dbc.query.Update; import org.springframework.lang.Nullable; /** diff --git a/src/main/java/org/springframework/data/r2dbc/function/TransactionalDatabaseClient.java b/src/main/java/org/springframework/data/r2dbc/core/TransactionalDatabaseClient.java similarity index 95% rename from src/main/java/org/springframework/data/r2dbc/function/TransactionalDatabaseClient.java rename to src/main/java/org/springframework/data/r2dbc/core/TransactionalDatabaseClient.java index f1c6a0b..f0d6a35 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/TransactionalDatabaseClient.java +++ b/src/main/java/org/springframework/data/r2dbc/core/TransactionalDatabaseClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.ConnectionFactory; import reactor.core.publisher.Flux; @@ -23,8 +23,7 @@ import java.util.function.Consumer; import java.util.function.Function; import org.reactivestreams.Publisher; - -import org.springframework.data.r2dbc.function.connectionfactory.TransactionResources; +import org.springframework.data.r2dbc.connectionfactory.TransactionResources; import org.springframework.data.r2dbc.support.R2dbcExceptionTranslator; import org.springframework.transaction.reactive.TransactionalOperator; import org.springframework.util.Assert; @@ -76,9 +75,9 @@ import org.springframework.util.Assert; * @see #beginTransaction() * @see #commitTransaction() * @see #rollbackTransaction() - * @see org.springframework.data.r2dbc.function.connectionfactory.ReactiveTransactionSynchronization + * @see org.springframework.data.r2dbc.connectionfactory.ReactiveTransactionSynchronization * @see TransactionResources - * @see org.springframework.data.r2dbc.function.connectionfactory.ConnectionFactoryUtils + * @see org.springframework.data.r2dbc.connectionfactory.ConnectionFactoryUtils * @deprecated Use {@link DatabaseClient} in combination with {@link TransactionalOperator}. */ @Deprecated diff --git a/src/main/java/org/springframework/data/r2dbc/function/UpdatedRowsFetchSpec.java b/src/main/java/org/springframework/data/r2dbc/core/UpdatedRowsFetchSpec.java similarity index 95% rename from src/main/java/org/springframework/data/r2dbc/function/UpdatedRowsFetchSpec.java rename to src/main/java/org/springframework/data/r2dbc/core/UpdatedRowsFetchSpec.java index 2410018..c810aac 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/UpdatedRowsFetchSpec.java +++ b/src/main/java/org/springframework/data/r2dbc/core/UpdatedRowsFetchSpec.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import reactor.core.publisher.Mono; diff --git a/src/main/java/org/springframework/data/r2dbc/function/package-info.java b/src/main/java/org/springframework/data/r2dbc/core/package-info.java similarity index 72% rename from src/main/java/org/springframework/data/r2dbc/function/package-info.java rename to src/main/java/org/springframework/data/r2dbc/core/package-info.java index 67ca602..4263407 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/package-info.java +++ b/src/main/java/org/springframework/data/r2dbc/core/package-info.java @@ -3,4 +3,4 @@ */ @org.springframework.lang.NonNullApi @org.springframework.lang.NonNullFields -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; diff --git a/src/main/java/org/springframework/data/r2dbc/dialect/BindMarker.java b/src/main/java/org/springframework/data/r2dbc/dialect/BindMarker.java index 87b47ea..1afa700 100644 --- a/src/main/java/org/springframework/data/r2dbc/dialect/BindMarker.java +++ b/src/main/java/org/springframework/data/r2dbc/dialect/BindMarker.java @@ -2,8 +2,6 @@ package org.springframework.data.r2dbc.dialect; import io.r2dbc.spi.Statement; -import org.springframework.data.r2dbc.domain.BindTarget; - /** * A bind marker represents a single bindable parameter within a query. Bind markers are dialect-specific and provide a * {@link #getPlaceholder() placeholder} that is used in the actual query. diff --git a/src/main/java/org/springframework/data/r2dbc/domain/BindTarget.java b/src/main/java/org/springframework/data/r2dbc/dialect/BindTarget.java similarity index 93% rename from src/main/java/org/springframework/data/r2dbc/domain/BindTarget.java rename to src/main/java/org/springframework/data/r2dbc/dialect/BindTarget.java index 0215e7e..07ea885 100644 --- a/src/main/java/org/springframework/data/r2dbc/domain/BindTarget.java +++ b/src/main/java/org/springframework/data/r2dbc/dialect/BindTarget.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.domain; +package org.springframework.data.r2dbc.dialect; + +import org.springframework.data.r2dbc.core.PreparedOperation; /** * Target to apply bindings to. diff --git a/src/main/java/org/springframework/data/r2dbc/dialect/Bindings.java b/src/main/java/org/springframework/data/r2dbc/dialect/Bindings.java index 94fb90e..fce5fb7 100644 --- a/src/main/java/org/springframework/data/r2dbc/dialect/Bindings.java +++ b/src/main/java/org/springframework/data/r2dbc/dialect/Bindings.java @@ -27,7 +27,6 @@ import java.util.Map; import java.util.Spliterator; import java.util.function.Consumer; -import org.springframework.data.r2dbc.domain.BindTarget; import org.springframework.data.util.Streamable; import org.springframework.lang.Nullable; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/r2dbc/dialect/Dialect.java b/src/main/java/org/springframework/data/r2dbc/dialect/Dialect.java index 9314527..7edc6e8 100644 --- a/src/main/java/org/springframework/data/r2dbc/dialect/Dialect.java +++ b/src/main/java/org/springframework/data/r2dbc/dialect/Dialect.java @@ -7,6 +7,7 @@ import java.util.Set; import org.springframework.data.mapping.model.SimpleTypeHolder; import org.springframework.data.r2dbc.dialect.ArrayColumns.Unsupported; +import org.springframework.data.r2dbc.mapping.R2dbcSimpleTypeHolder; /** * Represents a dialect that is implemented by a particular database. diff --git a/src/main/java/org/springframework/data/r2dbc/dialect/IndexedBindMarker.java b/src/main/java/org/springframework/data/r2dbc/dialect/IndexedBindMarker.java index 06f8ec6..7f4e3d9 100644 --- a/src/main/java/org/springframework/data/r2dbc/dialect/IndexedBindMarker.java +++ b/src/main/java/org/springframework/data/r2dbc/dialect/IndexedBindMarker.java @@ -15,8 +15,6 @@ */ package org.springframework.data.r2dbc.dialect; -import org.springframework.data.r2dbc.domain.BindTarget; - /** * A single indexed bind marker. */ diff --git a/src/main/java/org/springframework/data/r2dbc/dialect/NamedBindMarkers.java b/src/main/java/org/springframework/data/r2dbc/dialect/NamedBindMarkers.java index 6f87466..7f1dd0f 100644 --- a/src/main/java/org/springframework/data/r2dbc/dialect/NamedBindMarkers.java +++ b/src/main/java/org/springframework/data/r2dbc/dialect/NamedBindMarkers.java @@ -3,7 +3,6 @@ package org.springframework.data.r2dbc.dialect; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.function.Function; -import org.springframework.data.r2dbc.domain.BindTarget; import org.springframework.util.Assert; /** diff --git a/src/main/java/org/springframework/data/r2dbc/domain/OutboundRow.java b/src/main/java/org/springframework/data/r2dbc/mapping/OutboundRow.java similarity index 99% rename from src/main/java/org/springframework/data/r2dbc/domain/OutboundRow.java rename to src/main/java/org/springframework/data/r2dbc/mapping/OutboundRow.java index 159c80b..1ae4af4 100644 --- a/src/main/java/org/springframework/data/r2dbc/domain/OutboundRow.java +++ b/src/main/java/org/springframework/data/r2dbc/mapping/OutboundRow.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.domain; +package org.springframework.data.r2dbc.mapping; import io.r2dbc.spi.Row; diff --git a/src/main/java/org/springframework/data/r2dbc/dialect/R2dbcSimpleTypeHolder.java b/src/main/java/org/springframework/data/r2dbc/mapping/R2dbcSimpleTypeHolder.java similarity index 93% rename from src/main/java/org/springframework/data/r2dbc/dialect/R2dbcSimpleTypeHolder.java rename to src/main/java/org/springframework/data/r2dbc/mapping/R2dbcSimpleTypeHolder.java index 3b6aa93..2d6fb64 100644 --- a/src/main/java/org/springframework/data/r2dbc/dialect/R2dbcSimpleTypeHolder.java +++ b/src/main/java/org/springframework/data/r2dbc/mapping/R2dbcSimpleTypeHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.dialect; +package org.springframework.data.r2dbc.mapping; import io.r2dbc.spi.Row; @@ -25,7 +25,6 @@ import java.util.HashSet; import java.util.Set; import org.springframework.data.mapping.model.SimpleTypeHolder; -import org.springframework.data.r2dbc.domain.OutboundRow; /** * Simple constant holder for a {@link SimpleTypeHolder} enriched with R2DBC specific simple types. diff --git a/src/main/java/org/springframework/data/r2dbc/domain/SettableValue.java b/src/main/java/org/springframework/data/r2dbc/mapping/SettableValue.java similarity index 98% rename from src/main/java/org/springframework/data/r2dbc/domain/SettableValue.java rename to src/main/java/org/springframework/data/r2dbc/mapping/SettableValue.java index 36926bb..a190cfb 100644 --- a/src/main/java/org/springframework/data/r2dbc/domain/SettableValue.java +++ b/src/main/java/org/springframework/data/r2dbc/mapping/SettableValue.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.domain; +package org.springframework.data.r2dbc.mapping; import java.util.Objects; diff --git a/src/main/java/org/springframework/data/r2dbc/domain/package-info.java b/src/main/java/org/springframework/data/r2dbc/mapping/package-info.java similarity index 66% rename from src/main/java/org/springframework/data/r2dbc/domain/package-info.java rename to src/main/java/org/springframework/data/r2dbc/mapping/package-info.java index 2ca5d1d..b3712b5 100644 --- a/src/main/java/org/springframework/data/r2dbc/domain/package-info.java +++ b/src/main/java/org/springframework/data/r2dbc/mapping/package-info.java @@ -2,6 +2,6 @@ * Domain objects for R2DBC. */ @NonNullApi -package org.springframework.data.r2dbc.domain; +package org.springframework.data.r2dbc.mapping; import org.springframework.lang.NonNullApi; diff --git a/src/main/java/org/springframework/data/r2dbc/function/query/BoundAssignments.java b/src/main/java/org/springframework/data/r2dbc/query/BoundAssignments.java similarity index 96% rename from src/main/java/org/springframework/data/r2dbc/function/query/BoundAssignments.java rename to src/main/java/org/springframework/data/r2dbc/query/BoundAssignments.java index 0a3bd3f..1de3da1 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/query/BoundAssignments.java +++ b/src/main/java/org/springframework/data/r2dbc/query/BoundAssignments.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.query; +package org.springframework.data.r2dbc.query; import java.util.List; diff --git a/src/main/java/org/springframework/data/r2dbc/function/query/BoundCondition.java b/src/main/java/org/springframework/data/r2dbc/query/BoundCondition.java similarity index 96% rename from src/main/java/org/springframework/data/r2dbc/function/query/BoundCondition.java rename to src/main/java/org/springframework/data/r2dbc/query/BoundCondition.java index a9cba31..a500056 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/query/BoundCondition.java +++ b/src/main/java/org/springframework/data/r2dbc/query/BoundCondition.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.query; +package org.springframework.data.r2dbc.query; import org.springframework.data.r2dbc.dialect.Bindings; import org.springframework.data.relational.core.sql.Condition; diff --git a/src/main/java/org/springframework/data/r2dbc/function/query/Criteria.java b/src/main/java/org/springframework/data/r2dbc/query/Criteria.java similarity index 99% rename from src/main/java/org/springframework/data/r2dbc/function/query/Criteria.java rename to src/main/java/org/springframework/data/r2dbc/query/Criteria.java index be48f74..0e0668c 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/query/Criteria.java +++ b/src/main/java/org/springframework/data/r2dbc/query/Criteria.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.query; +package org.springframework.data.r2dbc.query; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/org/springframework/data/r2dbc/function/query/QueryMapper.java b/src/main/java/org/springframework/data/r2dbc/query/QueryMapper.java similarity index 97% rename from src/main/java/org/springframework/data/r2dbc/function/query/QueryMapper.java rename to src/main/java/org/springframework/data/r2dbc/query/QueryMapper.java index 752a1d0..9107705 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/query/QueryMapper.java +++ b/src/main/java/org/springframework/data/r2dbc/query/QueryMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.query; +package org.springframework.data.r2dbc.query; import java.util.ArrayList; import java.util.Collection; @@ -27,14 +27,14 @@ import org.springframework.data.mapping.PropertyPath; import org.springframework.data.mapping.PropertyReferenceException; import org.springframework.data.mapping.context.InvalidPersistentPropertyPath; import org.springframework.data.mapping.context.MappingContext; +import org.springframework.data.r2dbc.convert.R2dbcConverter; import org.springframework.data.r2dbc.dialect.BindMarker; import org.springframework.data.r2dbc.dialect.BindMarkers; import org.springframework.data.r2dbc.dialect.Bindings; import org.springframework.data.r2dbc.dialect.MutableBindings; -import org.springframework.data.r2dbc.domain.SettableValue; -import org.springframework.data.r2dbc.function.convert.R2dbcConverter; -import org.springframework.data.r2dbc.function.query.Criteria.Combinator; -import org.springframework.data.r2dbc.function.query.Criteria.Comparator; +import org.springframework.data.r2dbc.mapping.SettableValue; +import org.springframework.data.r2dbc.query.Criteria.Combinator; +import org.springframework.data.r2dbc.query.Criteria.Comparator; import org.springframework.data.relational.core.mapping.RelationalPersistentEntity; import org.springframework.data.relational.core.mapping.RelationalPersistentProperty; import org.springframework.data.relational.core.sql.Column; diff --git a/src/main/java/org/springframework/data/r2dbc/function/query/Update.java b/src/main/java/org/springframework/data/r2dbc/query/Update.java similarity index 97% rename from src/main/java/org/springframework/data/r2dbc/function/query/Update.java rename to src/main/java/org/springframework/data/r2dbc/query/Update.java index 6d59040..48e5f28 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/query/Update.java +++ b/src/main/java/org/springframework/data/r2dbc/query/Update.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.query; +package org.springframework.data.r2dbc.query; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/src/main/java/org/springframework/data/r2dbc/function/query/UpdateMapper.java b/src/main/java/org/springframework/data/r2dbc/query/UpdateMapper.java similarity index 96% rename from src/main/java/org/springframework/data/r2dbc/function/query/UpdateMapper.java rename to src/main/java/org/springframework/data/r2dbc/query/UpdateMapper.java index b28a7ab..195348f 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/query/UpdateMapper.java +++ b/src/main/java/org/springframework/data/r2dbc/query/UpdateMapper.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.query; +package org.springframework.data.r2dbc.query; import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.springframework.data.r2dbc.convert.R2dbcConverter; import org.springframework.data.r2dbc.dialect.BindMarker; import org.springframework.data.r2dbc.dialect.BindMarkers; import org.springframework.data.r2dbc.dialect.Bindings; import org.springframework.data.r2dbc.dialect.MutableBindings; -import org.springframework.data.r2dbc.domain.SettableValue; -import org.springframework.data.r2dbc.function.convert.R2dbcConverter; +import org.springframework.data.r2dbc.mapping.SettableValue; import org.springframework.data.relational.core.mapping.RelationalPersistentEntity; import org.springframework.data.relational.core.sql.AssignValue; import org.springframework.data.relational.core.sql.Assignment; diff --git a/src/main/java/org/springframework/data/r2dbc/function/query/package-info.java b/src/main/java/org/springframework/data/r2dbc/query/package-info.java similarity index 67% rename from src/main/java/org/springframework/data/r2dbc/function/query/package-info.java rename to src/main/java/org/springframework/data/r2dbc/query/package-info.java index 42e5779..572bc04 100644 --- a/src/main/java/org/springframework/data/r2dbc/function/query/package-info.java +++ b/src/main/java/org/springframework/data/r2dbc/query/package-info.java @@ -3,4 +3,4 @@ */ @org.springframework.lang.NonNullApi @org.springframework.lang.NonNullFields -package org.springframework.data.r2dbc.function.query; +package org.springframework.data.r2dbc.query; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/config/EnableR2dbcRepositories.java b/src/main/java/org/springframework/data/r2dbc/repository/config/EnableR2dbcRepositories.java index b0e0e10..eeface9 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/config/EnableR2dbcRepositories.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/config/EnableR2dbcRepositories.java @@ -117,7 +117,7 @@ public @interface EnableR2dbcRepositories { Class repositoryBaseClass() default DefaultRepositoryBaseClass.class; /** - * Configures the name of the {@link org.springframework.data.r2dbc.function.DatabaseClient} bean to be used with the + * Configures the name of the {@link org.springframework.data.r2dbc.core.DatabaseClient} bean to be used with the * repositories detected. * * @return diff --git a/src/main/java/org/springframework/data/r2dbc/repository/query/AbstractR2dbcQuery.java b/src/main/java/org/springframework/data/r2dbc/repository/query/AbstractR2dbcQuery.java index b3e17cf..3adca38 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/query/AbstractR2dbcQuery.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/query/AbstractR2dbcQuery.java @@ -22,10 +22,10 @@ import org.reactivestreams.Publisher; import org.springframework.core.convert.converter.Converter; import org.springframework.data.convert.EntityInstantiators; -import org.springframework.data.r2dbc.function.DatabaseClient; -import org.springframework.data.r2dbc.function.DatabaseClient.GenericExecuteSpec; -import org.springframework.data.r2dbc.function.FetchSpec; -import org.springframework.data.r2dbc.function.convert.R2dbcConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverter; +import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.data.r2dbc.core.FetchSpec; +import org.springframework.data.r2dbc.core.DatabaseClient.GenericExecuteSpec; import org.springframework.data.r2dbc.repository.query.R2dbcQueryExecution.ResultProcessingConverter; import org.springframework.data.r2dbc.repository.query.R2dbcQueryExecution.ResultProcessingExecution; import org.springframework.data.relational.repository.query.RelationalParameterAccessor; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/query/BindableQuery.java b/src/main/java/org/springframework/data/r2dbc/repository/query/BindableQuery.java index bff0101..7d171bb 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/query/BindableQuery.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/query/BindableQuery.java @@ -17,7 +17,7 @@ package org.springframework.data.r2dbc.repository.query; import java.util.function.Supplier; -import org.springframework.data.r2dbc.function.DatabaseClient.BindSpec; +import org.springframework.data.r2dbc.core.DatabaseClient.BindSpec; /** * Interface declaring a query that supplies SQL and can bind parameters to a {@link BindSpec}. diff --git a/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryExecution.java b/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryExecution.java index 32ce93f..77a657e 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryExecution.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryExecution.java @@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.core.convert.converter.Converter; import org.springframework.data.convert.EntityInstantiators; import org.springframework.data.mapping.context.MappingContext; -import org.springframework.data.r2dbc.function.FetchSpec; +import org.springframework.data.r2dbc.core.FetchSpec; import org.springframework.data.relational.core.mapping.RelationalPersistentEntity; import org.springframework.data.relational.core.mapping.RelationalPersistentProperty; import org.springframework.data.relational.repository.query.DtoInstantiatingConverter; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQuery.java b/src/main/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQuery.java index 833ee53..8840d84 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQuery.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQuery.java @@ -15,9 +15,9 @@ */ package org.springframework.data.r2dbc.repository.query; -import org.springframework.data.r2dbc.function.DatabaseClient; -import org.springframework.data.r2dbc.function.DatabaseClient.BindSpec; -import org.springframework.data.r2dbc.function.convert.R2dbcConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverter; +import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.data.r2dbc.core.DatabaseClient.BindSpec; import org.springframework.data.relational.repository.query.RelationalParameterAccessor; import org.springframework.data.repository.query.Parameter; import org.springframework.data.repository.query.Parameters; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/support/BindSpecAdapter.java b/src/main/java/org/springframework/data/r2dbc/repository/support/BindSpecAdapter.java index 6b2cd6b..d28609a 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/support/BindSpecAdapter.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/support/BindSpecAdapter.java @@ -4,7 +4,7 @@ import io.r2dbc.spi.Result; import io.r2dbc.spi.Statement; import org.reactivestreams.Publisher; -import org.springframework.data.r2dbc.function.DatabaseClient.BindSpec; +import org.springframework.data.r2dbc.core.DatabaseClient.BindSpec; /** * Adapter for {@link BindSpec} to be used with {@link org.springframework.data.r2dbc.dialect.BindMarker} binding. diff --git a/src/main/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactory.java b/src/main/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactory.java index e2bdbee..2679df5 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactory.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactory.java @@ -23,9 +23,9 @@ import java.util.Optional; import org.springframework.data.mapping.context.MappingContext; import org.springframework.data.projection.ProjectionFactory; -import org.springframework.data.r2dbc.function.DatabaseClient; -import org.springframework.data.r2dbc.function.ReactiveDataAccessStrategy; -import org.springframework.data.r2dbc.function.convert.R2dbcConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverter; +import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy; import org.springframework.data.r2dbc.repository.R2dbcRepository; import org.springframework.data.r2dbc.repository.query.R2dbcQueryMethod; import org.springframework.data.r2dbc.repository.query.StringBasedR2dbcQuery; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactoryBean.java b/src/main/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactoryBean.java index 61ffd29..90b87cf 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactoryBean.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactoryBean.java @@ -18,8 +18,8 @@ package org.springframework.data.r2dbc.repository.support; import java.io.Serializable; import org.springframework.data.mapping.context.MappingContext; -import org.springframework.data.r2dbc.function.DatabaseClient; -import org.springframework.data.r2dbc.function.ReactiveDataAccessStrategy; +import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy; import org.springframework.data.repository.Repository; import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport; import org.springframework.data.repository.core.support.RepositoryFactorySupport; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java b/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java index 94f43b1..70c000b 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java @@ -24,13 +24,12 @@ import java.util.Collections; import java.util.List; import org.reactivestreams.Publisher; - -import org.springframework.data.r2dbc.domain.PreparedOperation; -import org.springframework.data.r2dbc.function.DatabaseClient; -import org.springframework.data.r2dbc.function.ReactiveDataAccessStrategy; -import org.springframework.data.r2dbc.function.StatementMapper; -import org.springframework.data.r2dbc.function.convert.R2dbcConverter; -import org.springframework.data.r2dbc.function.query.Criteria; +import org.springframework.data.r2dbc.convert.R2dbcConverter; +import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.data.r2dbc.core.PreparedOperation; +import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy; +import org.springframework.data.r2dbc.core.StatementMapper; +import org.springframework.data.r2dbc.query.Criteria; import org.springframework.data.relational.core.sql.Functions; import org.springframework.data.relational.core.sql.Select; import org.springframework.data.relational.core.sql.StatementBuilder; diff --git a/src/main/kotlin/org/springframework/data/r2dbc/function/DatabaseClientExtensions.kt b/src/main/kotlin/org/springframework/data/r2dbc/core/DatabaseClientExtensions.kt similarity index 97% rename from src/main/kotlin/org/springframework/data/r2dbc/function/DatabaseClientExtensions.kt rename to src/main/kotlin/org/springframework/data/r2dbc/core/DatabaseClientExtensions.kt index e134893..999139e 100644 --- a/src/main/kotlin/org/springframework/data/r2dbc/function/DatabaseClientExtensions.kt +++ b/src/main/kotlin/org/springframework/data/r2dbc/core/DatabaseClientExtensions.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function +package org.springframework.data.r2dbc.core import kotlinx.coroutines.reactive.awaitFirstOrNull diff --git a/src/main/kotlin/org/springframework/data/r2dbc/function/RowsFetchSpecExtensions.kt b/src/main/kotlin/org/springframework/data/r2dbc/core/RowsFetchSpecExtensions.kt similarity index 97% rename from src/main/kotlin/org/springframework/data/r2dbc/function/RowsFetchSpecExtensions.kt rename to src/main/kotlin/org/springframework/data/r2dbc/core/RowsFetchSpecExtensions.kt index ed14738..69fdb22 100644 --- a/src/main/kotlin/org/springframework/data/r2dbc/function/RowsFetchSpecExtensions.kt +++ b/src/main/kotlin/org/springframework/data/r2dbc/core/RowsFetchSpecExtensions.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function +package org.springframework.data.r2dbc.core import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.Flow diff --git a/src/test/java/org/springframework/data/r2dbc/config/R2dbcConfigurationIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/config/R2dbcConfigurationIntegrationTests.java index 2295cbd..7e84496 100644 --- a/src/test/java/org/springframework/data/r2dbc/config/R2dbcConfigurationIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/config/R2dbcConfigurationIntegrationTests.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.r2dbc.function.DatabaseClient; +import org.springframework.data.r2dbc.core.DatabaseClient; /** * Tests for {@link AbstractR2dbcConfiguration}. diff --git a/src/test/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionFactoryUtilsUnitTests.java b/src/test/java/org/springframework/data/r2dbc/connectionfactory/ConnectionFactoryUtilsUnitTests.java similarity index 92% rename from src/test/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionFactoryUtilsUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/connectionfactory/ConnectionFactoryUtilsUnitTests.java index b77a1a2..29c425f 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionFactoryUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/connectionfactory/ConnectionFactoryUtilsUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import static org.mockito.Mockito.*; @@ -22,6 +22,9 @@ import io.r2dbc.spi.ConnectionFactory; import org.assertj.core.api.Assertions; import org.junit.Test; import org.reactivestreams.Publisher; +import org.springframework.data.r2dbc.connectionfactory.ConnectionFactoryUtils; +import org.springframework.data.r2dbc.connectionfactory.ReactiveTransactionSynchronization; +import org.springframework.data.r2dbc.connectionfactory.TransactionResources; import org.springframework.transaction.NoTransactionException; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; diff --git a/src/test/java/org/springframework/data/r2dbc/function/connectionfactory/DelegatingConnectionFactoryUnitTests.java b/src/test/java/org/springframework/data/r2dbc/connectionfactory/DelegatingConnectionFactoryUnitTests.java similarity index 92% rename from src/test/java/org/springframework/data/r2dbc/function/connectionfactory/DelegatingConnectionFactoryUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/connectionfactory/DelegatingConnectionFactoryUnitTests.java index d1ad075..3a105e4 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/connectionfactory/DelegatingConnectionFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/connectionfactory/DelegatingConnectionFactoryUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -23,6 +23,7 @@ import io.r2dbc.spi.ConnectionFactory; import reactor.core.publisher.Mono; import org.junit.Test; +import org.springframework.data.r2dbc.connectionfactory.DelegatingConnectionFactory; /** * Unit tests for {@link DelegatingConnectionFactory}. diff --git a/src/test/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionFactoryTransactionManagerUnitTests.java b/src/test/java/org/springframework/data/r2dbc/connectionfactory/R2dbcTransactionManagerUnitTests.java similarity index 96% rename from src/test/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionFactoryTransactionManagerUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/connectionfactory/R2dbcTransactionManagerUnitTests.java index b13fb55..a9df5dd 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/connectionfactory/ConnectionFactoryTransactionManagerUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/connectionfactory/R2dbcTransactionManagerUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.*; @@ -32,7 +32,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Before; import org.junit.Test; - +import org.springframework.data.r2dbc.connectionfactory.R2dbcTransactionManager; +import org.springframework.data.r2dbc.connectionfactory.ConnectionFactoryUtils; import org.springframework.transaction.IllegalTransactionStateException; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.reactive.TransactionSynchronization; @@ -41,16 +42,16 @@ import org.springframework.transaction.reactive.TransactionalOperator; import org.springframework.transaction.support.DefaultTransactionDefinition; /** - * Unit tests for {@link ConnectionFactoryTransactionManager}. + * Unit tests for {@link R2dbcTransactionManager}. * * @author Mark Paluch */ -public class ConnectionFactoryTransactionManagerUnitTests { +public class R2dbcTransactionManagerUnitTests { ConnectionFactory connectionFactoryMock = mock(ConnectionFactory.class); Connection connectionMock = mock(Connection.class); - private ConnectionFactoryTransactionManager tm; + private R2dbcTransactionManager tm; @Before public void before() { @@ -58,7 +59,7 @@ public class ConnectionFactoryTransactionManagerUnitTests { when(connectionFactoryMock.create()).thenReturn((Mono) Mono.just(connectionMock)); when(connectionMock.beginTransaction()).thenReturn(Mono.empty()); when(connectionMock.close()).thenReturn(Mono.empty()); - tm = new ConnectionFactoryTransactionManager(connectionFactoryMock); + tm = new R2dbcTransactionManager(connectionFactoryMock); } @Test // gh-107 diff --git a/src/test/java/org/springframework/data/r2dbc/function/connectionfactory/TransactionAwareConnectionFactoryProxyUnitTests.java b/src/test/java/org/springframework/data/r2dbc/connectionfactory/TransactionAwareConnectionFactoryProxyUnitTests.java similarity index 92% rename from src/test/java/org/springframework/data/r2dbc/function/connectionfactory/TransactionAwareConnectionFactoryProxyUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/connectionfactory/TransactionAwareConnectionFactoryProxyUnitTests.java index 6a578ee..261fd2e 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/connectionfactory/TransactionAwareConnectionFactoryProxyUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/connectionfactory/TransactionAwareConnectionFactoryProxyUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.connectionfactory; +package org.springframework.data.r2dbc.connectionfactory; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -24,6 +24,10 @@ import io.r2dbc.spi.Connection; import io.r2dbc.spi.ConnectionFactory; import org.junit.Before; import org.junit.Test; +import org.springframework.data.r2dbc.connectionfactory.R2dbcTransactionManager; +import org.springframework.data.r2dbc.connectionfactory.ConnectionFactoryUtils; +import org.springframework.data.r2dbc.connectionfactory.ConnectionProxy; +import org.springframework.data.r2dbc.connectionfactory.TransactionAwareConnectionFactoryProxy; import org.springframework.transaction.reactive.TransactionalOperator; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -42,14 +46,14 @@ public class TransactionAwareConnectionFactoryProxyUnitTests { Connection connectionMock2 = mock(Connection.class); Connection connectionMock3 = mock(Connection.class); - private ConnectionFactoryTransactionManager tm; + private R2dbcTransactionManager tm; @Before public void before() { when(connectionFactoryMock.create()).thenReturn((Mono) Mono.just(connectionMock1), (Mono) Mono.just(connectionMock2), (Mono) Mono.just(connectionMock3)); - tm = new ConnectionFactoryTransactionManager(connectionFactoryMock); + tm = new R2dbcTransactionManager(connectionFactoryMock); } @Test // gh-107 diff --git a/src/test/java/org/springframework/data/r2dbc/function/convert/EntityRowMapperUnitTests.java b/src/test/java/org/springframework/data/r2dbc/convert/EntityRowMapperUnitTests.java similarity index 95% rename from src/test/java/org/springframework/data/r2dbc/function/convert/EntityRowMapperUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/convert/EntityRowMapperUnitTests.java index 307d710..215591e 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/convert/EntityRowMapperUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/convert/EntityRowMapperUnitTests.java @@ -1,4 +1,4 @@ -package org.springframework.data.r2dbc.function.convert; +package org.springframework.data.r2dbc.convert; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -13,9 +13,9 @@ import java.util.Set; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; - +import org.springframework.data.r2dbc.convert.EntityRowMapper; +import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy; import org.springframework.data.r2dbc.dialect.PostgresDialect; -import org.springframework.data.r2dbc.function.DefaultReactiveDataAccessStrategy; /** * Unit tests for {@link EntityRowMapper}. diff --git a/src/test/java/org/springframework/data/r2dbc/function/convert/MappingR2dbcConverterUnitTests.java b/src/test/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverterUnitTests.java similarity index 96% rename from src/test/java/org/springframework/data/r2dbc/function/convert/MappingR2dbcConverterUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverterUnitTests.java index 69573c6..d2cfd6d 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/convert/MappingR2dbcConverterUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/convert/MappingR2dbcConverterUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.convert; +package org.springframework.data.r2dbc.convert; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -33,8 +33,10 @@ import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.annotation.Id; import org.springframework.data.convert.ReadingConverter; import org.springframework.data.convert.WritingConverter; -import org.springframework.data.r2dbc.domain.OutboundRow; -import org.springframework.data.r2dbc.domain.SettableValue; +import org.springframework.data.r2dbc.convert.MappingR2dbcConverter; +import org.springframework.data.r2dbc.convert.R2dbcCustomConversions; +import org.springframework.data.r2dbc.mapping.OutboundRow; +import org.springframework.data.r2dbc.mapping.SettableValue; import org.springframework.data.relational.core.mapping.RelationalMappingContext; /** diff --git a/src/test/java/org/springframework/data/r2dbc/function/convert/R2dbcConvertersUnitTests.java b/src/test/java/org/springframework/data/r2dbc/convert/R2dbcConvertersUnitTests.java similarity index 78% rename from src/test/java/org/springframework/data/r2dbc/function/convert/R2dbcConvertersUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/convert/R2dbcConvertersUnitTests.java index d26aebd..9e4eb0f 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/convert/R2dbcConvertersUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/convert/R2dbcConvertersUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.convert; +package org.springframework.data.r2dbc.convert; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -30,15 +30,16 @@ import java.util.UUID; import org.junit.Test; import org.springframework.core.convert.converter.Converter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToBooleanConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToLocalDateConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToLocalDateTimeConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToLocalTimeConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.RowToOffsetDateTimeConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.RowToStringConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.RowToUuidConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverters.RowToNumberConverterFactory.RowToZonedDateTimeConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverters; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToBooleanConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToLocalDateConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToLocalDateTimeConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToLocalTimeConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.RowToOffsetDateTimeConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.RowToStringConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.RowToUuidConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverters.RowToNumberConverterFactory.RowToZonedDateTimeConverter; /** * Unit tests for {@link R2dbcConverters}. diff --git a/src/test/java/org/springframework/data/r2dbc/function/AbstractDatabaseClientIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/core/AbstractDatabaseClientIntegrationTests.java similarity index 98% rename from src/test/java/org/springframework/data/r2dbc/function/AbstractDatabaseClientIntegrationTests.java rename to src/test/java/org/springframework/data/r2dbc/core/AbstractDatabaseClientIntegrationTests.java index a39e633..595f7c8 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/AbstractDatabaseClientIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/AbstractDatabaseClientIntegrationTests.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import static org.assertj.core.api.Assertions.*; import static org.springframework.data.domain.Sort.Order.*; -import static org.springframework.data.r2dbc.function.query.Criteria.*; +import static org.springframework.data.r2dbc.query.Criteria.*; import io.r2dbc.spi.ConnectionFactory; import lombok.Data; @@ -33,8 +33,9 @@ import org.springframework.dao.DataIntegrityViolationException; import org.springframework.data.annotation.Id; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; -import org.springframework.data.r2dbc.function.query.Criteria; -import org.springframework.data.r2dbc.function.query.Update; +import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.data.r2dbc.query.Criteria; +import org.springframework.data.r2dbc.query.Update; import org.springframework.data.r2dbc.testing.R2dbcIntegrationTestSupport; import org.springframework.data.relational.core.mapping.Table; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/test/java/org/springframework/data/r2dbc/function/AbstractTransactionalDatabaseClientIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java similarity index 95% rename from src/test/java/org/springframework/data/r2dbc/function/AbstractTransactionalDatabaseClientIntegrationTests.java rename to src/test/java/org/springframework/data/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java index d47d438..0c46b65 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/AbstractTransactionalDatabaseClientIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/AbstractTransactionalDatabaseClientIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import static org.assertj.core.api.Assertions.*; @@ -34,7 +34,9 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.support.GenericApplicationContext; import org.springframework.dao.DataAccessException; import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration; -import org.springframework.data.r2dbc.function.connectionfactory.ConnectionFactoryTransactionManager; +import org.springframework.data.r2dbc.connectionfactory.R2dbcTransactionManager; +import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.data.r2dbc.core.TransactionalDatabaseClient; import org.springframework.data.r2dbc.testing.R2dbcIntegrationTestSupport; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.transaction.NoTransactionException; @@ -244,7 +246,7 @@ public abstract class AbstractTransactionalDatabaseClientIntegrationTests extend DatabaseClient databaseClient = DatabaseClient.create(connectionFactory); TransactionalOperator transactionalOperator = TransactionalOperator - .create(new ConnectionFactoryTransactionManager(connectionFactory), new DefaultTransactionDefinition()); + .create(new R2dbcTransactionManager(connectionFactory), new DefaultTransactionDefinition()); Flux txId = databaseClient.execute() // .sql(getCurrentTransactionIdStatement()) // @@ -269,7 +271,7 @@ public abstract class AbstractTransactionalDatabaseClientIntegrationTests extend DatabaseClient databaseClient = DatabaseClient.create(connectionFactory); TransactionalOperator transactionalOperator = TransactionalOperator - .create(new ConnectionFactoryTransactionManager(connectionFactory), new DefaultTransactionDefinition()); + .create(new R2dbcTransactionManager(connectionFactory), new DefaultTransactionDefinition()); Flux integerFlux = databaseClient.execute() // .sql(getInsertIntoLegosetStatement()) // @@ -331,7 +333,7 @@ public abstract class AbstractTransactionalDatabaseClientIntegrationTests extend @Bean ReactiveTransactionManager txMgr(ConnectionFactory connectionFactory) { - return new ConnectionFactoryTransactionManager(connectionFactory); + return new R2dbcTransactionManager(connectionFactory); } } diff --git a/src/test/java/org/springframework/data/r2dbc/function/DefaultDatabaseClientUnitTests.java b/src/test/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientUnitTests.java similarity index 90% rename from src/test/java/org/springframework/data/r2dbc/function/DefaultDatabaseClientUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientUnitTests.java index 7fdba53..b4b7bcc 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/DefaultDatabaseClientUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/DefaultDatabaseClientUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import static org.mockito.Mockito.*; @@ -30,7 +30,9 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.reactivestreams.Publisher; import org.reactivestreams.Subscription; - +import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.data.r2dbc.core.DefaultDatabaseClient; +import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy; import org.springframework.data.r2dbc.support.R2dbcExceptionTranslator; /** diff --git a/src/test/java/org/springframework/data/r2dbc/function/H2DatabaseClientIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/core/H2DatabaseClientIntegrationTests.java similarity index 93% rename from src/test/java/org/springframework/data/r2dbc/function/H2DatabaseClientIntegrationTests.java rename to src/test/java/org/springframework/data/r2dbc/core/H2DatabaseClientIntegrationTests.java index 0292ff1..54797d0 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/H2DatabaseClientIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/H2DatabaseClientIntegrationTests.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.ConnectionFactory; import javax.sql.DataSource; import org.junit.Ignore; - +import org.springframework.data.r2dbc.core.DatabaseClient; import org.springframework.data.r2dbc.testing.H2TestSupport; /** diff --git a/src/test/java/org/springframework/data/r2dbc/function/MySqlDatabaseClientIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/core/MySqlDatabaseClientIntegrationTests.java similarity index 94% rename from src/test/java/org/springframework/data/r2dbc/function/MySqlDatabaseClientIntegrationTests.java rename to src/test/java/org/springframework/data/r2dbc/core/MySqlDatabaseClientIntegrationTests.java index a91699f..3aaf86c 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/MySqlDatabaseClientIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/MySqlDatabaseClientIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.ConnectionFactory; @@ -22,7 +22,7 @@ import javax.sql.DataSource; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; - +import org.springframework.data.r2dbc.core.DatabaseClient; import org.springframework.data.r2dbc.testing.ExternalDatabase; import org.springframework.data.r2dbc.testing.MySqlTestSupport; diff --git a/src/test/java/org/springframework/data/r2dbc/function/MySqlTransactionalDatabaseClientIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/core/MySqlTransactionalDatabaseClientIntegrationTests.java similarity index 93% rename from src/test/java/org/springframework/data/r2dbc/function/MySqlTransactionalDatabaseClientIntegrationTests.java rename to src/test/java/org/springframework/data/r2dbc/core/MySqlTransactionalDatabaseClientIntegrationTests.java index 7519423..707eadf 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/MySqlTransactionalDatabaseClientIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/MySqlTransactionalDatabaseClientIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import javax.sql.DataSource; import java.time.Duration; @@ -22,6 +22,8 @@ import io.r2dbc.spi.ConnectionFactory; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; +import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.data.r2dbc.core.TransactionalDatabaseClient; import org.springframework.data.r2dbc.testing.ExternalDatabase; import org.springframework.data.r2dbc.testing.MySqlTestSupport; import reactor.core.publisher.Mono; diff --git a/src/test/java/org/springframework/data/r2dbc/function/NamedParameterUtilsUnitTests.java b/src/test/java/org/springframework/data/r2dbc/core/NamedParameterUtilsUnitTests.java similarity index 96% rename from src/test/java/org/springframework/data/r2dbc/function/NamedParameterUtilsUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/core/NamedParameterUtilsUnitTests.java index 784a67b..ed4e593 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/NamedParameterUtilsUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/NamedParameterUtilsUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -22,12 +22,14 @@ import java.util.Arrays; import java.util.HashMap; import org.junit.Test; - +import org.springframework.data.r2dbc.core.BindableOperation; +import org.springframework.data.r2dbc.core.MapBindParameterSource; +import org.springframework.data.r2dbc.core.NamedParameterUtils; +import org.springframework.data.r2dbc.core.ParsedSql; import org.springframework.data.r2dbc.dialect.BindMarkersFactory; +import org.springframework.data.r2dbc.dialect.BindTarget; import org.springframework.data.r2dbc.dialect.PostgresDialect; import org.springframework.data.r2dbc.dialect.SqlServerDialect; -import org.springframework.data.r2dbc.domain.BindTarget; -import org.springframework.data.r2dbc.domain.BindableOperation; /** * Unit tests for {@link NamedParameterUtils}. diff --git a/src/test/java/org/springframework/data/r2dbc/function/PostgresDatabaseClientIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/core/PostgresDatabaseClientIntegrationTests.java similarity index 94% rename from src/test/java/org/springframework/data/r2dbc/function/PostgresDatabaseClientIntegrationTests.java rename to src/test/java/org/springframework/data/r2dbc/core/PostgresDatabaseClientIntegrationTests.java index a0fb9a2..7f855d6 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/PostgresDatabaseClientIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/PostgresDatabaseClientIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.ConnectionFactory; @@ -22,6 +22,7 @@ import javax.sql.DataSource; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; +import org.springframework.data.r2dbc.core.DatabaseClient; import org.springframework.data.r2dbc.testing.ExternalDatabase; import org.springframework.data.r2dbc.testing.PostgresTestSupport; diff --git a/src/test/java/org/springframework/data/r2dbc/function/PostgresIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/core/PostgresIntegrationTests.java similarity index 97% rename from src/test/java/org/springframework/data/r2dbc/function/PostgresIntegrationTests.java rename to src/test/java/org/springframework/data/r2dbc/core/PostgresIntegrationTests.java index ba1d534..139c8db 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/PostgresIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/PostgresIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import static org.assertj.core.api.Assertions.*; @@ -31,6 +31,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; +import org.springframework.data.r2dbc.core.DatabaseClient; import org.springframework.data.r2dbc.testing.ExternalDatabase; import org.springframework.data.r2dbc.testing.PostgresTestSupport; import org.springframework.data.r2dbc.testing.R2dbcIntegrationTestSupport; diff --git a/src/test/java/org/springframework/data/r2dbc/function/PostgresReactiveDataAccessStrategyTests.java b/src/test/java/org/springframework/data/r2dbc/core/PostgresReactiveDataAccessStrategyTests.java similarity index 85% rename from src/test/java/org/springframework/data/r2dbc/function/PostgresReactiveDataAccessStrategyTests.java rename to src/test/java/org/springframework/data/r2dbc/core/PostgresReactiveDataAccessStrategyTests.java index 0231787..0cbf243 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/PostgresReactiveDataAccessStrategyTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/PostgresReactiveDataAccessStrategyTests.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; +import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy; +import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy; import org.springframework.data.r2dbc.dialect.PostgresDialect; /** diff --git a/src/test/java/org/springframework/data/r2dbc/function/PostgresTransactionalDatabaseClientIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/core/PostgresTransactionalDatabaseClientIntegrationTests.java similarity index 89% rename from src/test/java/org/springframework/data/r2dbc/function/PostgresTransactionalDatabaseClientIntegrationTests.java rename to src/test/java/org/springframework/data/r2dbc/core/PostgresTransactionalDatabaseClientIntegrationTests.java index 039df34..767117c 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/PostgresTransactionalDatabaseClientIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/PostgresTransactionalDatabaseClientIntegrationTests.java @@ -1,10 +1,11 @@ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.ConnectionFactory; import javax.sql.DataSource; import org.junit.ClassRule; +import org.springframework.data.r2dbc.core.TransactionalDatabaseClient; import org.springframework.data.r2dbc.testing.ExternalDatabase; import org.springframework.data.r2dbc.testing.PostgresTestSupport; diff --git a/src/test/java/org/springframework/data/r2dbc/function/ReactiveDataAccessStrategyTestSupport.java b/src/test/java/org/springframework/data/r2dbc/core/ReactiveDataAccessStrategyTestSupport.java similarity index 96% rename from src/test/java/org/springframework/data/r2dbc/function/ReactiveDataAccessStrategyTestSupport.java rename to src/test/java/org/springframework/data/r2dbc/core/ReactiveDataAccessStrategyTestSupport.java index f0ff090..1c43aff 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/ReactiveDataAccessStrategyTestSupport.java +++ b/src/test/java/org/springframework/data/r2dbc/core/ReactiveDataAccessStrategyTestSupport.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -34,9 +34,10 @@ import java.util.function.BiConsumer; import java.util.function.Function; import org.junit.Test; - +import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy; +import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy; import org.springframework.data.r2dbc.dialect.Dialect; -import org.springframework.data.r2dbc.domain.SettableValue; +import org.springframework.data.r2dbc.mapping.SettableValue; /** * Abstract base class for {@link Dialect}-aware {@link DefaultReactiveDataAccessStrategy} tests. diff --git a/src/test/java/org/springframework/data/r2dbc/function/SqlServerDatabaseClientIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/core/SqlServerDatabaseClientIntegrationTests.java similarity index 93% rename from src/test/java/org/springframework/data/r2dbc/function/SqlServerDatabaseClientIntegrationTests.java rename to src/test/java/org/springframework/data/r2dbc/core/SqlServerDatabaseClientIntegrationTests.java index c9856a8..1655b0b 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/SqlServerDatabaseClientIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/SqlServerDatabaseClientIntegrationTests.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.ConnectionFactory; import javax.sql.DataSource; import org.junit.ClassRule; +import org.springframework.data.r2dbc.core.DatabaseClient; import org.springframework.data.r2dbc.testing.ExternalDatabase; import org.springframework.data.r2dbc.testing.SqlServerTestSupport; diff --git a/src/test/java/org/springframework/data/r2dbc/function/SqlServerReactiveDataAccessStrategyTests.java b/src/test/java/org/springframework/data/r2dbc/core/SqlServerReactiveDataAccessStrategyTests.java similarity index 85% rename from src/test/java/org/springframework/data/r2dbc/function/SqlServerReactiveDataAccessStrategyTests.java rename to src/test/java/org/springframework/data/r2dbc/core/SqlServerReactiveDataAccessStrategyTests.java index a1766d0..90aca9e 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/SqlServerReactiveDataAccessStrategyTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/SqlServerReactiveDataAccessStrategyTests.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; +import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy; +import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy; import org.springframework.data.r2dbc.dialect.SqlServerDialect; /** diff --git a/src/test/java/org/springframework/data/r2dbc/function/SqlServerTransactionalDatabaseClientIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/core/SqlServerTransactionalDatabaseClientIntegrationTests.java similarity index 90% rename from src/test/java/org/springframework/data/r2dbc/function/SqlServerTransactionalDatabaseClientIntegrationTests.java rename to src/test/java/org/springframework/data/r2dbc/core/SqlServerTransactionalDatabaseClientIntegrationTests.java index 7485a4d..0c5f924 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/SqlServerTransactionalDatabaseClientIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/SqlServerTransactionalDatabaseClientIntegrationTests.java @@ -1,10 +1,11 @@ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import io.r2dbc.spi.ConnectionFactory; import javax.sql.DataSource; import org.junit.ClassRule; +import org.springframework.data.r2dbc.core.TransactionalDatabaseClient; import org.springframework.data.r2dbc.testing.ExternalDatabase; import org.springframework.data.r2dbc.testing.SqlServerTestSupport; diff --git a/src/test/java/org/springframework/data/r2dbc/function/StatementMapperUnitTests.java b/src/test/java/org/springframework/data/r2dbc/core/StatementMapperUnitTests.java similarity index 76% rename from src/test/java/org/springframework/data/r2dbc/function/StatementMapperUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/core/StatementMapperUnitTests.java index bd5ed80..5357284 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/StatementMapperUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/core/StatementMapperUnitTests.java @@ -13,19 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function; +package org.springframework.data.r2dbc.core; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; import org.junit.Test; - +import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy; +import org.springframework.data.r2dbc.core.DefaultStatementMapper; +import org.springframework.data.r2dbc.core.PreparedOperation; +import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy; +import org.springframework.data.r2dbc.core.StatementMapper; +import org.springframework.data.r2dbc.core.StatementMapper.UpdateSpec; +import org.springframework.data.r2dbc.dialect.BindTarget; import org.springframework.data.r2dbc.dialect.PostgresDialect; -import org.springframework.data.r2dbc.domain.BindTarget; -import org.springframework.data.r2dbc.domain.PreparedOperation; -import org.springframework.data.r2dbc.function.StatementMapper.UpdateSpec; -import org.springframework.data.r2dbc.function.query.Criteria; -import org.springframework.data.r2dbc.function.query.Update; +import org.springframework.data.r2dbc.query.Criteria; +import org.springframework.data.r2dbc.query.Update; /** * Unit tests for {@link DefaultStatementMapper}. diff --git a/src/test/java/org/springframework/data/r2dbc/dialect/AnonymousBindMarkersUnitTests.java b/src/test/java/org/springframework/data/r2dbc/dialect/AnonymousBindMarkersUnitTests.java index 55a2628..87d03bc 100644 --- a/src/test/java/org/springframework/data/r2dbc/dialect/AnonymousBindMarkersUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/dialect/AnonymousBindMarkersUnitTests.java @@ -20,8 +20,6 @@ import static org.mockito.Mockito.*; import org.junit.Test; -import org.springframework.data.r2dbc.domain.BindTarget; - /** * Unit tests for {@link AnonymousBindMarkers}. * diff --git a/src/test/java/org/springframework/data/r2dbc/dialect/BindingsUnitTests.java b/src/test/java/org/springframework/data/r2dbc/dialect/BindingsUnitTests.java index 2959330..fa1a218 100644 --- a/src/test/java/org/springframework/data/r2dbc/dialect/BindingsUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/dialect/BindingsUnitTests.java @@ -24,8 +24,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; -import org.springframework.data.r2dbc.domain.BindTarget; - /** * Unit tests for {@link Bindings}. * diff --git a/src/test/java/org/springframework/data/r2dbc/dialect/IndexedBindMarkersUnitTests.java b/src/test/java/org/springframework/data/r2dbc/dialect/IndexedBindMarkersUnitTests.java index eafbd64..924f3d5 100644 --- a/src/test/java/org/springframework/data/r2dbc/dialect/IndexedBindMarkersUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/dialect/IndexedBindMarkersUnitTests.java @@ -5,8 +5,6 @@ import static org.mockito.Mockito.*; import org.junit.Test; -import org.springframework.data.r2dbc.domain.BindTarget; - /** * Unit tests for {@link IndexedBindMarkers}. * diff --git a/src/test/java/org/springframework/data/r2dbc/dialect/NamedBindMarkersUnitTests.java b/src/test/java/org/springframework/data/r2dbc/dialect/NamedBindMarkersUnitTests.java index e92aa8b..52729fa 100644 --- a/src/test/java/org/springframework/data/r2dbc/dialect/NamedBindMarkersUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/dialect/NamedBindMarkersUnitTests.java @@ -5,8 +5,6 @@ import static org.mockito.Mockito.*; import org.junit.Test; -import org.springframework.data.r2dbc.domain.BindTarget; - /** * Unit tests for {@link NamedBindMarkers}. * diff --git a/src/test/java/org/springframework/data/r2dbc/domain/SettableValueUnitTests.java b/src/test/java/org/springframework/data/r2dbc/mapping/SettableValueUnitTests.java similarity index 93% rename from src/test/java/org/springframework/data/r2dbc/domain/SettableValueUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/mapping/SettableValueUnitTests.java index 08d9c88..673b0c3 100644 --- a/src/test/java/org/springframework/data/r2dbc/domain/SettableValueUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/mapping/SettableValueUnitTests.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.domain; +package org.springframework.data.r2dbc.mapping; import static org.assertj.core.api.Assertions.*; import org.junit.Test; +import org.springframework.data.r2dbc.mapping.SettableValue; /** * Unit tests for {@link SettableValue}. diff --git a/src/test/java/org/springframework/data/r2dbc/function/query/CriteriaUnitTests.java b/src/test/java/org/springframework/data/r2dbc/query/CriteriaUnitTests.java similarity index 94% rename from src/test/java/org/springframework/data/r2dbc/function/query/CriteriaUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/query/CriteriaUnitTests.java index d001e43..13ef11a 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/query/CriteriaUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/query/CriteriaUnitTests.java @@ -13,16 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.query; +package org.springframework.data.r2dbc.query; import static org.assertj.core.api.Assertions.*; -import static org.springframework.data.r2dbc.function.query.Criteria.*; +import static org.springframework.data.r2dbc.query.Criteria.*; import java.util.Arrays; import org.junit.Test; -import org.springframework.data.r2dbc.function.query.Criteria.Combinator; -import org.springframework.data.r2dbc.function.query.Criteria.Comparator; +import org.springframework.data.r2dbc.query.Criteria; +import org.springframework.data.r2dbc.query.Criteria.Combinator; +import org.springframework.data.r2dbc.query.Criteria.Comparator; /** * Unit tests for {@link Criteria}. diff --git a/src/test/java/org/springframework/data/r2dbc/function/query/QueryMapperUnitTests.java b/src/test/java/org/springframework/data/r2dbc/query/QueryMapperUnitTests.java similarity index 93% rename from src/test/java/org/springframework/data/r2dbc/function/query/QueryMapperUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/query/QueryMapperUnitTests.java index acef4b8..ba429cb 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/query/QueryMapperUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/query/QueryMapperUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.query; +package org.springframework.data.r2dbc.query; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -21,11 +21,14 @@ import static org.springframework.data.domain.Sort.Order.*; import org.junit.Test; import org.springframework.data.domain.Sort; +import org.springframework.data.r2dbc.convert.MappingR2dbcConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverter; import org.springframework.data.r2dbc.dialect.BindMarkersFactory; -import org.springframework.data.r2dbc.domain.BindTarget; -import org.springframework.data.r2dbc.domain.SettableValue; -import org.springframework.data.r2dbc.function.convert.MappingR2dbcConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverter; +import org.springframework.data.r2dbc.dialect.BindTarget; +import org.springframework.data.r2dbc.mapping.SettableValue; +import org.springframework.data.r2dbc.query.BoundCondition; +import org.springframework.data.r2dbc.query.Criteria; +import org.springframework.data.r2dbc.query.QueryMapper; import org.springframework.data.relational.core.mapping.Column; import org.springframework.data.relational.core.mapping.RelationalMappingContext; import org.springframework.data.relational.core.sql.Table; diff --git a/src/test/java/org/springframework/data/r2dbc/function/query/UpdateMapperUnitTests.java b/src/test/java/org/springframework/data/r2dbc/query/UpdateMapperUnitTests.java similarity index 87% rename from src/test/java/org/springframework/data/r2dbc/function/query/UpdateMapperUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/query/UpdateMapperUnitTests.java index 83c5e4f..3843f64 100644 --- a/src/test/java/org/springframework/data/r2dbc/function/query/UpdateMapperUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/query/UpdateMapperUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function.query; +package org.springframework.data.r2dbc.query; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; @@ -22,11 +22,14 @@ import java.util.Map; import java.util.stream.Collectors; import org.junit.Test; +import org.springframework.data.r2dbc.convert.MappingR2dbcConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverter; import org.springframework.data.r2dbc.dialect.BindMarkersFactory; -import org.springframework.data.r2dbc.domain.BindTarget; -import org.springframework.data.r2dbc.domain.SettableValue; -import org.springframework.data.r2dbc.function.convert.MappingR2dbcConverter; -import org.springframework.data.r2dbc.function.convert.R2dbcConverter; +import org.springframework.data.r2dbc.dialect.BindTarget; +import org.springframework.data.r2dbc.mapping.SettableValue; +import org.springframework.data.r2dbc.query.BoundAssignments; +import org.springframework.data.r2dbc.query.Update; +import org.springframework.data.r2dbc.query.UpdateMapper; import org.springframework.data.relational.core.mapping.Column; import org.springframework.data.relational.core.mapping.RelationalMappingContext; import org.springframework.data.relational.core.sql.AssignValue; diff --git a/src/test/java/org/springframework/data/r2dbc/repository/AbstractR2dbcRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/repository/AbstractR2dbcRepositoryIntegrationTests.java index 01ba101..eb06b0e 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/AbstractR2dbcRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/AbstractR2dbcRepositoryIntegrationTests.java @@ -37,10 +37,10 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.data.annotation.Id; +import org.springframework.data.r2dbc.convert.MappingR2dbcConverter; +import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy; +import org.springframework.data.r2dbc.core.TransactionalDatabaseClient; import org.springframework.data.r2dbc.dialect.Database; -import org.springframework.data.r2dbc.function.DefaultReactiveDataAccessStrategy; -import org.springframework.data.r2dbc.function.TransactionalDatabaseClient; -import org.springframework.data.r2dbc.function.convert.MappingR2dbcConverter; import org.springframework.data.r2dbc.repository.support.R2dbcRepositoryFactory; import org.springframework.data.r2dbc.testing.R2dbcIntegrationTestSupport; import org.springframework.data.relational.core.mapping.RelationalMappingContext; diff --git a/src/test/java/org/springframework/data/r2dbc/repository/config/R2dbcRepositoriesRegistrarTests.java b/src/test/java/org/springframework/data/r2dbc/repository/config/R2dbcRepositoriesRegistrarTests.java index b84adfa..d9433c1 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/config/R2dbcRepositoriesRegistrarTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/config/R2dbcRepositoriesRegistrarTests.java @@ -24,10 +24,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.data.r2dbc.core.DefaultReactiveDataAccessStrategy; +import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy; import org.springframework.data.r2dbc.dialect.PostgresDialect; -import org.springframework.data.r2dbc.function.DatabaseClient; -import org.springframework.data.r2dbc.function.DefaultReactiveDataAccessStrategy; -import org.springframework.data.r2dbc.function.ReactiveDataAccessStrategy; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; diff --git a/src/test/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQueryUnitTests.java b/src/test/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQueryUnitTests.java index de7037e..252f53e 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQueryUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQueryUnitTests.java @@ -29,9 +29,9 @@ import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.projection.ProjectionFactory; import org.springframework.data.projection.SpelAwareProxyProjectionFactory; -import org.springframework.data.r2dbc.function.DatabaseClient; -import org.springframework.data.r2dbc.function.DatabaseClient.GenericExecuteSpec; -import org.springframework.data.r2dbc.function.convert.MappingR2dbcConverter; +import org.springframework.data.r2dbc.convert.MappingR2dbcConverter; +import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.data.r2dbc.core.DatabaseClient.GenericExecuteSpec; import org.springframework.data.relational.core.mapping.RelationalMappingContext; import org.springframework.data.repository.Repository; import org.springframework.data.repository.core.RepositoryMetadata; diff --git a/src/test/java/org/springframework/data/r2dbc/repository/support/AbstractSimpleR2dbcRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/repository/support/AbstractSimpleR2dbcRepositoryIntegrationTests.java index e516dfe..a424a53 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/support/AbstractSimpleR2dbcRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/support/AbstractSimpleR2dbcRepositoryIntegrationTests.java @@ -38,9 +38,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.data.annotation.Id; import org.springframework.data.domain.Persistable; -import org.springframework.data.r2dbc.function.DatabaseClient; -import org.springframework.data.r2dbc.function.ReactiveDataAccessStrategy; -import org.springframework.data.r2dbc.function.convert.MappingR2dbcConverter; +import org.springframework.data.r2dbc.convert.MappingR2dbcConverter; +import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy; import org.springframework.data.r2dbc.testing.R2dbcIntegrationTestSupport; import org.springframework.data.relational.core.mapping.RelationalMappingContext; import org.springframework.data.relational.core.mapping.RelationalPersistentEntity; diff --git a/src/test/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactoryUnitTests.java b/src/test/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactoryUnitTests.java index 0197149..1c60b8e 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactoryUnitTests.java @@ -25,9 +25,9 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.data.mapping.context.MappingContext; -import org.springframework.data.r2dbc.function.DatabaseClient; -import org.springframework.data.r2dbc.function.ReactiveDataAccessStrategy; -import org.springframework.data.r2dbc.function.convert.R2dbcConverter; +import org.springframework.data.r2dbc.convert.R2dbcConverter; +import org.springframework.data.r2dbc.core.DatabaseClient; +import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy; import org.springframework.data.relational.core.mapping.RelationalPersistentEntity; import org.springframework.data.relational.repository.query.RelationalEntityInformation; import org.springframework.data.relational.repository.support.MappingRelationalEntityInformation; diff --git a/src/test/kotlin/org/springframework/data/r2dbc/function/DatabaseClientExtensionsTests.kt b/src/test/kotlin/org/springframework/data/r2dbc/core/DatabaseClientExtensionsTests.kt similarity index 98% rename from src/test/kotlin/org/springframework/data/r2dbc/function/DatabaseClientExtensionsTests.kt rename to src/test/kotlin/org/springframework/data/r2dbc/core/DatabaseClientExtensionsTests.kt index 4f0e1f5..fb4f7f7 100644 --- a/src/test/kotlin/org/springframework/data/r2dbc/function/DatabaseClientExtensionsTests.kt +++ b/src/test/kotlin/org/springframework/data/r2dbc/core/DatabaseClientExtensionsTests.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function +package org.springframework.data.r2dbc.core import io.mockk.every import io.mockk.mockk diff --git a/src/test/kotlin/org/springframework/data/r2dbc/function/RowsFetchSpecExtensionsTests.kt b/src/test/kotlin/org/springframework/data/r2dbc/core/RowsFetchSpecExtensionsTests.kt similarity index 98% rename from src/test/kotlin/org/springframework/data/r2dbc/function/RowsFetchSpecExtensionsTests.kt rename to src/test/kotlin/org/springframework/data/r2dbc/core/RowsFetchSpecExtensionsTests.kt index f6a432d..38cc646 100644 --- a/src/test/kotlin/org/springframework/data/r2dbc/function/RowsFetchSpecExtensionsTests.kt +++ b/src/test/kotlin/org/springframework/data/r2dbc/core/RowsFetchSpecExtensionsTests.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.function +package org.springframework.data.r2dbc.core import io.mockk.every import io.mockk.mockk