#2 - Create relational and r2dbc packages.

Move types into relational and r2dbc packages in preparation for a later module separation.

Author: mp911de

src/main/java/org/springframework/data/jdbc/core/function/ConnectionAccessor.java renamed to src/main/java/org/springframework/data/r2dbc/function/ConnectionAccessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.function;
+package org.springframework.data.r2dbc.function;
 
 import io.r2dbc.spi.Connection;
 import reactor.core.publisher.Flux;

src/main/java/org/springframework/data/jdbc/core/function/DatabaseClient.java renamed to src/main/java/org/springframework/data/r2dbc/function/DatabaseClient.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.function;
+package org.springframework.data.r2dbc.function;
 
 import io.r2dbc.spi.ConnectionFactory;
 import io.r2dbc.spi.Row;

src/main/java/org/springframework/data/jdbc/core/function/DefaultDatabaseClient.java renamed to src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClient.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.function;
+package org.springframework.data.r2dbc.function;
 
 import io.r2dbc.spi.Connection;
 import io.r2dbc.spi.ConnectionFactory;
@@ -53,7 +53,8 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.NullHandling;
 import org.springframework.data.domain.Sort.Order;
-import org.springframework.data.jdbc.core.function.connectionfactory.ConnectionProxy;
+import org.springframework.data.r2dbc.function.connectionfactory.ConnectionProxy;
+import org.springframework.data.r2dbc.function.convert.ColumnMapRowMapper;
 import org.springframework.data.util.Pair;
 import org.springframework.jdbc.core.SqlProvider;
 import org.springframework.jdbc.support.SQLExceptionTranslator;
