Removed support for non-cursor-based listCollections and listIndexes command results, which was removed in 2.8.0-rc4.

 JAVA-1616

Author: jyemin

src/main/com/mongodb/DBApiLayer.java

@@ -149,27 +149,19 @@ public Set<String> getCollectionNames() {
         try {
             List<String> collectionNames = new ArrayList<String>();
             if (isServerVersionAtLeast(asList(2, 7, 7))) {
-                CommandResult res = command(new BasicDBObject("listCollections", getName()).append("cursor", new BasicDBObject()),
-                                            ReadPreference.primary());
+                CommandResult res = command(new BasicDBObject("listCollections", getName()), ReadPreference.primary());
                 if (!res.ok() && res.getCode() != 26) {
                     res.throwOnError();
                 } else {
-                    List<DBObject> collections = (List<DBObject>) res.get("collections");
-                    if (collections != null) {
-                        for (DBObject collectionInfo : collections) {
+                   QueryResultIterator iterator = new QueryResultIterator(res, getMongo(), 0, DefaultDBDecoder.FACTORY.create(),
+                                                                           res.getServerUsed());
+                    try {
+                        while (iterator.hasNext()) {
+                            DBObject collectionInfo = iterator.next();
                             collectionNames.add(collectionInfo.get("name").toString());
                         }
-                    } else {
-                        QueryResultIterator iterator = new QueryResultIterator(res, getMongo(), 0, DefaultDBDecoder.FACTORY.create(),
-                                                                               res.getServerUsed());
-                        try {
-                            while (iterator.hasNext()) {
-                                DBObject collectionInfo = iterator.next();
-                                collectionNames.add(collectionInfo.get("name").toString());
-                            }
-                        } finally {
-                            iterator.close();
-                        }
+                    } finally {
+                        iterator.close();
                     }
                 }
             } else {

src/main/com/mongodb/DBCollectionImpl.java

@@ -343,28 +343,21 @@ public List<DBObject> getIndexInfo() {
             List<DBObject> list = new ArrayList<DBObject>();
 
             if (db.isServerVersionAtLeast(asList(2, 7, 6))) {
-                CommandResult res = _db.command(new BasicDBObject("listIndexes", getName()).append("cursor", new BasicDBObject()),
-                                                ReadPreference.primary());
+                CommandResult res = _db.command(new BasicDBObject("listIndexes", getName()), ReadPreference.primary());
                 if (!res.ok() && res.getCode() == 26) {
                     return list;
                 }
                 res.throwOnError();
-                List<DBObject> indexes = (List<DBObject>) res.get("indexes");
-                if (indexes != null) {
-                    for (DBObject indexDocument : indexes) {
-                        list.add(indexDocument);
-                    }
-                } else {
-                    QueryResultIterator iterator = new QueryResultIterator(res, db.getMongo(), 0, DefaultDBDecoder.FACTORY.create(),
-                                                                           res.getServerUsed());
-                    try {
-                        while (iterator.hasNext()) {
-                            DBObject collectionInfo = iterator.next();
-                            list.add(collectionInfo);
-                        }
-                    } finally {
-                        iterator.close();
+
+                QueryResultIterator iterator = new QueryResultIterator(res, db.getMongo(), 0, DefaultDBDecoder.FACTORY.create(),
+                                                                       res.getServerUsed());
+                try {
+                    while (iterator.hasNext()) {
+                        DBObject collectionInfo = iterator.next();
+                        list.add(collectionInfo);
                     }
+                } finally {
+                    iterator.close();
                 }
             } else {
                 BasicDBObject cmd = new BasicDBObject("ns", getFullName());