From 7df9e932f751cdbe3a2e889aa6e31a3d29ca9056 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 28 Oct 2019 10:06:53 +0100 Subject: [PATCH] DATAMONGO-2390 - Polishing. Reformat code. Original pull request: #800. --- .../org/springframework/data/mongodb/core/MongoTemplate.java | 4 ++-- .../data/mongodb/core/ReactiveMongoTemplate.java | 2 +- .../data/mongodb/core/aggregation/AggregationOptions.java | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java index 9f9c33475..9c3b0d6b5 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java @@ -35,6 +35,7 @@ import org.bson.codecs.Codec; import org.bson.conversions.Bson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; 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.GeoResults; import org.springframework.data.geo.Metric; -import org.springframework.data.geo.Point; import org.springframework.data.mapping.PropertyPath; import org.springframework.data.mapping.PropertyReferenceException; import org.springframework.data.mapping.callback.EntityCallbacks; @@ -2188,7 +2188,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware, options.getComment().ifPresent(aggregateIterable::comment); - if(options.hasExecutionTimeLimit()) { + if (options.hasExecutionTimeLimit()) { aggregateIterable = aggregateIterable.maxTime(options.getMaxTime().toMillis(), TimeUnit.MILLISECONDS); } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java index 08e0410f3..a8944f347 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java @@ -1073,7 +1073,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati .map(Collation::toMongoCollation) // .ifPresent(cursor::collation); - if(options.hasExecutionTimeLimit()) { + if (options.hasExecutionTimeLimit()) { cursor = cursor.maxTime(options.getMaxTime().toMillis(), TimeUnit.MILLISECONDS); } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java index 1be08a387..149e9fc2c 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java @@ -277,6 +277,10 @@ public class AggregationOptions { return document; } + /** + * @return + * @since 2.3 + */ public boolean hasExecutionTimeLimit() { return !maxTime.isZero() && !maxTime.isNegative(); }