From 5245cd4b552f412127c5ad17b0ca1a3f7f90d69c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 26 Jul 2017 14:18:17 +0200 Subject: [PATCH] DATAMONGO-1706 - Adapt to deprecated RxJava 1 CRUD repositories. Move off RxJava1CrudRepository as base repository in tests by extending just Repository and declaring query methods/overloads using RxJava1 types. --- .../support/ReactiveMongoRepositoryFactoryBean.java | 3 +-- .../repository/ConvertingReactiveMongoRepositoryTests.java | 7 +++++-- ...tiveMongoRepositoryConfigurationExtensionUnitTests.java | 5 ++--- .../repository/custom/CustomReactiveMongoRepository.java | 7 +++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryBean.java index 9560f2c69..325147859 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryBean.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryBean.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.mongodb.repository.support; import java.io.Serializable; @@ -34,7 +33,7 @@ import org.springframework.util.Assert; * @author Christoph Strobl * @since 2.0 * @see org.springframework.data.repository.reactive.ReactiveSortingRepository - * @see org.springframework.data.repository.reactive.RxJava1SortingRepository + * @see org.springframework.data.repository.reactive.RxJava2SortingRepository */ public class ReactiveMongoRepositoryFactoryBean, S, ID extends Serializable> extends RepositoryFactoryBeanSupport { diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ConvertingReactiveMongoRepositoryTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ConvertingReactiveMongoRepositoryTests.java index 51aa64f22..4a125f055 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ConvertingReactiveMongoRepositoryTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ConvertingReactiveMongoRepositoryTests.java @@ -44,7 +44,6 @@ import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories; import org.springframework.data.repository.reactive.ReactiveSortingRepository; -import org.springframework.data.repository.reactive.RxJava1SortingRepository; import org.springframework.data.repository.reactive.RxJava2SortingRepository; import org.springframework.stereotype.Repository; import org.springframework.test.context.ContextConfiguration; @@ -286,13 +285,17 @@ public class ConvertingReactiveMongoRepositoryTests { } @Repository - interface RxJava1PersonRepostitory extends RxJava1SortingRepository { + interface RxJava1PersonRepostitory extends org.springframework.data.repository.Repository { Observable findByFirstnameAndLastname(String firstname, String lastname); Single findByLastname(String lastname); Single findProjectedByLastname(String lastname); + + Single existsById(String id); + + Single existsById(Single id); } @Repository diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtensionUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtensionUnitTests.java index 1f350ba1c..7a85ac48f 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtensionUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtensionUnitTests.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.mongodb.repository.config; import static org.junit.Assert.*; @@ -34,7 +33,7 @@ import org.springframework.data.repository.config.AnnotationRepositoryConfigurat import org.springframework.data.repository.config.RepositoryConfiguration; import org.springframework.data.repository.config.RepositoryConfigurationSource; import org.springframework.data.repository.reactive.ReactiveCrudRepository; -import org.springframework.data.repository.reactive.RxJava1CrudRepository; +import org.springframework.data.repository.reactive.RxJava2CrudRepository; /** * Unit tests for {@link ReactiveMongoRepositoryConfigurationExtension}. @@ -108,7 +107,7 @@ public class ReactiveMongoRepositoryConfigurationExtensionUnitTests { interface SampleRepository extends ReactiveCrudRepository {} - interface UnannotatedRepository extends RxJava1CrudRepository {} + interface UnannotatedRepository extends RxJava2CrudRepository {} interface StoreRepository extends ReactiveMongoRepository {} } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepository.java index a95145365..74a584530 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepository.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 the original author or authors. + * Copyright 2016-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,16 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.mongodb.repository.custom; import org.springframework.data.mongodb.repository.User; -import org.springframework.data.repository.reactive.RxJava1CrudRepository; +import org.springframework.data.repository.reactive.RxJava2CrudRepository; /** * @author Mark Paluch */ public interface CustomReactiveMongoRepository - extends RxJava1CrudRepository, CustomReactiveMongoRepositoryCustom { + extends RxJava2CrudRepository, CustomReactiveMongoRepositoryCustom { }