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

DATAMONGO-2557 - Polishing.

Browse Source 
Inline methods.

Original pull request: #879.
This commit is contained in:
Mark Paluch
2020-07-27 09:01:47 +02:00
parent 0085c8063a
commit a44a0034b7
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
}
}

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

@@ -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<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 @@ public abstract class AbstractReactiveMongoQuery implements RepositoryQuery {
* @since 2.0.4
*/
protected abstract boolean isLimiting();
private static Mono<CodecRegistry> obtainCodecRegistry(MongoDatabase db) {
return Mono.justOrEmpty(db.getCodecRegistry());
}
}