From 9e9495ee5458f7c555ebc35596a7a6436c51e654 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 8 Nov 2016 10:59:13 +0100 Subject: [PATCH] DATAMONGO-1444 - Make Project Reactor dependency no longer required for blocking repository usage. Use ReactiveWrapperConverters for reactive wrapper type conversion to not require Project Reactor for blocking repository usage. --- .../repository/support/ReactiveMongoRepositoryFactory.java | 3 ++- .../query/ReactiveStringBasedMongoQueryUnitTests.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactory.java index 4c3e5617e..26e259318 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactory.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactory.java @@ -78,7 +78,8 @@ public class ReactiveMongoRepositoryFactory extends RepositoryFactorySupport { this.mappingContext = mongoOperations.getConverter().getMappingContext(); DefaultConversionService conversionService = new DefaultConversionService(); - QueryExecutionConverters.registerConvertersIn(conversionService); + ReactiveWrapperConverters.registerConvertersIn(conversionService); + this.conversionService = conversionService; setConversionService(conversionService); } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQueryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQueryUnitTests.java index 3ec17a875..3e2188117 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQueryUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQueryUnitTests.java @@ -49,6 +49,7 @@ import org.springframework.data.repository.Repository; import org.springframework.data.repository.core.support.DefaultRepositoryMetadata; import org.springframework.data.repository.query.DefaultEvaluationContextProvider; import org.springframework.data.repository.util.QueryExecutionConverters; +import org.springframework.data.repository.util.ReactiveWrapperConverters; import org.springframework.expression.spel.standard.SpelExpressionParser; import reactor.core.publisher.Flux; @@ -250,7 +251,7 @@ public class ReactiveStringBasedMongoQueryUnitTests { private ReactiveStringBasedMongoQuery createQueryForMethod(String name, Class... parameters) throws Exception { DefaultConversionService conversionService = new DefaultConversionService(); - QueryExecutionConverters.registerConvertersIn(conversionService); + ReactiveWrapperConverters.registerConvertersIn(conversionService); Method method = SampleRepository.class.getMethod(name, parameters); ProjectionFactory factory = new SpelAwareProxyProjectionFactory();