JAVA-924: deprecate access to protected fields in gridfs

Author: trnl

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

@@ -243,6 +243,10 @@ public List<GridFSDBFile> find( DBObject query , DBObject sort){
         return files;
     }
 
+    /**
+     * @deprecated This method is NOT a part of public API and will be dropped in 3.x versions.
+     */
+    @Deprecated
     protected GridFSDBFile _fix( Object o ){
         if ( o == null )
             return null;
@@ -410,9 +414,47 @@ public DB getDB(){
         return _db;
     }
 
+    /**
+     * Gets the {@link DBCollection} in which the file’s metadata is stored.
+     *
+     * @return the collection
+     */
+    protected DBCollection getFilesCollection() {
+        return _filesCollection;
+    }
+
+    /**
+     * Gets the {@link DBCollection} in which the binary chunks are stored.
+     *
+     * @return the collection
+     */
+    protected DBCollection getChunksCollection() {
+        return _chunkCollection;
+    }
+
+
+    /**
+     * @deprecated Please use {@link #getDB()} for access.
+     */
+    @Deprecated
     protected final DB _db;
+
+    /**
+     * @deprecated Please use {@link #getBucketName()} for access.
+     */
+    @Deprecated
     protected final String _bucketName;
+
+    /**
+     * @deprecated Please use {@link #getFilesCollection()} for access.
+     */
+    @Deprecated
     protected final DBCollection _filesCollection;
+
+    /**
+     * @deprecated Please use {@link #getChunksCollection()} for access.
+     */
+    @Deprecated
     protected final DBCollection _chunkCollection;
 
 }

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

@@ -276,6 +276,15 @@ public String toString(){
         return JSON.serialize( this );
     }
 
+    /**
+     * Gets the GridFS associated with this file
+     *
+     * @return gridFS instance
+     */
+    protected GridFS getGridFS(){
+        return this._fs;
+    }
+
     /**
      * Sets the GridFS associated with this file
      * @param fs
@@ -284,6 +293,10 @@ protected void setGridFS( GridFS fs ){
         _fs = fs;
     }
 
+    /**
+     * @deprecated Please use {@link #getGridFS()} & {@link #setGridFS(GridFS)} instead.
+     */
+    @Deprecated
     protected GridFS _fs = null;
 
     Object _id;