#111 - Package and type renames.

Package renames:

- `….domain` -> `….mapping`
- `….function.connectionfactory` -> `connectionfactory`
- `….function.convert` -> `convert`
- `….function.query` -> `query`
- `….function` -> `….core`

Type moves:

- `….dialect.R2dbcSimpleTypeHolder` -> `….mapping.R2dbcSimpleTypeHolder`
- `….mapping.BindTarget` -> `….dialect.BindTarget`
- `….mapping.PreparedOperation` -> `….core.PreparedOperation`
- `….mapping.QueryOperation` -> `….core.QueryOperation`
- `….mapping.BindOperation` -> `….core.BindOperation`
- `….connectionfactory.ConnectionFactoryTransactionManager` -> `….connectionfactory.R2dbcTransactionManager`

That makes us end up with:

- `connectionfactory`
- `core` -> `connectionfactory`, `convert`, `dialect`, `mapping`, `query`
- `query` -> `convert`, `dialect`, `mapping`
- `convert` -> `dialect`, `mapping`
- `dialect` -> `mapping`
- `mapping` -> Spring Data Commons mapping

Reflect type renames in reference documentation.

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.
  * <p>
- * 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

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;

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}.
  * <p>
- * 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

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;
 

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}.
  * <p>
  * 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;

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;

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;

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;

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();

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 {
 

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;
 

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;
 

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

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;

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;
  * <p>
  * 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},
  * <i>not</i> with this proxy.
  * <p>
  * <b>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.
  * <p>
  * 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.
  * <p>

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.

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;

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;

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;

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;

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;

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;

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;
 

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

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;

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;
 

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.

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;

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;
 
 /**

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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.

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;
 
 /**

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.

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;
 
 /**

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;

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}.
  * <p>
- * Can be executed with {@link org.springframework.data.r2dbc.function.DatabaseClient}.
+ * Can be executed with {@link org.springframework.data.r2dbc.core.DatabaseClient}.
  * </p>
  *
  * @param <T> 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<T> extends QueryOperation {
 

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;
 

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

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;

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;
 

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;

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;
 
 /**

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

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;
 

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;

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.

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.

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;

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.

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.
  */

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;
 
 /**

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;
 

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.

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;
 

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;

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;
 

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;

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;
 

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;

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;

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;

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;

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

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;

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}.

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;

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;

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.

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;

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;

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;