JAVA-428 - Support new ReadPreference semantics, deprecate SlaveOK

* Cull exceess overloaded methods specifically the ones with ReadPreference

Author: Brendan W. McAdams

src/main/com/mongodb/DBCollection.java

@@ -315,21 +315,9 @@ public final DBCursor find( DBObject query , DBObject fields , int numToSkip , i
      */
     public final DBObject findOne( Object obj )
         throws MongoException {
-        return findOne(obj, null, _readPref);
+        return findOne(obj, null);
     }
 
-    /**
-     * Finds an object by its id.
-     * This compares the passed in value to the _id field of the document
-     *
-     * @param obj any valid object
-     * @return the object, if found, otherwise <code>null</code>
-     * @throws MongoException
-     */
-    public final DBObject findOne( Object obj , ReadPreference readPref )
-            throws MongoException {
-        return findOne(obj, null, readPref);
-    }
 
     /**
      * Finds an object by its id.
@@ -341,20 +329,7 @@ public final DBObject findOne( Object obj , ReadPreference readPref )
      * @dochub find
      */
     public final DBObject findOne( Object obj, DBObject fields ) {
-        return findOne( obj, fields, _readPref );
-    }
-
-    /**
-     * Finds an object by its id.
-     * This compares the passed in value to the _id field of the document
-     *
-     * @param obj any valid object
-     * @param fields fields to return
-     * @return the object, if found, otherwise <code>null</code>
-     * @dochub find
-     */
-    public final DBObject findOne( Object obj, DBObject fields, ReadPreference readPref ) {
-        Iterator<DBObject> iterator = __find(new BasicDBObject("_id", obj), fields, 0, -1, 0, getOptions(), readPref, _decoderFactory.create() );
+        Iterator<DBObject> iterator = __find(new BasicDBObject("_id", obj), fields, 0, -1, 0, getOptions(), _readPref, _decoderFactory.create() );
         return (iterator != null ? iterator.next() : null);
     }
 
@@ -590,18 +565,7 @@ public void setHintFields( List<DBObject> lst ){
      * @dochub find
      */
     public final DBCursor find( DBObject ref ){
-        return find( ref, _readPref );
-    }
-
-    /**
-     * Queries for an object in this collection.
-     * @param ref object for which to search
-     * @param preference Read Preference for this write
-     * @return an iterator over the results
-     * @dochub find
-     */
-    public final DBCursor find( DBObject ref, ReadPreference preference ){
-        return new DBCursor( this, ref, null, preference );
+        return new DBCursor( this, ref, null, _readPref );
     }
 
     /**
@@ -628,52 +592,17 @@ public final DBCursor find( DBObject ref, ReadPreference preference ){
      * @dochub find
      */
     public final DBCursor find( DBObject ref , DBObject keys ){
-        return find( ref, keys, _readPref );
+        return new DBCursor( this, ref, keys, _readPref );
     }
 
-    /**
-     * Queries for an object in this collection.
-     *
-     * <p>
-     * An empty DBObject will match every document in the collection.
-     * Regardless of fields specified, the _id fields are always returned.
-     * </p>
-     * <p>
-     * An example that returns the "x" and "_id" fields for every document
-     * in the collection that has an "x" field:
-     * </p>
-     * <blockquote><pre>
-     * BasicDBObject keys = new BasicDBObject();
-     * keys.put("x", 1);
-     *
-     * DBCursor cursor = collection.find(new BasicDBObject(), keys);
-     * </pre></blockquote>
-     *
-     * @param ref object for which to search
-     * @param keys fields to return
-     * @return a cursor to iterate over results
-     * @dochub find
-     */
-    public final DBCursor find( DBObject ref , DBObject keys, ReadPreference readPref ){
-        return new DBCursor( this, ref, keys, readPref );
-    }
 
     /**
      * Queries for all objects in this collection.
      * @return a cursor which will iterate over every object
      * @dochub find
      */
     public final DBCursor find(){
-        return find( _readPref );
-    }
-
-    /**
-     * Queries for all objects in this collection.
-     * @return a cursor which will iterate over every object
-     * @dochub find
-     */
-    public final DBCursor find( ReadPreference readPref ){
-        return new DBCursor( this, new BasicDBObject(), null, readPref );
+        return new DBCursor( this, null, null, _readPref );
     }
 
     /**
@@ -686,16 +615,6 @@ public final DBObject findOne()
         return findOne( new BasicDBObject() );
     }
 
-    /**
-     * Returns a single object from this collection.
-     * @return the object found, or <code>null</code> if the collection is empty
-     * @throws MongoException
-     */
-    public final DBObject findOne( ReadPreference readPref )
-            throws MongoException {
-        return findOne( new BasicDBObject(), readPref );
-    }
-
     /**
      * Returns a single object from this collection matching the query.
      * @param o the query object
@@ -707,17 +626,6 @@ public final DBObject findOne( DBObject o )
         return findOne( o, null, _readPref );
     }
 
-    /**
-     * Returns a single object from this collection matching the query.
-     * @param o the query object
-     * @return the object found, or <code>null</code> if no such object exists
-     * @throws MongoException
-     */
-    public final DBObject findOne( DBObject o, ReadPreference readPref )
-            throws MongoException {
-        return findOne( o, null, readPref );
-    }
-
     /**
      * Returns a single object from this collection matching the query.
      * @param o the query object

src/test/com/mongodb/ReplSetTest.java

@@ -85,7 +85,7 @@ public static void main( String args[] )
         while ( true ){
             _sleep();
             try {
-                DBObject x = c.findOne(new BasicDBObject( "_id", 17 ),
+                DBObject x = c.findOne(new BasicDBObject( "_id", 17 ), null,
                                        ReadPreference.withTags( new BasicDBObject("dc", "proximacentauri") ));
                 System.out.println( x );
                 Integer n = (Integer) x.get( "x" );