DATAMONGO-2557 - Polishing.

Inline methods.

Original pull request: #879.

Author: mp911de

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java

@@ -234,7 +234,7 @@ protected SpELExpressionEvaluator getSpELExpressionEvaluatorFor(ExpressionDepend
 	 * @since 2.4
 	 */
 	protected CodecRegistry getCodecRegistry() {
-		return operations.execute(AbstractMongoQuery::obtainCodecRegistry);
+		return operations.execute(MongoDatabase::getCodecRegistry);
 	}
 
 	/**
@@ -275,8 +275,4 @@ protected CodecRegistry getCodecRegistry() {
 	 * @since 2.0.4
 	 */
 	protected abstract boolean isLimiting();
-
-	private static CodecRegistry obtainCodecRegistry(MongoDatabase db) {
-		return db.getCodecRegistry();
-	}
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java

@@ -20,6 +20,7 @@
 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.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 @@ protected Mono<SpELExpressionEvaluator> getSpelEvaluatorFor(ExpressionDependenci
 	 */
 	protected Mono<CodecRegistry> 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 @@ protected Mono<CodecRegistry> getCodecRegistry() {
 	 * @since 2.0.4
 	 */
 	protected abstract boolean isLimiting();
-
-	private static Mono<CodecRegistry> obtainCodecRegistry(MongoDatabase db) {
-		return Mono.justOrEmpty(db.getCodecRegistry());
-	}
 }