Count API updates

count() method deprecated
estimatedDocumentCount() methods added
documentCount() methods added

JAVA-2885

Author: rozza

docs/reference/content/driver-async/getting-started/quick-start-pojo.md

@@ -214,7 +214,7 @@ List<Person> people = asList(
 collection.insertMany(people, new SingleResultCallback<Void>() {
     @Override
     public void onResult(final Void result, final Throwable t) {
-        collection.count(new SingleResultCallback<Long>() {
+        collection.countDocuments(new SingleResultCallback<Long>() {
             @Override
             public void onResult(final Long count, final Throwable t) {
                 System.out.println("total # of people " + count);

docs/reference/content/driver-async/getting-started/quick-start.md

@@ -268,7 +268,7 @@ To count the number of documents in a collection, you can use the collection's [
 method.  The following code should print `101` (the 100 inserted via `insertMany` plus the 1 inserted via the `insertOne`).
 
 ```java
-collection.count(
+collection.countDocuments(
   new SingleResultCallback<Long>() {
       @Override
       public void onResult(final Long count, final Throwable t) {

docs/reference/content/driver-async/reference/observables.md

@@ -79,12 +79,12 @@ In the following example we print out the count of the number of documents in a
     Block<SingleResultCallback<Long>> operation = new Block<SingleResultCallback<Long>>() {
         @Override
         void apply(final SingleResultCallback<Long> callback) {
-            collection.count(callback);
+            collection.countDocuments(callback);
         }
     };
 
     // Or in Java 8 syntax:
-    operation = (Block<SingleResultCallback<Long>>) collection::count;
+    operation = (Block<SingleResultCallback<Long>>) collection::countDocuments;
 
     Observables.observe(operation).subscribe(new Observer<Long>(){
         @Override

docs/reference/content/driver-async/tutorials/text-search.md

@@ -79,7 +79,7 @@ To perform text search, use the [`Filters.text()`]({{<apiref "com/mongodb/client
 For example, the following code performs a text search on the `name` field for the word `"bakery"` or `"coffee"`.
 
 ```java
-collection.count(Filters.text("bakery coffee"), new SingleResultCallback<Long>()  {
+collection.countDocuments(Filters.text("bakery coffee"), new SingleResultCallback<Long>()  {
     @Override
     public void onResult(final Long count, final Throwable t) {
         System.out.println("Text search matches: " +count);
@@ -119,7 +119,7 @@ The  [`Filters.text()`]({{<apiref "com/mongodb/client/model/Filters.html#text-ja
 For example, the following text search specifies the [text search language]({{<docsref "reference/text-search-languages">}}) option when performing text search for the word `cafe`:
 
 ```java
-collection.count(Filters.text("cafe",
+collection.countDocuments(Filters.text("cafe",
       new TextSearchOptions().language("english")),
       new SingleResultCallback<Long>()  {
             @Override

docs/reference/content/driver/getting-started/quick-start.md

@@ -262,11 +262,11 @@ If no top-level `_id` field is specified in the document, MongoDB automatically
 
 ## Count Documents in A Collection
 
-To count the number of documents in a collection, you can use the collection's [`count()`]({{< apiref "com/mongodb/client/MongoCollection#count--">}})
+To count the number of documents in a collection, you can use the collection's [`countDocuments()`]({{< apiref "com/mongodb/client/MongoCollection#countDocuments--">}})
 method.  The following code should print `101` (the 100 inserted via `insertMany` plus the 1 inserted via the `insertOne`).
 
 ```java
-System.out.println(collection.count());
+System.out.println(collection.countDocuments());
 ```
 
 ## Query the Collection

docs/reference/content/driver/tutorials/text-search.md

@@ -78,7 +78,7 @@ To perform text search, use the [`Filters.text()`]({{<apiref "com/mongodb/client
 For example, the following code performs a text search on the `name` field for the word `"bakery"` or `"coffee"`.
 
 ```java
-long matchCount = collection.count(Filters.text("bakery coffee"));
+long matchCount = collection.countDocuments(Filters.text("bakery coffee"));
 System.out.println("Text search matches: " + matchCount);
 ```
 
@@ -112,7 +112,7 @@ The  [`Filters.text()`]({{<apiref "com/mongodb/client/model/Filters.html#text-ja
 For example, the following text search specifies the [text search language]({{<docsref "reference/text-search-languages">}}) option when performing text search for the word `cafe`:
 
 ```java
-long matchCountEnglish = collection.count(Filters.text("cafe", new TextSearchOptions().language("english")));
+long matchCountEnglish = collection.countDocuments(Filters.text("cafe", new TextSearchOptions().language("english")));
 System.out.println("Text search matches (english): " + matchCountEnglish);
 ```
 

driver-async/README.md

@@ -107,7 +107,7 @@ Example for Maven:
     final CountDownLatch countLatch = new CountDownLatch(1);
     final AtomicLong count = new AtomicLong();
     System.out.println("Counting the number of documents");
-    collection.count(new SingleResultCallback<Long>() {
+    collection.countDocuments(new SingleResultCallback<Long>() {
         @Override
         public void onResult(final Long result, final Throwable t) {
             count.set(result);

driver-async/src/examples/documentation/DocumentationSamples.java

@@ -162,7 +162,7 @@ public void onResult(final Void result, final Throwable t) {
         // End Example 3
 
         final CountDownLatch check2 = new CountDownLatch(1);
-        collection.count(new SingleResultCallback<Long>() {
+        collection.countDocuments(new SingleResultCallback<Long>() {
             @Override
             public void onResult(final Long result, final Throwable t) {
                 assertEquals(Long.valueOf(4), result);
@@ -194,7 +194,7 @@ public void onResult(final Void result, final Throwable t) {
         // End Example 6
 
         final CountDownLatch check1 = new CountDownLatch(1);
-        collection.count(new SingleResultCallback<Long>() {
+        collection.countDocuments(new SingleResultCallback<Long>() {
             @Override
             public void onResult(final Long result, final Throwable t) {
                 assertEquals(Long.valueOf(5), result);
@@ -327,7 +327,7 @@ public void onResult(final Void result, final Throwable t) {
         // End Example 14
 
         final CountDownLatch check1 = new CountDownLatch(1);
-        collection.count(new SingleResultCallback<Long>() {
+        collection.countDocuments(new SingleResultCallback<Long>() {
             @Override
             public void onResult(final Long result, final Throwable t) {
                 assertEquals(Long.valueOf(5), result);
@@ -434,7 +434,7 @@ public void onResult(final Void result, final Throwable t) {
         // End Example 20
 
         final CountDownLatch check1 = new CountDownLatch(1);
-        collection.count(new SingleResultCallback<Long>() {
+        collection.countDocuments(new SingleResultCallback<Long>() {
             @Override
             public void onResult(final Long result, final Throwable t) {
                 assertEquals(Long.valueOf(5), result);
@@ -553,7 +553,7 @@ public void onResult(final Void result, final Throwable t) {
         // End Example 29
 
         FutureResultCallback<Long> assertCountFuture = new FutureResultCallback<Long>();
-        collection.count(assertCountFuture);
+        collection.countDocuments(assertCountFuture);
         assertEquals(Long.valueOf(5), assertCountFuture.get(10, TimeUnit.SECONDS));
 
         //Start Example 30
@@ -664,7 +664,7 @@ public void onResult(final Void result, final Throwable t) {
         // End Example 38
 
         FutureResultCallback<Long> assertCountFuture = new FutureResultCallback<Long>();
-        collection.count(assertCountFuture);
+        collection.countDocuments(assertCountFuture);
         assertEquals(Long.valueOf(2), assertCountFuture.get(10, TimeUnit.SECONDS));
 
         //Start Example 39
@@ -725,7 +725,7 @@ public void onResult(final Void result, final Throwable t) {
         // End Example 42
 
         final CountDownLatch check1 = new CountDownLatch(1);
-        collection.count(new SingleResultCallback<Long>() {
+        collection.countDocuments(new SingleResultCallback<Long>() {
             @Override
             public void onResult(final Long result, final Throwable t) {
                 assertEquals(Long.valueOf(5), result);
@@ -879,7 +879,7 @@ public void onResult(final Void result, final Throwable t) {
         // End Example 51
 
         FutureResultCallback<Long> check1 = new FutureResultCallback<Long>();
-        collection.count(check1);
+        collection.countDocuments(check1);
         assertEquals(Long.valueOf(10), check1.get(10, TimeUnit.SECONDS));
 
         //Start Example 52
@@ -976,7 +976,7 @@ public void onResult(final Void result, final Throwable t) {
         // End Example 55
 
         FutureResultCallback<Long> check1 = new FutureResultCallback<Long>();
-        collection.count(check1);
+        collection.countDocuments(check1);
         assertEquals(Long.valueOf(5), check1.get(10, TimeUnit.SECONDS));
 
         //Start Example 57
@@ -991,7 +991,7 @@ public void onResult(final DeleteResult result, final Throwable t) {
         //End Example 57
 
         FutureResultCallback<Long> check2 = new FutureResultCallback<Long>();
-        collection.count(check2);
+        collection.countDocuments(check2);
         assertEquals(Long.valueOf(2), check2.get(10, TimeUnit.SECONDS));
 
         //Start Example 58
@@ -1006,7 +1006,7 @@ public void onResult(final DeleteResult result, final Throwable t) {
         //End Example 58
 
         FutureResultCallback<Long> check3 = new FutureResultCallback<Long>();
-        collection.count(check3);
+        collection.countDocuments(check3);
         assertEquals(Long.valueOf(1), check3.get(10, TimeUnit.SECONDS));
 
         //Start Example 56
@@ -1021,7 +1021,7 @@ public void onResult(final DeleteResult result, final Throwable t) {
         //End Example 56
 
         FutureResultCallback<Long> check4 = new FutureResultCallback<Long>();
-        collection.count(check4);
+        collection.countDocuments(check4);
         assertEquals(Long.valueOf(0), check4.get(10, TimeUnit.SECONDS));
     }
 

driver-async/src/examples/tour/PojoQuickTour.java

@@ -108,7 +108,7 @@ public void onResult(final Person person, final Throwable t) {
         collection.insertMany(people, new SingleResultCallback<Void>() {
             @Override
             public void onResult(final Void result, final Throwable t) {
-                collection.count(new SingleResultCallback<Long>() {
+                collection.countDocuments(new SingleResultCallback<Long>() {
                     @Override
                     public void onResult(final Long count, final Throwable t) {
                         System.out.println("total # of people " + count);

driver-async/src/examples/tour/QuickTour.java

@@ -123,7 +123,7 @@ public void onResult(final Document document, final Throwable t) {
         collection.insertMany(documents, new SingleResultCallback<Void>() {
             @Override
             public void onResult(final Void result, final Throwable t) {
-                collection.count(new SingleResultCallback<Long>() {
+                collection.countDocuments(new SingleResultCallback<Long>() {
                     @Override
                     public void onResult(final Long count, final Throwable t) {
                         System.out.println("total # of documents after inserting 100 small ones (should be 101) " + count);