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

Author: odrotbohm

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

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

src/main/asciidoc/reference/r2dbc-fluent.adoc

@@ -12,9 +12,9 @@ Let's take a look at a simple query:
 [source,java]
 ----
 Flux<Person> 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<Person>` without limiting results.
@@ -26,13 +26,13 @@ The following example declares a more complex query that specifies the table nam
 [source,java]
 ----
 Mono<Person> 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<String, Object>` 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<Void> 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<Void> 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<Void> 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.

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<Person, Long> {
 
-    @Query("SELECT * FROM person WHERE lastname = :lastname")
-    Flux<Person> findByLastname(String lastname);                      <1>
+  @Query("SELECT * FROM person WHERE lastname = :lastname")
+  Flux<Person> findByLastname(String lastname);                      <1>
 
-    @Query("SELECT firstname, lastname FROM person WHERE lastname = $1")
-    Mono<Person> findFirstByLastname(String lastname)                  <2>
+  @Query("SELECT firstname, lastname FROM person WHERE lastname = $1")
+  Mono<Person> findFirstByLastname(String lastname)                  <2>
 
 }
 ----

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 <<r2dbc.connections.ConnectionFactoryTransactionManager>> for further details.
+Spring Data R2DBC provides a implementation for `ReactiveTransactionManager` with `R2dbcTransactionManager`.
+See <<r2dbc.connections.R2dbcTransactionManager>> 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.
 ====

src/main/java/org/springframework/data/r2dbc/InvalidResultAccessException.java

@@ -24,7 +24,7 @@
  * 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.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/function/connectionfactory/ConnectionFactoryUtils.java renamed to 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 @@
  * 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/function/connectionfactory/ConnectionHandle.java renamed to 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/function/connectionfactory/ConnectionHolder.java renamed to 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.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 @@
  *
  * @author Mark Paluch
  * @author Christoph Strobl
- * @see ConnectionFactoryTransactionManager
+ * @see R2dbcTransactionManager
  * @see ConnectionFactoryUtils
  */
 public class ConnectionHolder extends ResourceHolderSupport {
@@ -86,7 +86,7 @@ protected boolean hasConnection() {
 	/**
 	 * 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/function/connectionfactory/ConnectionProxy.java renamed to 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/function/connectionfactory/DefaultTransactionResources.java renamed to 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/function/connectionfactory/DelegatingConnectionFactory.java renamed to 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;