From a44a0034b7faab6921eef6877b6d77f0ddaa4cac Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 27 Jul 2020 09:01:47 +0200 Subject: [PATCH] DATAMONGO-2557 - Polishing. Inline methods. Original pull request: #879. --- .../data/mongodb/repository/query/AbstractMongoQuery.java | 6 +----- .../repository/query/AbstractReactiveMongoQuery.java | 8 ++------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java index e74e7d64b..376ba31b9 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java @@ -234,7 +234,7 @@ public abstract class AbstractMongoQuery implements RepositoryQuery { * @since 2.4 */ protected CodecRegistry getCodecRegistry() { - return operations.execute(AbstractMongoQuery::obtainCodecRegistry); + return operations.execute(MongoDatabase::getCodecRegistry); } /** @@ -275,8 +275,4 @@ public abstract class AbstractMongoQuery implements RepositoryQuery { * @since 2.0.4 */ protected abstract boolean isLimiting(); - - private static CodecRegistry obtainCodecRegistry(MongoDatabase db) { - return db.getCodecRegistry(); - } } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java index aba7a46c2..c451cfce7 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java @@ -20,6 +20,7 @@ import reactor.core.publisher.Mono; import org.bson.Document; import org.bson.codecs.configuration.CodecRegistry; import org.reactivestreams.Publisher; + import org.springframework.core.convert.converter.Converter; import org.springframework.data.mapping.model.EntityInstantiators; import org.springframework.data.mapping.model.SpELExpressionEvaluator; @@ -44,7 +45,6 @@ import org.springframework.lang.Nullable; import org.springframework.util.Assert; import com.mongodb.MongoClientSettings; -import com.mongodb.reactivestreams.client.MongoDatabase; /** * Base class for reactive {@link RepositoryQuery} implementations for MongoDB. @@ -286,7 +286,7 @@ public abstract class AbstractReactiveMongoQuery implements RepositoryQuery { */ protected Mono getCodecRegistry() { - return Mono.from(operations.execute(AbstractReactiveMongoQuery::obtainCodecRegistry)) + return Mono.from(operations.execute(db -> Mono.just(db.getCodecRegistry()))) .defaultIfEmpty(MongoClientSettings.getDefaultCodecRegistry()); } @@ -328,8 +328,4 @@ public abstract class AbstractReactiveMongoQuery implements RepositoryQuery { * @since 2.0.4 */ protected abstract boolean isLimiting(); - - private static Mono obtainCodecRegistry(MongoDatabase db) { - return Mono.justOrEmpty(db.getCodecRegistry()); - } }