From 7b34a602ed9234511496d104d55adf2603f785bf Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 10 Mar 2020 13:55:41 +0100 Subject: [PATCH] DATAMONGO-2355 - Declare concrete Template API class type on AbstractReactiveMongoConfiguration. We now declare bean methods returning Template API types with their concrete implementation to allow for improved introspection of bean definitions. --- .../data/mongodb/config/AbstractMongoClientConfiguration.java | 3 ++- .../mongodb/config/AbstractReactiveMongoConfiguration.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoClientConfiguration.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoClientConfiguration.java index 2bac4e54a..5691df828 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoClientConfiguration.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoClientConfiguration.java @@ -15,11 +15,11 @@ */ package org.springframework.data.mongodb.config; -import com.mongodb.MongoClientSettings.Builder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.mongodb.MongoDatabaseFactory; import org.springframework.data.mongodb.SpringDataMongoDB; +import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory; import org.springframework.data.mongodb.core.convert.DbRefResolver; @@ -29,6 +29,7 @@ import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.lang.Nullable; import com.mongodb.MongoClientSettings; +import com.mongodb.MongoClientSettings.Builder; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfiguration.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfiguration.java index d64bcfc91..8b538f9d0 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfiguration.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfiguration.java @@ -60,7 +60,7 @@ public abstract class AbstractReactiveMongoConfiguration extends MongoConfigurat * @return never {@literal null}. */ @Bean - public ReactiveMongoOperations reactiveMongoTemplate() throws Exception { + public ReactiveMongoTemplate reactiveMongoTemplate() throws Exception { return new ReactiveMongoTemplate(reactiveMongoDbFactory(), mappingMongoConverter()); }