Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-836 - Move reactive wrapper converters to ReactiveWrapperConverters.

Browse Source 
Move reactive wrapper conversion to ReactiveWrapperConverters to minimize touching points with reactive APIs. ReactiveWrapperConverters is used only from reactive repository components and does not initialize with blocking API use. This removes the need of having Project Reactor on the class path for non-reactive use.
This commit is contained in:
Mark Paluch
2016-11-08 10:48:58 +01:00
committed by Oliver Gierke
parent dd2fe0a34d
commit a6bc800138
5 changed files with 672 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/test/java/org/springframework/data/repository/core/support/ReactiveRepositoryInformationUnitTests.java
View File

@@ -18,8 +18,6 @@ package org.springframework.data.repository.core.support;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import rx.Observable;
import java.io.Serializable;
import java.lang.reflect.Method;
@@ -32,7 +30,9 @@ import org.springframework.data.repository.core.RepositoryMetadata;
import org.springframework.data.repository.reactive.ReactiveCrudRepository;
import org.springframework.data.repository.reactive.ReactiveSortingRepository;
import org.springframework.data.repository.reactive.RxJava1CrudRepository;
import org.springframework.data.repository.util.QueryExecutionConverters;
import org.springframework.data.repository.util.ReactiveWrapperConverters;
import rx.Observable;
/**
* Unit tests for {@link ReactiveRepositoryInformation}.
@@ -60,7 +60,7 @@ public class ReactiveRepositoryInformationUnitTests {
public void discoversMethodWithConvertibleArguments() throws Exception {
DefaultConversionService conversionService = new DefaultConversionService();
QueryExecutionConverters.registerConvertersIn(conversionService);
ReactiveWrapperConverters.registerConvertersIn(conversionService);
Method method = RxJava1InterfaceWithGenerics.class.getMethod("save", Observable.class);
RepositoryMetadata metadata = new DefaultRepositoryMetadata(RxJava1InterfaceWithGenerics.class);
@@ -77,7 +77,7 @@ public class ReactiveRepositoryInformationUnitTests {
public void discoversMethodAssignableArguments() throws Exception {
DefaultConversionService conversionService = new DefaultConversionService();
QueryExecutionConverters.registerConvertersIn(conversionService);
ReactiveWrapperConverters.registerConvertersIn(conversionService);
Method method = ReactiveSortingRepository.class.getMethod("save", Publisher.class);
RepositoryMetadata metadata = new DefaultRepositoryMetadata(ReactiveJavaInterfaceWithGenerics.class);
@@ -94,7 +94,7 @@ public class ReactiveRepositoryInformationUnitTests {
public void discoversMethodExactIterableArguments() throws Exception {
DefaultConversionService conversionService = new DefaultConversionService();
QueryExecutionConverters.registerConvertersIn(conversionService);
ReactiveWrapperConverters.registerConvertersIn(conversionService);
Method method = ReactiveJavaInterfaceWithGenerics.class.getMethod("save", Iterable.class);
RepositoryMetadata metadata = new DefaultRepositoryMetadata(ReactiveJavaInterfaceWithGenerics.class);
@@ -111,7 +111,7 @@ public class ReactiveRepositoryInformationUnitTests {
public void discoversMethodExactObjectArguments() throws Exception {
DefaultConversionService conversionService = new DefaultConversionService();
QueryExecutionConverters.registerConvertersIn(conversionService);
ReactiveWrapperConverters.registerConvertersIn(conversionService);
Method method = ReactiveJavaInterfaceWithGenerics.class.getMethod("save", Object.class);
RepositoryMetadata metadata = new DefaultRepositoryMetadata(ReactiveJavaInterfaceWithGenerics.class);
@@ -124,8 +124,7 @@ public class ReactiveRepositoryInformationUnitTests {
assertThat(reference.getParameterTypes()[0], is(equalTo(Object.class)));
}
interface RxJava1InterfaceWithGenerics extends RxJava1CrudRepository<User, String>
{}
interface RxJava1InterfaceWithGenerics extends RxJava1CrudRepository<User, String> {}
interface ReactiveJavaInterfaceWithGenerics extends ReactiveCrudRepository<User, String> {}

9
src/test/java/org/springframework/data/repository/core/support/ReactiveWrapperRepositoryFactorySupportUnitTests.java
View File

@@ -15,10 +15,7 @@
*/
package org.springframework.data.repository.core.support;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.*;
import java.io.Serializable;
@@ -32,7 +29,7 @@ import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.data.repository.Repository;
import org.springframework.data.repository.reactive.ReactiveSortingRepository;
import org.springframework.data.repository.util.QueryExecutionConverters;
import org.springframework.data.repository.util.ReactiveWrapperConverters;
import reactor.core.publisher.Mono;
import rx.Single;
@@ -56,7 +53,7 @@ public class ReactiveWrapperRepositoryFactorySupportUnitTests {
public void setUp() {
DefaultConversionService defaultConversionService = new DefaultConversionService();
QueryExecutionConverters.registerConvertersIn(defaultConversionService);
ReactiveWrapperConverters.registerConvertersIn(defaultConversionService);
factory = new DummyRepositoryFactory(backingRepo);
factory.setConversionService(defaultConversionService);