Changed signatures of aggregate and mapReduce to return TDocument iterables instead of Document, to be consistent with find

Author: jyemin

driver-async/src/main/com/mongodb/async/client/MongoCollection.java

@@ -201,7 +201,7 @@ public interface MongoCollection<TDocument> {
      * @return an iterable containing the result of the aggregation operation
      * @mongodb.driver.manual aggregation/ Aggregation
      */
-    AggregateIterable<Document> aggregate(List<? extends Bson> pipeline);
+    AggregateIterable<TDocument> aggregate(List<? extends Bson> pipeline);
 
     /**
      * Aggregates documents according to the specified aggregation pipeline.  If the pipeline ends with a $out stage, the returned
@@ -224,7 +224,7 @@ public interface MongoCollection<TDocument> {
      * @return an iterable containing the result of the map-reduce operation
      * @mongodb.driver.manual reference/command/mapReduce/ map-reduce
      */
-    MapReduceIterable<Document> mapReduce(String mapFunction, String reduceFunction);
+    MapReduceIterable<TDocument> mapReduce(String mapFunction, String reduceFunction);
 
     /**
      * Aggregates documents according to the specified map-reduce function.

driver-async/src/main/com/mongodb/async/client/MongoCollectionImpl.java

@@ -79,16 +79,16 @@
 
 class MongoCollectionImpl<TDocument> implements MongoCollection<TDocument> {
     private final MongoNamespace namespace;
-    private final Class<TDocument> clazz;
+    private final Class<TDocument> documentClass;
     private final ReadPreference readPreference;
     private final CodecRegistry codecRegistry;
     private final WriteConcern writeConcern;
     private final AsyncOperationExecutor executor;
 
-    MongoCollectionImpl(final MongoNamespace namespace, final Class<TDocument> clazz, final CodecRegistry codecRegistry,
+    MongoCollectionImpl(final MongoNamespace namespace, final Class<TDocument> documentClass, final CodecRegistry codecRegistry,
                         final ReadPreference readPreference, final WriteConcern writeConcern, final AsyncOperationExecutor executor) {
         this.namespace = notNull("namespace", namespace);
-        this.clazz = notNull("clazz", clazz);
+        this.documentClass = notNull("clazz", documentClass);
         this.codecRegistry = notNull("codecRegistry", codecRegistry);
         this.readPreference = notNull("readPreference", readPreference);
         this.writeConcern = notNull("writeConcern", writeConcern);
@@ -102,7 +102,7 @@ public MongoNamespace getNamespace() {
 
     @Override
     public Class<TDocument> getDocumentClass() {
-        return clazz;
+        return documentClass;
     }
 
     @Override
@@ -127,17 +127,17 @@ public <NewTDocument> MongoCollection<NewTDocument> withDocumentClass(final Clas
 
     @Override
     public MongoCollection<TDocument> withCodecRegistry(final CodecRegistry codecRegistry) {
-        return new MongoCollectionImpl<TDocument>(namespace, clazz, codecRegistry, readPreference, writeConcern, executor);
+        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, executor);
     }
 
     @Override
     public MongoCollection<TDocument> withReadPreference(final ReadPreference readPreference) {
-        return new MongoCollectionImpl<TDocument>(namespace, clazz, codecRegistry, readPreference, writeConcern, executor);
+        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, executor);
     }
 
     @Override
     public MongoCollection<TDocument> withWriteConcern(final WriteConcern writeConcern) {
-        return new MongoCollectionImpl<TDocument>(namespace, clazz, codecRegistry, readPreference, writeConcern, executor);
+        return new MongoCollectionImpl<TDocument>(namespace, documentClass, codecRegistry, readPreference, writeConcern, executor);
     }
 
     @Override
@@ -172,7 +172,7 @@ public <TResult> DistinctIterable<TResult> distinct(final String fieldName, fina
 
     @Override
     public FindIterable<TDocument> find() {
-        return find(new BsonDocument(), clazz);
+        return find(new BsonDocument(), documentClass);
     }
 
     @Override
@@ -182,7 +182,7 @@ public <TResult> FindIterable<TResult> find(final Class<TResult> clazz) {
 
     @Override
     public FindIterable<TDocument> find(final Bson filter) {
-        return find(filter, clazz);
+        return find(filter, documentClass);
     }
 
     @Override
@@ -191,8 +191,8 @@ public <TResult> FindIterable<TResult> find(final Bson filter, final Class<TResu
     }
 
     @Override
-    public AggregateIterable<Document> aggregate(final List<? extends Bson> pipeline) {
-        return aggregate(pipeline, Document.class);
+    public AggregateIterable<TDocument> aggregate(final List<? extends Bson> pipeline) {
+        return aggregate(pipeline, documentClass);
     }
 
     @Override
@@ -201,8 +201,8 @@ public <TResult> AggregateIterable<TResult> aggregate(final List<? extends Bson>
     }
 
     @Override
-    public MapReduceIterable<Document> mapReduce(final String mapFunction, final String reduceFunction) {
-        return mapReduce(mapFunction, reduceFunction, Document.class);
+    public MapReduceIterable<TDocument> mapReduce(final String mapFunction, final String reduceFunction) {
+        return mapReduce(mapFunction, reduceFunction, documentClass);
     }
 
     @Override
@@ -528,7 +528,7 @@ private UpdateResult toUpdateResult(final com.mongodb.bulk.BulkWriteResult resul
     }
 
     private Codec<TDocument> getCodec() {
-        return getCodec(clazz);
+        return getCodec(documentClass);
     }
 
     private <TResult> Codec<TResult> getCodec(final Class<TResult> clazz) {
@@ -540,6 +540,6 @@ private BsonDocument documentToBsonDocument(final TDocument document) {
     }
 
     private BsonDocument toBsonDocument(final Bson document) {
-        return document == null ? null : document.toBsonDocument(clazz, codecRegistry);
+        return document == null ? null : document.toBsonDocument(documentClass, codecRegistry);
     }
 }

driver/src/main/com/mongodb/MongoCollectionImpl.java

@@ -189,8 +189,8 @@ public <TResult> FindIterable<TResult> find(final Bson filter, final Class<TResu
     }
 
     @Override
-    public AggregateIterable<Document> aggregate(final List<? extends Bson> pipeline) {
-        return aggregate(pipeline, Document.class);
+    public AggregateIterable<TDocument> aggregate(final List<? extends Bson> pipeline) {
+        return aggregate(pipeline, documentClass);
     }
 
     @Override
@@ -200,8 +200,8 @@ public <TResult> AggregateIterable<TResult> aggregate(final List<? extends Bson>
     }
 
     @Override
-    public MapReduceIterable<Document> mapReduce(final String mapFunction, final String reduceFunction) {
-        return mapReduce(mapFunction, reduceFunction, Document.class);
+    public MapReduceIterable<TDocument> mapReduce(final String mapFunction, final String reduceFunction) {
+        return mapReduce(mapFunction, reduceFunction, documentClass);
     }
 
     @Override

driver/src/main/com/mongodb/client/MongoCollection.java

@@ -199,7 +199,7 @@ public interface MongoCollection<TDocument> {
      * @mongodb.driver.manual aggregation/ Aggregation
      * @mongodb.server.release 2.2
      */
-    AggregateIterable<Document> aggregate(List<? extends Bson> pipeline);
+    AggregateIterable<TDocument> aggregate(List<? extends Bson> pipeline);
 
     /**
      * Aggregates documents according to the specified aggregation pipeline.
@@ -221,7 +221,7 @@ public interface MongoCollection<TDocument> {
      * @return an iterable containing the result of the map-reduce operation
      * @mongodb.driver.manual reference/command/mapReduce/ map-reduce
      */
-    MapReduceIterable<Document> mapReduce(String mapFunction, String reduceFunction);
+    MapReduceIterable<TDocument> mapReduce(String mapFunction, String reduceFunction);
 
     /**
      * Aggregates documents according to the specified map-reduce function.