DATAMONGO-2148 - Polishing.

Add author tag. Add logging for ReactiveMongoTemplate.count(…) and findDistinct(…) operations. Fix variable names.

Original pull request: #620.

Author: mp911de

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

@@ -150,6 +150,7 @@
  * @author Borislav Rangelov
  * @author duozhilin
  * @author Andreas Zink
+ * @author Cimon Lucas
  */
 @SuppressWarnings("deprecation")
 public class MongoTemplate implements MongoOperations, ApplicationContextAware, IndexOperationsProvider {
@@ -875,6 +876,11 @@ public <T> List<T> findDistinct(Query query, String field, String collectionName
 
 		MongoIterable<?> result = execute(collectionName, (collection) -> {
 
+			if (LOGGER.isDebugEnabled()) {
+				LOGGER.debug("Executing findDistinct using query {} for field: {} in collection: {}",
+						serializeToJsonSafely(mappedQuery), field, collectionName);
+			}
+
 			DistinctIterable<T> iterable = collection.distinct(mappedFieldName, mappedQuery, mongoDriverCompatibleType);
 
 			return query.getCollation().map(Collation::toMongoCollation).map(iterable::collation).orElse(iterable);

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

@@ -496,11 +496,10 @@ public <T> Flux<T> execute(ReactiveSessionCallback<T> action, Consumer<ClientSes
 						session.startTransaction();
 					}
 
-					return Flux
-							.usingWhen(Mono.just(session), //
-									s -> ReactiveMongoTemplate.this.withSession(action, s), //
-									ClientSession::commitTransaction, //
-									ClientSession::abortTransaction) //
+					return Flux.usingWhen(Mono.just(session), //
+							s -> ReactiveMongoTemplate.this.withSession(action, s), //
+							ClientSession::commitTransaction, //
+							ClientSession::abortTransaction) //
 							.doFinally(signalType -> doFinally.accept(session));
 				});
 			}
@@ -742,18 +741,22 @@ public Mono<Boolean> exists(Query query, String collectionName) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#exists(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
 	 */
-	public Mono<Boolean> exists(final Query query, @Nullable Class<?> entityClass, String collectionName) {
+	public Mono<Boolean> exists(Query query, @Nullable Class<?> entityClass, String collectionName) {
 
 		if (query == null) {
 			throw new InvalidDataAccessApiUsageException("Query passed in to exist can't be null");
 		}
 
 		return createFlux(collectionName, collection -> {
 
-			Document mappedQuery = queryMapper.getMappedObject(query.getQueryObject(), getPersistentEntity(entityClass));
-			FindPublisher<Document> findPublisher = collection.find(mappedQuery, Document.class)
+			Document filter = queryMapper.getMappedObject(query.getQueryObject(), getPersistentEntity(entityClass));
+			FindPublisher<Document> findPublisher = collection.find(filter, Document.class)
 					.projection(new Document("_id", 1));
 
+			if (LOGGER.isDebugEnabled()) {
+				LOGGER.debug("exists: {} in collection: {}", serializeToJsonSafely(filter), collectionName);
+			}
+
 			findPublisher = query.getCollation().map(Collation::toMongoCollation).map(findPublisher::collation)
 					.orElse(findPublisher);
 
@@ -835,6 +838,11 @@ public <T> Flux<T> findDistinct(Query query, String field, String collectionName
 
 		Flux<?> result = execute(collectionName, collection -> {
 
+			if (LOGGER.isDebugEnabled()) {
+				LOGGER.debug("Executing findDistinct using query {} for field: {} in collection: {}",
+						serializeToJsonSafely(mappedQuery), field, collectionName);
+			}
+
 			DistinctPublisher<T> publisher = collection.distinct(mappedFieldName, mappedQuery, mongoDriverCompatibleType);
 
 			return query.getCollation().map(Collation::toMongoCollation).map(publisher::collation).orElse(publisher);
@@ -1151,7 +1159,7 @@ public Mono<Long> count(Query query, @Nullable Class<?> entityClass, String coll
 
 		return createMono(collectionName, collection -> {
 
-			final Document Document = query == null ? null
+			Document filter = query == null ? null
 					: queryMapper.getMappedObject(query.getQueryObject(),
 							entityClass == null ? null : mappingContext.getPersistentEntity(entityClass));
 
@@ -1160,7 +1168,11 @@ public Mono<Long> count(Query query, @Nullable Class<?> entityClass, String coll
 				query.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
 			}
 
-			return collection.count(Document, options);
+			if (LOGGER.isDebugEnabled()) {
+				LOGGER.debug("Executing count: {} in collection: {}", serializeToJsonSafely(filter), collectionName);
+			}
+
+			return collection.count(filter, options);
 		});
 	}
 
@@ -3165,7 +3177,7 @@ public Mono<Long> count(Query query, @Nullable Class<?> entityClass, String coll
 
 			return createMono(collectionName, collection -> {
 
-				final Document Document = query == null ? null
+				Document filter = query == null ? null
 						: delegate.queryMapper.getMappedObject(query.getQueryObject(),
 								entityClass == null ? null : delegate.mappingContext.getPersistentEntity(entityClass));
 
@@ -3174,7 +3186,11 @@ public Mono<Long> count(Query query, @Nullable Class<?> entityClass, String coll
 					query.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
 				}
 
-				return collection.countDocuments(Document, options);
+				if (LOGGER.isDebugEnabled()) {
+					LOGGER.debug("Executing count: {} in collection: {}", serializeToJsonSafely(filter), collectionName);
+				}
+
+				return collection.countDocuments(filter, options);
 			});
 		}
 	}

spring-data-mongodb/src/test/resources/logback.xml

@@ -7,14 +7,14 @@
 		</encoder>
 	</appender>
 
-	<!-- 
+	<!--
 	<logger name="org.springframework" level="debug" />
 	 -->
-	 
-	 <logger name="org.springframework.data.mongodb.core.aggregation" level="debug" />
+
+	<logger name="org.springframework.data.mongodb.core" level="error"/>
 
 	<root level="error">
 		<appender-ref ref="console" />
 	</root>
 
-</configuration>
+</configuration>