Skip to content

Commit 7df9e93

Browse files
committed
DATAMONGO-2390 - Polishing.
Reformat code. Original pull request: #800.
1 parent 5308e6c commit 7df9e93

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.bson.conversions.Bson;
3636
import org.slf4j.Logger;
3737
import org.slf4j.LoggerFactory;
38+
3839
import org.springframework.beans.BeansException;
3940
import org.springframework.context.ApplicationContext;
4041
import org.springframework.context.ApplicationContextAware;
@@ -53,7 +54,6 @@
5354
import org.springframework.data.geo.GeoResult;
5455
import org.springframework.data.geo.GeoResults;
5556
import org.springframework.data.geo.Metric;
56-
import org.springframework.data.geo.Point;
5757
import org.springframework.data.mapping.PropertyPath;
5858
import org.springframework.data.mapping.PropertyReferenceException;
5959
import org.springframework.data.mapping.callback.EntityCallbacks;
@@ -2188,7 +2188,7 @@ protected <O> AggregationResults<O> doAggregate(Aggregation aggregation, String
21882188

21892189
options.getComment().ifPresent(aggregateIterable::comment);
21902190

2191-
if(options.hasExecutionTimeLimit()) {
2191+
if (options.hasExecutionTimeLimit()) {
21922192
aggregateIterable = aggregateIterable.maxTime(options.getMaxTime().toMillis(), TimeUnit.MILLISECONDS);
21932193
}
21942194

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ private <O> Flux<O> aggregateAndMap(MongoCollection<Document> collection, List<D
10731073
.map(Collation::toMongoCollation) //
10741074
.ifPresent(cursor::collation);
10751075

1076-
if(options.hasExecutionTimeLimit()) {
1076+
if (options.hasExecutionTimeLimit()) {
10771077
cursor = cursor.maxTime(options.getMaxTime().toMillis(), TimeUnit.MILLISECONDS);
10781078
}
10791079

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

+4
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,10 @@ public Document toDocument() {
277277
return document;
278278
}
279279

280+
/**
281+
* @return
282+
* @since 2.3
283+
*/
280284
public boolean hasExecutionTimeLimit() {
281285
return !maxTime.isZero() && !maxTime.isNegative();
282286
}

0 commit comments

Comments
 (0)