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

DATAMONGO-2390 - Polishing.

Browse Source 
Reformat code.

Original pull request: #800.
This commit is contained in:
Mark Paluch
2019-10-28 10:06:53 +01:00
parent 5308e6c37f
commit 7df9e932f7
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
View File

@@ -35,6 +35,7 @@ import org.bson.codecs.Codec;
import org.bson.conversions.Bson; import org.bson.conversions.Bson;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
@@ -53,7 +54,6 @@ import org.springframework.data.geo.Distance;
import org.springframework.data.geo.GeoResult; import org.springframework.data.geo.GeoResult;
import org.springframework.data.geo.GeoResults; import org.springframework.data.geo.GeoResults;
import org.springframework.data.geo.Metric; import org.springframework.data.geo.Metric;
import org.springframework.data.geo.Point;
import org.springframework.data.mapping.PropertyPath; import org.springframework.data.mapping.PropertyPath;
import org.springframework.data.mapping.PropertyReferenceException; import org.springframework.data.mapping.PropertyReferenceException;
import org.springframework.data.mapping.callback.EntityCallbacks; import org.springframework.data.mapping.callback.EntityCallbacks;
@@ -2188,7 +2188,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
options.getComment().ifPresent(aggregateIterable::comment); options.getComment().ifPresent(aggregateIterable::comment);
if(options.hasExecutionTimeLimit()) { if (options.hasExecutionTimeLimit()) {
aggregateIterable = aggregateIterable.maxTime(options.getMaxTime().toMillis(), TimeUnit.MILLISECONDS); aggregateIterable = aggregateIterable.maxTime(options.getMaxTime().toMillis(), TimeUnit.MILLISECONDS);
} }

2
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java
View File

@@ -1073,7 +1073,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
.map(Collation::toMongoCollation) // .map(Collation::toMongoCollation) //
.ifPresent(cursor::collation); .ifPresent(cursor::collation);
if(options.hasExecutionTimeLimit()) { if (options.hasExecutionTimeLimit()) {
cursor = cursor.maxTime(options.getMaxTime().toMillis(), TimeUnit.MILLISECONDS); cursor = cursor.maxTime(options.getMaxTime().toMillis(), TimeUnit.MILLISECONDS);
} }

4
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java
View File

@@ -277,6 +277,10 @@ public class AggregationOptions {
return document; return document;
} }
/**
* @return
* @since 2.3
*/
public boolean hasExecutionTimeLimit() { public boolean hasExecutionTimeLimit() {
return !maxTime.isZero() && !maxTime.isNegative(); return !maxTime.isZero() && !maxTime.isNegative();
} }