diff --git a/src/main/java/org/springframework/data/r2dbc/repository/R2dbcRepository.java b/src/main/java/org/springframework/data/r2dbc/repository/reactive/R2dbcRepository.java similarity index 94% rename from src/main/java/org/springframework/data/r2dbc/repository/R2dbcRepository.java rename to src/main/java/org/springframework/data/r2dbc/repository/reactive/R2dbcRepository.java index eba2d5bf70..a4b0c133af 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/R2dbcRepository.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/reactive/R2dbcRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.repository; +package org.springframework.data.r2dbc.repository.reactive; import org.springframework.data.repository.NoRepositoryBean; import org.springframework.data.repository.reactive.ReactiveCrudRepository; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/package-info.java b/src/main/java/org/springframework/data/r2dbc/repository/reactive/package-info.java similarity index 64% rename from src/main/java/org/springframework/data/r2dbc/repository/package-info.java rename to src/main/java/org/springframework/data/r2dbc/repository/reactive/package-info.java index a39ae5031c..65e87bef1d 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/package-info.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/reactive/package-info.java @@ -2,6 +2,6 @@ * R2DBC-specific repository implementation. */ @NonNullApi -package org.springframework.data.r2dbc.repository; +package org.springframework.data.r2dbc.repository.reactive; import org.springframework.lang.NonNullApi; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/query/AbstractR2dbcQuery.java b/src/main/java/org/springframework/data/r2dbc/repository/reactive/query/AbstractR2dbcQuery.java similarity index 94% rename from src/main/java/org/springframework/data/r2dbc/repository/query/AbstractR2dbcQuery.java rename to src/main/java/org/springframework/data/r2dbc/repository/reactive/query/AbstractR2dbcQuery.java index 3fbeeb6b51..7b03afa44d 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/query/AbstractR2dbcQuery.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/reactive/query/AbstractR2dbcQuery.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.repository.query; +package org.springframework.data.r2dbc.repository.reactive.query; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -25,8 +25,8 @@ 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.r2dbc.repository.reactive.query.R2dbcQueryExecution.ResultProcessingConverter; +import org.springframework.data.r2dbc.repository.reactive.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; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/query/BindableQuery.java b/src/main/java/org/springframework/data/r2dbc/repository/reactive/query/BindableQuery.java similarity index 94% rename from src/main/java/org/springframework/data/r2dbc/repository/query/BindableQuery.java rename to src/main/java/org/springframework/data/r2dbc/repository/reactive/query/BindableQuery.java index dc2957eefb..f67807238e 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/query/BindableQuery.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/reactive/query/BindableQuery.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.repository.query; +package org.springframework.data.r2dbc.repository.reactive.query; import java.util.function.Supplier; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcParameterAccessor.java b/src/main/java/org/springframework/data/r2dbc/repository/reactive/query/R2dbcParameterAccessor.java similarity index 97% rename from src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcParameterAccessor.java rename to src/main/java/org/springframework/data/r2dbc/repository/reactive/query/R2dbcParameterAccessor.java index c859d7a5db..8a9670c7f5 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcParameterAccessor.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/reactive/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.r2dbc.repository.query; +package org.springframework.data.r2dbc.repository.reactive.query; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryExecution.java b/src/main/java/org/springframework/data/r2dbc/repository/reactive/query/R2dbcQueryExecution.java similarity index 98% rename from src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryExecution.java rename to src/main/java/org/springframework/data/r2dbc/repository/reactive/query/R2dbcQueryExecution.java index 6c846effaf..1428148d9a 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryExecution.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/reactive/query/R2dbcQueryExecution.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.repository.query; +package org.springframework.data.r2dbc.repository.reactive.query; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethod.java b/src/main/java/org/springframework/data/r2dbc/repository/reactive/query/R2dbcQueryMethod.java similarity index 99% rename from src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethod.java rename to src/main/java/org/springframework/data/r2dbc/repository/reactive/query/R2dbcQueryMethod.java index 55249bca7b..4264e8b860 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethod.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/reactive/query/R2dbcQueryMethod.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.repository.query; +package org.springframework.data.r2dbc.repository.reactive.query; import static org.springframework.data.repository.util.ClassUtils.*; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQuery.java b/src/main/java/org/springframework/data/r2dbc/repository/reactive/query/StringBasedR2dbcQuery.java similarity index 98% rename from src/main/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQuery.java rename to src/main/java/org/springframework/data/r2dbc/repository/reactive/query/StringBasedR2dbcQuery.java index ff388dccae..c594dd23c6 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQuery.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/reactive/query/StringBasedR2dbcQuery.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.repository.query; +package org.springframework.data.r2dbc.repository.reactive.query; import org.springframework.data.jdbc.repository.query.Query; import org.springframework.data.r2dbc.function.DatabaseClient; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/query/package-info.java b/src/main/java/org/springframework/data/r2dbc/repository/reactive/query/package-info.java similarity index 71% rename from src/main/java/org/springframework/data/r2dbc/repository/query/package-info.java rename to src/main/java/org/springframework/data/r2dbc/repository/reactive/query/package-info.java index 0ab85fa3f4..e3711518f3 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/query/package-info.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/reactive/query/package-info.java @@ -3,7 +3,7 @@ */ @NonNullApi @NonNullFields -package org.springframework.data.r2dbc.repository.query; +package org.springframework.data.r2dbc.repository.reactive.query; import org.springframework.lang.NonNullApi; import org.springframework.lang.NonNullFields; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactory.java b/src/main/java/org/springframework/data/r2dbc/repository/reactive/support/R2dbcRepositoryFactory.java similarity index 95% rename from src/main/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactory.java rename to src/main/java/org/springframework/data/r2dbc/repository/reactive/support/R2dbcRepositoryFactory.java index a4482bec8f..54a17bb27e 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactory.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/reactive/support/R2dbcRepositoryFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.repository.support; +package org.springframework.data.r2dbc.repository.reactive.support; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; @@ -27,9 +27,9 @@ import org.springframework.data.projection.ProjectionFactory; import org.springframework.data.r2dbc.function.DatabaseClient; import org.springframework.data.r2dbc.function.convert.MappingR2dbcConverter; -import org.springframework.data.r2dbc.repository.R2dbcRepository; -import org.springframework.data.r2dbc.repository.query.R2dbcQueryMethod; -import org.springframework.data.r2dbc.repository.query.StringBasedR2dbcQuery; +import org.springframework.data.r2dbc.repository.reactive.R2dbcRepository; +import org.springframework.data.r2dbc.repository.reactive.query.R2dbcQueryMethod; +import org.springframework.data.r2dbc.repository.reactive.query.StringBasedR2dbcQuery; import org.springframework.data.relational.repository.query.RelationalEntityInformation; import org.springframework.data.relational.repository.support.MappingRelationalEntityInformation; import org.springframework.data.repository.core.NamedQueries; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java b/src/main/java/org/springframework/data/r2dbc/repository/reactive/support/SimpleR2dbcRepository.java similarity index 99% rename from src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java rename to src/main/java/org/springframework/data/r2dbc/repository/reactive/support/SimpleR2dbcRepository.java index 943c43af5a..21526b3c78 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/reactive/support/SimpleR2dbcRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.repository.support; +package org.springframework.data.r2dbc.repository.reactive.support; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/org/springframework/data/r2dbc/repository/support/package-info.java b/src/main/java/org/springframework/data/r2dbc/repository/reactive/support/package-info.java similarity index 67% rename from src/main/java/org/springframework/data/r2dbc/repository/support/package-info.java rename to src/main/java/org/springframework/data/r2dbc/repository/reactive/support/package-info.java index 5fc32c6de9..154513483e 100644 --- a/src/main/java/org/springframework/data/r2dbc/repository/support/package-info.java +++ b/src/main/java/org/springframework/data/r2dbc/repository/reactive/support/package-info.java @@ -2,6 +2,6 @@ * Support infrastructure for query derivation of R2DBC-specific repositories. */ @NonNullApi -package org.springframework.data.r2dbc.repository.support; +package org.springframework.data.r2dbc.repository.reactive.support; import org.springframework.lang.NonNullApi; diff --git a/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java b/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java index 97a3cefae4..f68ac394d8 100644 --- a/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java +++ b/src/test/java/org/springframework/data/jdbc/degraph/DependencyTests.java @@ -21,7 +21,6 @@ import de.schauderhaft.degraph.check.JCheck; import scala.runtime.AbstractFunction1; -import org.junit.Ignore; import org.junit.Test; /** @@ -38,13 +37,17 @@ public void cycleFree() { classpath() // .noJars() // .including("org.springframework.data.jdbc.**") // + .including("org.springframework.data.relational.**") // + .including("org.springframework.data.r2dbc.**") // .filterClasspath("*target/classes") // exclude test code + .withSlicing("modules", + "org.springframework.data.(*).**" + ) .printOnFailure("degraph.graphml"), JCheck.violationFree()); } @Test // DATAJDBC-220 - @Ignore("I don't understand why this fails after adding reactive repos - mp911de") public void acrossModules() { assertThat( // @@ -60,8 +63,12 @@ public Object apply(String s) { // }) // exclude test code .withSlicing("sub-modules", // sub-modules are defined by any of the following pattern. "org.springframework.data.jdbc.(**).*", // + "org.springframework.data.relational.(**).*", // + "org.springframework.data.r2dbc.(**).*", // "org.springframework.data.(**).*") // .printTo("degraph-across-modules.graphml"), // writes a graphml to this location JCheck.violationFree()); } + + } diff --git a/src/test/java/org/springframework/data/r2dbc/repository/R2dbcRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/repository/reactive/R2dbcRepositoryIntegrationTests.java similarity index 96% rename from src/test/java/org/springframework/data/r2dbc/repository/R2dbcRepositoryIntegrationTests.java rename to src/test/java/org/springframework/data/r2dbc/repository/reactive/R2dbcRepositoryIntegrationTests.java index d18fdc5cb6..8c361132e6 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/R2dbcRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/reactive/R2dbcRepositoryIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.repository; +package org.springframework.data.r2dbc.repository.reactive; import static org.assertj.core.api.Assertions.*; @@ -38,7 +38,7 @@ import org.springframework.data.jdbc.testing.R2dbcIntegrationTestSupport; import org.springframework.data.r2dbc.function.DatabaseClient; import org.springframework.data.r2dbc.function.DefaultReactiveDataAccessStrategy; -import org.springframework.data.r2dbc.repository.support.R2dbcRepositoryFactory; +import org.springframework.data.r2dbc.repository.reactive.support.R2dbcRepositoryFactory; import org.springframework.data.repository.reactive.ReactiveCrudRepository; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/test/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethodUnitTests.java b/src/test/java/org/springframework/data/r2dbc/repository/reactive/query/R2dbcQueryMethodUnitTests.java similarity index 98% rename from src/test/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethodUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/repository/reactive/query/R2dbcQueryMethodUnitTests.java index 1dcb41cdfc..67a10349ac 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryMethodUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/reactive/query/R2dbcQueryMethodUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.repository.query; +package org.springframework.data.r2dbc.repository.reactive.query; import static org.assertj.core.api.Assertions.*; diff --git a/src/test/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQueryUnitTests.java b/src/test/java/org/springframework/data/r2dbc/repository/reactive/query/StringBasedR2dbcQueryUnitTests.java similarity index 98% rename from src/test/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQueryUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/repository/reactive/query/StringBasedR2dbcQueryUnitTests.java index 9ddbbe1cad..4160124bea 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQueryUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/reactive/query/StringBasedR2dbcQueryUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.repository.query; +package org.springframework.data.r2dbc.repository.reactive.query; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/src/test/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactoryUnitTests.java b/src/test/java/org/springframework/data/r2dbc/repository/reactive/support/R2dbcRepositoryFactoryUnitTests.java similarity index 97% rename from src/test/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactoryUnitTests.java rename to src/test/java/org/springframework/data/r2dbc/repository/reactive/support/R2dbcRepositoryFactoryUnitTests.java index 5448c97724..f15a6934e0 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/support/R2dbcRepositoryFactoryUnitTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/reactive/support/R2dbcRepositoryFactoryUnitTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.repository.support; +package org.springframework.data.r2dbc.repository.reactive.support; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; diff --git a/src/test/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepositoryIntegrationTests.java b/src/test/java/org/springframework/data/r2dbc/repository/reactive/support/SimpleR2dbcRepositoryIntegrationTests.java similarity index 99% rename from src/test/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepositoryIntegrationTests.java rename to src/test/java/org/springframework/data/r2dbc/repository/reactive/support/SimpleR2dbcRepositoryIntegrationTests.java index 6a42ce25ad..edf4f1c3a0 100644 --- a/src/test/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepositoryIntegrationTests.java +++ b/src/test/java/org/springframework/data/r2dbc/repository/reactive/support/SimpleR2dbcRepositoryIntegrationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.r2dbc.repository.support; +package org.springframework.data.r2dbc.repository.reactive.support; import static org.assertj.core.api.Assertions.*;