Inject GridFS instance into GridFSFiles returned by getFileList methods.

Wraps returned DBCursor with GridFSCursor that uses _fix to inject GridFS instance into GridFSFiles returned by calling next().

Author: chacal

src/main/com/mongodb/gridfs/GridFS.java

@@ -26,15 +26,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.mongodb.*;
 import org.bson.types.ObjectId;
 
-import com.mongodb.BasicDBObject;
-import com.mongodb.BasicDBObjectBuilder;
-import com.mongodb.DB;
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
-
 /**
  *  Implementation of GridFS v1.0
  *
@@ -95,14 +89,25 @@ public GridFS(DB db, String bucket) {
     // ------ utils       -------
     // --------------------------
 
+    protected class GridFSCursor extends DBCursor {
+        public GridFSCursor(DBCollection collection , DBObject q , DBObject k, ReadPreference preference ){
+            super(collection, q, k, preference);
+        }
+
+        @Override
+        public DBObject next() throws MongoException {
+            DBObject obj = super.next();
+            return _fix(obj);
+        }
+    }
 
     /**
      * gets the list of files stored in this gridfs, sorted by filename
      *
      * @return cursor of file objects
      */
     public DBCursor getFileList(){
-        return _filesCollection.find().sort(new BasicDBObject("filename",1));
+        return new GridFSCursor(_filesCollection, new BasicDBObject(), null, null).sort(new BasicDBObject("filename", 1));
     }
 
     /**
@@ -112,7 +117,7 @@ public DBCursor getFileList(){
      * @return cursor of file objects
      */
     public DBCursor getFileList( DBObject query ){
-        return _filesCollection.find( query ).sort(new BasicDBObject("filename",1));
+        return new GridFSCursor(_filesCollection, query, null, null).sort(new BasicDBObject("filename", 1));
     }