| 
29 | 29 | import org.apache.commons.logging.LogFactory;  | 
30 | 30 | import org.bson.Document;  | 
31 | 31 | import org.bson.conversions.Bson;  | 
32 |  | - | 
33 | 32 | import org.springframework.beans.BeansException;  | 
34 | 33 | import org.springframework.context.ApplicationContext;  | 
35 | 34 | import org.springframework.context.ApplicationContextAware;  | 
 | 
68 | 67 | import org.springframework.data.mongodb.core.aggregation.AggregationOptions;  | 
69 | 68 | import org.springframework.data.mongodb.core.aggregation.AggregationResults;  | 
70 | 69 | import org.springframework.data.mongodb.core.aggregation.TypedAggregation;  | 
71 |  | -import org.springframework.data.mongodb.core.convert.DbRefResolver;  | 
72 |  | -import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;  | 
73 |  | -import org.springframework.data.mongodb.core.convert.JsonSchemaMapper;  | 
74 |  | -import org.springframework.data.mongodb.core.convert.MappingMongoConverter;  | 
75 |  | -import org.springframework.data.mongodb.core.convert.MongoConverter;  | 
76 |  | -import org.springframework.data.mongodb.core.convert.MongoCustomConversions;  | 
77 |  | -import org.springframework.data.mongodb.core.convert.MongoJsonSchemaMapper;  | 
78 |  | -import org.springframework.data.mongodb.core.convert.MongoWriter;  | 
79 |  | -import org.springframework.data.mongodb.core.convert.QueryMapper;  | 
80 |  | -import org.springframework.data.mongodb.core.convert.UpdateMapper;  | 
 | 70 | +import org.springframework.data.mongodb.core.convert.*;  | 
81 | 71 | import org.springframework.data.mongodb.core.index.IndexOperations;  | 
82 | 72 | import org.springframework.data.mongodb.core.index.IndexOperationsProvider;  | 
83 | 73 | import org.springframework.data.mongodb.core.index.MongoMappingEventPublisher;  | 
 | 
118 | 108 | import com.mongodb.MongoException;  | 
119 | 109 | import com.mongodb.ReadPreference;  | 
120 | 110 | import com.mongodb.WriteConcern;  | 
121 |  | -import com.mongodb.client.AggregateIterable;  | 
122 |  | -import com.mongodb.client.ClientSession;  | 
123 |  | -import com.mongodb.client.DistinctIterable;  | 
124 |  | -import com.mongodb.client.FindIterable;  | 
125 |  | -import com.mongodb.client.MapReduceIterable;  | 
126 |  | -import com.mongodb.client.MongoClient;  | 
127 |  | -import com.mongodb.client.MongoCollection;  | 
128 |  | -import com.mongodb.client.MongoCursor;  | 
129 |  | -import com.mongodb.client.MongoDatabase;  | 
130 |  | -import com.mongodb.client.MongoIterable;  | 
 | 111 | +import com.mongodb.client.*;  | 
131 | 112 | import com.mongodb.client.model.*;  | 
132 | 113 | import com.mongodb.client.result.DeleteResult;  | 
133 | 114 | import com.mongodb.client.result.UpdateResult;  | 
@@ -3077,13 +3058,6 @@ public Document doInCollection(MongoCollection<Document> collection) throws Mong  | 
3077 | 3058 | 
 
  | 
3078 | 3059 | 			FindIterable<Document> iterable = cursorPreparer.initiateFind(collection, col -> col.find(query, Document.class));  | 
3079 | 3060 | 
 
  | 
3080 |  | -			if (LOGGER.isDebugEnabled()) {  | 
3081 |  | - | 
3082 |  | -				LOGGER.debug(String.format("findOne using query: %s fields: %s in db.collection: %s",  | 
3083 |  | -						serializeToJsonSafely(query), serializeToJsonSafely(fields.orElseGet(Document::new)),  | 
3084 |  | -						collection.getNamespace() != null ? collection.getNamespace().getFullName() : "n/a"));  | 
3085 |  | -			}  | 
3086 |  | - | 
3087 | 3061 | 			if (fields.isPresent()) {  | 
3088 | 3062 | 				iterable = iterable.projection(fields.get());  | 
3089 | 3063 | 			}  | 
 | 
0 commit comments