@@ -240,7 +241,7 @@ private static void doBind(Statement statement, Map<String, Optional<Object>> by
 	}
 
 	/**
-	 * Default {@link org.springframework.data.jdbc.core.function.DatabaseClient.SqlSpec} implementation.
+	 * Default {@link DatabaseClient.SqlSpec} implementation.
 	 */
 	private class DefaultSqlSpec implements SqlSpec {
 
@@ -261,8 +262,7 @@ public GenericExecuteSpec sql(Supplier<String> sqlSupplier) {
 	}
 
 	/**
-	 * Base class for {@link org.springframework.data.jdbc.core.function.DatabaseClient.GenericExecuteSpec}
-	 * implementations.
+	 * Base class for {@link DatabaseClient.GenericExecuteSpec} implementations.
 	 */
 	@RequiredArgsConstructor
 	private class GenericExecuteSpecSupport {
@@ -358,7 +358,7 @@ public GenericExecuteSpecSupport bind(Object bean) {
 	}
 
 	/**
-	 * Default {@link org.springframework.data.jdbc.core.function.DatabaseClient.GenericExecuteSpec} implementation.
+	 * Default {@link DatabaseClient.GenericExecuteSpec} implementation.
 	 */
 	private class DefaultGenericExecuteSpec extends GenericExecuteSpecSupport implements GenericExecuteSpec {
 
@@ -422,7 +422,7 @@ protected GenericExecuteSpecSupport createInstance(Map<Integer, Optional<Object>
 	}
 
 	/**
-	 * Default {@link org.springframework.data.jdbc.core.function.DatabaseClient.GenericExecuteSpec} implementation.
+	 * Default {@link DatabaseClient.GenericExecuteSpec} implementation.
 	 */
 	@SuppressWarnings("unchecked")
 	private class DefaultTypedGenericExecuteSpec<T> extends GenericExecuteSpecSupport implements TypedExecuteSpec<T> {
@@ -490,7 +490,7 @@ protected DefaultTypedGenericExecuteSpec<T> createInstance(Map<Integer, Optional
 	}
 
 	/**
-	 * Default {@link org.springframework.data.jdbc.core.function.DatabaseClient.SelectFromSpec} implementation.
+	 * Default {@link DatabaseClient.SelectFromSpec} implementation.
 	 */
 	class DefaultSelectFromSpec implements SelectFromSpec {
 
@@ -506,8 +506,7 @@ public <T> TypedSelectSpec<T> from(Class<T> table) {
 	}
 
 	/**
-	 * Base class for {@link org.springframework.data.jdbc.core.function.DatabaseClient.GenericExecuteSpec}
-	 * implementations.
+	 * Base class for {@link DatabaseClient.GenericExecuteSpec} implementations.
 	 */
 	@RequiredArgsConstructor
 	private abstract class DefaultSelectSpecSupport {
@@ -678,7 +677,7 @@ protected DefaultGenericSelectSpec createInstance(String table, List<String> pro
 	}
 
 	/**
-	 * Default implementation of {@link org.springframework.data.jdbc.core.function.DatabaseClient.TypedInsertSpec}.
+	 * Default implementation of {@link DatabaseClient.TypedInsertSpec}.
 	 */
 	@SuppressWarnings("unchecked")
 	private class DefaultTypedSelectSpec<T> extends DefaultSelectSpecSupport implements TypedSelectSpec<T> {
@@ -779,7 +778,7 @@ protected DefaultTypedSelectSpec<T> createInstance(String table, List<String> pr
 	}
 
 	/**
-	 * Default {@link org.springframework.data.jdbc.core.function.DatabaseClient.InsertIntoSpec} implementation.
+	 * Default {@link DatabaseClient.InsertIntoSpec} implementation.
 	 */
 	class DefaultInsertIntoSpec implements InsertIntoSpec {
 
@@ -795,7 +794,7 @@ public <T> TypedInsertSpec<T> into(Class<T> table) {
 	}
 
 	/**
-	 * Default implementation of {@link org.springframework.data.jdbc.core.function.DatabaseClient.GenericInsertSpec}.
+	 * Default implementation of {@link DatabaseClient.GenericInsertSpec}.
 	 */
 	@RequiredArgsConstructor
 	class DefaultGenericInsertSpec implements GenericInsertSpec {
@@ -891,7 +890,7 @@ private void doBind(Statement statement) {
 	}
 
 	/**
-	 * Default implementation of {@link org.springframework.data.jdbc.core.function.DatabaseClient.TypedInsertSpec}.
+	 * Default implementation of {@link DatabaseClient.TypedInsertSpec}.
 	 */
 	@RequiredArgsConstructor
 	class DefaultTypedInsertSpec<T> implements TypedInsertSpec<T>, InsertSpec {

src/main/java/org/springframework/data/jdbc/core/function/DefaultDatabaseClientBuilder.java renamed to src/main/java/org/springframework/data/r2dbc/function/DefaultDatabaseClientBuilder.java

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.data.jdbc.core.function;
+package org.springframework.data.r2dbc.function;
+
+import io.r2dbc.spi.ConnectionFactory;
 
 import java.util.function.Consumer;
 
-import org.springframework.data.jdbc.core.function.DatabaseClient.Builder;
+import org.springframework.data.r2dbc.function.DatabaseClient.Builder;
 import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 import org.springframework.jdbc.support.SQLExceptionTranslator;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
-import io.r2dbc.spi.ConnectionFactory;
-
 /**
  * Default implementation of {@link DatabaseClient.Builder}.
  *

src/main/java/org/springframework/data/jdbc/core/function/DefaultFetchSpec.java renamed to src/main/java/org/springframework/data/r2dbc/function/DefaultFetchSpec.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.function;
+package org.springframework.data.r2dbc.function;
 
 import io.r2dbc.spi.Connection;
 import lombok.RequiredArgsConstructor;

src/main/java/org/springframework/data/jdbc/core/function/DefaultReactiveDataAccessStrategy.java renamed to src/main/java/org/springframework/data/r2dbc/function/DefaultReactiveDataAccessStrategy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.function;
+package org.springframework.data.r2dbc.function;
 
 import io.r2dbc.spi.Row;
 import io.r2dbc.spi.RowMetadata;
@@ -31,6 +31,7 @@
 import org.springframework.data.jdbc.core.mapping.JdbcPersistentEntity;
 import org.springframework.data.jdbc.core.mapping.JdbcPersistentProperty;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
+import org.springframework.data.r2dbc.function.convert.EntityRowMapper;
 import org.springframework.data.util.Pair;
 import org.springframework.data.util.StreamUtils;
 import org.springframework.util.ClassUtils;

src/main/java/org/springframework/data/jdbc/core/function/DefaultSqlResult.java renamed to src/main/java/org/springframework/data/r2dbc/function/DefaultSqlResult.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.function;
+package org.springframework.data.r2dbc.function;
 
 import io.r2dbc.spi.Connection;
 import io.r2dbc.spi.Result;

src/main/java/org/springframework/data/jdbc/core/function/FetchSpec.java renamed to src/main/java/org/springframework/data/r2dbc/function/FetchSpec.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.function;
+package org.springframework.data.r2dbc.function;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;

src/main/java/org/springframework/data/jdbc/core/function/ReactiveDataAccessStrategy.java renamed to src/main/java/org/springframework/data/r2dbc/function/ReactiveDataAccessStrategy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.function;
+package org.springframework.data.r2dbc.function;
 
 import io.r2dbc.spi.Row;
 import io.r2dbc.spi.RowMetadata;

src/main/java/org/springframework/data/jdbc/core/function/SqlResult.java renamed to src/main/java/org/springframework/data/r2dbc/function/SqlResult.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.function;
+package org.springframework.data.r2dbc.function;
 
 import io.r2dbc.spi.Row;
 import io.r2dbc.spi.RowMetadata;

src/main/java/org/springframework/data/jdbc/core/function/connectionfactory/ConnectionProxy.java renamed to src/main/java/org/springframework/data/r2dbc/function/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.jdbc.core.function.connectionfactory;
+package org.springframework.data.r2dbc.function.connectionfactory;
 
 import io.r2dbc.spi.Connection;
 

src/main/java/org/springframework/data/jdbc/core/function/ColumnMapRowMapper.java renamed to src/main/java/org/springframework/data/r2dbc/function/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.jdbc.core.function;
+package org.springframework.data.r2dbc.function.convert;
 
 import io.r2dbc.spi.ColumnMetadata;
 import io.r2dbc.spi.Row;

src/main/java/org/springframework/data/jdbc/core/function/EntityRowMapper.java renamed to src/main/java/org/springframework/data/r2dbc/function/convert/EntityRowMapper.java

@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.core.function;
+package org.springframework.data.r2dbc.function.convert;
 
+import io.r2dbc.spi.Row;
+import io.r2dbc.spi.RowMetadata;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
@@ -35,9 +37,6 @@
 import org.springframework.data.mapping.model.ParameterValueProvider;
 import org.springframework.util.ClassUtils;
 
-import io.r2dbc.spi.Row;
-import io.r2dbc.spi.RowMetadata;
-
 /**
  * Maps a {@link io.r2dbc.spi.Row} to an entity of type {@code T}, including entities referenced.
  *

src/main/java/org/springframework/data/jdbc/core/function/IterableUtils.java renamed to src/main/java/org/springframework/data/r2dbc/function/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.jdbc.core.function;
+package org.springframework.data.r2dbc.function.convert;
 
 import java.util.ArrayList;
 import java.util.Collection;

src/main/java/org/springframework/data/jdbc/core/function/MappingR2dbcConverter.java renamed to src/main/java/org/springframework/data/r2dbc/function/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.jdbc.core.function;
+package org.springframework.data.r2dbc.function.convert;
 
 import io.r2dbc.spi.Row;
 import io.r2dbc.spi.RowMetadata;

src/main/java/org/springframework/data/jdbc/repository/R2dbcRepository.java renamed to src/main/java/org/springframework/data/r2dbc/repository/R2dbcRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.repository;
+package org.springframework.data.r2dbc.repository;
 
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.repository.reactive.ReactiveCrudRepository;

src/main/java/org/springframework/data/r2dbc/repository/package-info.java

@@ -0,0 +1,7 @@
+/**
+ * R2DBC-specific repository implementation.
+ */
+@NonNullApi
+package org.springframework.data.r2dbc.repository;
+
+import org.springframework.lang.NonNullApi;

src/main/java/org/springframework/data/jdbc/repository/query/AbstractR2dbcQuery.java renamed to src/main/java/org/springframework/data/r2dbc/repository/query/AbstractR2dbcQuery.java

@@ -13,20 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.repository.query;
+package org.springframework.data.r2dbc.repository.query;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import org.reactivestreams.Publisher;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.convert.EntityInstantiators;
-import org.springframework.data.jdbc.core.function.DatabaseClient;
-import org.springframework.data.jdbc.core.function.DatabaseClient.GenericExecuteSpec;
-import org.springframework.data.jdbc.core.function.FetchSpec;
-import org.springframework.data.jdbc.core.function.MappingR2dbcConverter;
-import org.springframework.data.jdbc.repository.query.R2dbcQueryExecution.ResultProcessingConverter;
-import org.springframework.data.jdbc.repository.query.R2dbcQueryExecution.ResultProcessingExecution;
+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.MappingR2dbcConverter;
+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;
+import org.springframework.data.relational.repository.query.RelationalParametersParameterAccessor;
 import org.springframework.data.repository.query.ParameterAccessor;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.repository.query.ResultProcessor;
@@ -79,7 +81,7 @@ public R2dbcQueryMethod getQueryMethod() {
 	public Object execute(Object[] parameters) {
 
 		return method.hasReactiveWrapperParameter() ? executeDeferred(parameters)
-				: execute(new JdbcParametersParameterAccessor(method, parameters));
+				: execute(new RelationalParametersParameterAccessor(method, parameters));
 	}
 
 	@SuppressWarnings("unchecked")
@@ -94,7 +96,7 @@ private Object executeDeferred(Object[] parameters) {
 		return Mono.defer(() -> (Mono<Object>) execute(parameterAccessor));
 	}
 
-	private Object execute(JdbcParameterAccessor parameterAccessor) {
+	private Object execute(RelationalParameterAccessor parameterAccessor) {
 
 		// TODO: ConvertingParameterAccessor
 		BindableQuery query = createQuery(parameterAccessor);
@@ -143,5 +145,5 @@ private R2dbcQueryExecution getExecutionToWrap() {
 	 * @param accessor must not be {@literal null}.
 	 * @return
 	 */
-	protected abstract BindableQuery createQuery(JdbcParameterAccessor accessor);
+	protected abstract BindableQuery createQuery(RelationalParameterAccessor accessor);
 }

src/main/java/org/springframework/data/jdbc/repository/query/BindableQuery.java renamed to src/main/java/org/springframework/data/r2dbc/repository/query/BindableQuery.java

@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.repository.query;
+package org.springframework.data.r2dbc.repository.query;
 
 import java.util.function.Supplier;
 
-import org.springframework.data.jdbc.core.function.DatabaseClient.BindSpec;
+import org.springframework.data.r2dbc.function.DatabaseClient.BindSpec;
 
 /**
  * Interface declaring a query that supplies SQL and can bind parameters to a {@link BindSpec}.
- * 
+ *
  * @author Mark Paluch
  */
 public interface BindableQuery extends Supplier<String> {
 
 	/**
 	 * Bind parameters to the {@link BindSpec query}.
-	 * 
+	 *
 	 * @param bindSpec must not be {@literal null}.
 	 * @return the bound query object.
 	 */

src/main/java/org/springframework/data/jdbc/repository/query/R2dbcParameterAccessor.java renamed to src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcParameterAccessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.jdbc.repository.query;
+package org.springframework.data.r2dbc.repository.query;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -22,6 +22,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.data.relational.repository.query.RelationalParametersParameterAccessor;
 import org.springframework.data.repository.util.ReactiveWrapperConverters;
 import org.springframework.data.repository.util.ReactiveWrappers;
 
@@ -31,7 +32,7 @@
  *
  * @author Mark Paluch
  */
-class R2dbcParameterAccessor extends JdbcParametersParameterAccessor {
+class R2dbcParameterAccessor extends RelationalParametersParameterAccessor {
 
 	private final Object[] values;
 	private final List<MonoProcessor<?>> subscriptions;