From a4a03b01648904af8c98696db2cf7fb6a018f6bb Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Thu, 14 Jun 2012 12:36:42 +0200 Subject: [PATCH] DATAMONGO-450 - Log output uses mapped query for debug logging. --- .../data/mongodb/core/MongoTemplate.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 f29125f44..438829518 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 @@ -1338,13 +1338,15 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware { updateObj.put(key, mongoConverter.convertToMongoType(updateObj.get(key))); } + DBObject mappedQuery = mapper.getMappedObject(query, entity); + if (LOGGER.isDebugEnabled()) { - LOGGER.debug("findAndModify using query: " + query + " fields: " + fields + " sort: " + sort + " for class: " - + entityClass + " and update: " + updateObj + " in collection: " + collectionName); + LOGGER.debug("findAndModify using query: " + mappedQuery + " fields: " + fields + " sort: " + sort + + " for class: " + entityClass + " and update: " + updateObj + " in collection: " + collectionName); } - return executeFindOneInternal(new FindAndModifyCallback(mapper.getMappedObject(query, entity), fields, sort, - updateObj, options), new ReadDbObjectCallback(readerToUse, entityClass), collectionName); + return executeFindOneInternal(new FindAndModifyCallback(mappedQuery, fields, sort, updateObj, options), + new ReadDbObjectCallback(readerToUse, entityClass), collectionName); } /**