JAVA-2399 Update Docs: Monitoring + Check of Other Pages

kay-kim · jyemin · commit 4d549da3a45d · 2016-12-14T11:18:32.000-05:00
diff --git a/docs/reference/content/driver-async/tutorials/authentication.md b/docs/reference/content/driver-async/tutorials/authentication.md
@@ -156,10 +156,15 @@ String user;     // The x.509 certificate derived user name, e.g. "CN=user,OU=Or
 MongoCredential credential = MongoCredential.createMongoX509Credential(user);
 ClusterSettings clusterSettings = ClusterSettings.builder()
                                   .hosts(asList(new ServerAddress("localhost"))).build();
+
+EventLoopGroup eventLoopGroup = new NioEventLoopGroup();  // make sure application shuts this down
+
 MongoClientSettings settings = MongoClientSettings.builder()
-                                  .clusterSettings(clusterSettings)
-                                  .credentialList(Arrays.asList(credential))
-                                  .build();
+                .clusterSettings(clusterSettings)
+                .credentialList(Arrays.asList(credential))
+                .streamFactoryFactory(NettyStreamFactoryFactory.builder().eventLoopGroup(eventLoopGroup).build())
+                .sslSettings(SslSettings.builder().enabled(true).build())
+                .build();
 MongoClient mongoClient = MongoClients.create(settings);
 ```
 
@@ -168,7 +173,7 @@ Or use a `ConnectionString` instance that explicitly specifies the
 
 ```java
 MongoClient mongoClient = MongoClients.create(new ConnectionString(
-            "mongodb://subjectName@host1/?authMechanism=MONGODB-X509"));
+            "mongodb://subjectName@host1/?authMechanism=MONGODB-X509&streamType=netty&ssl=true"));
 ```
 
 See the MongoDB server
@@ -202,7 +207,7 @@ Or use a `ConnectionString` that explicitly specifies the
 
 ```java
 MongoClient mongoClient = MongoClients.create(new ConnectionString(
-            "mongodb://username%40MYREALM.com@host1/?authMechanism=GSSAPI"));
+            "mongodb://username%40MYREALM.ME@host1/?authMechanism=GSSAPI"));
 ```
 
 {{% note %}}
diff --git a/docs/reference/content/driver-async/tutorials/connect-to-mongodb.md b/docs/reference/content/driver-async/tutorials/connect-to-mongodb.md
@@ -113,7 +113,7 @@ MongoDB will auto-discover the primary and the secondaries.
 
       ```java
       MongoClient mongoClient = MongoClients.create(
-                  ConnectionString("mongodb://host1:27017,host2:27017,host3:27017"));
+            new ConnectionString("mongodb://host1:27017,host2:27017,host3:27017"));
       ```
 
   - Specify at least one member of the replica set and the replica set name:
diff --git a/docs/reference/content/driver-async/tutorials/geospatial-search.md b/docs/reference/content/driver-async/tutorials/geospatial-search.md
@@ -19,6 +19,19 @@ To support geospatial queries, MongoDB provides various geospatial indexes as we
 
 - Include the following import statements:
 
+```java
+import com.mongodb.Block;
+import com.mongodb.async.SingleResultCallback;
+import com.mongodb.async.client.MongoClient;
+import com.mongodb.async.client.MongoClients;
+import com.mongodb.async.client.MongoCollection;
+import com.mongodb.async.client.MongoDatabase;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.Indexes;
+import com.mongodb.client.model.geojson.Point;
+import com.mongodb.client.model.geojson.Position;
+import org.bson.Document;
+```
 
 
 - Include the following callback code which the examples in the tutorials will use:
diff --git a/docs/reference/content/driver-async/tutorials/gridfs.md b/docs/reference/content/driver-async/tutorials/gridfs.md
@@ -59,7 +59,7 @@ import static com.mongodb.async.client.gridfs.helpers.AsynchronousChannelHelper.
 import com.mongodb.async.SingleResultCallback;
 
 import com.mongodb.Block;
-
+import static com.mongodb.client.model.Filters.eq;
 import java.nio.charset.StandardCharsets;
 import java.nio.ByteBuffer;
 import java.nio.file.Path;
@@ -269,6 +269,8 @@ If you should need to rename a file, then use the [`rename`]({{< apiref "com/mon
 The following example renames a file to "mongodbTutorial":
 
 ```java
+ObjectId fileId; // The id of a file uploaded to GridFS, initialize to valid file id 
+...
 gridFSBucket.rename(fileId, "mongodbTutorial", new SingleResultCallback<Void>() {
     @Override
     public void onResult(final Void result, final Throwable t) {
@@ -290,6 +292,8 @@ To delete a file from the `GridFSBucket` use the [`delete`]({{< apiref "com/mong
 The following example deletes a file from the `GridFSBucket`:
 
 ```java
+ObjectId fileId; // The id of a file uploaded to GridFS, initialize to valid file id 
+...
 gridFSBucket.delete(fileId, new SingleResultCallback<Void>() {
     @Override
     public void onResult(final Void result, final Throwable t) {
diff --git a/docs/reference/content/driver-async/tutorials/ssl.md b/docs/reference/content/driver-async/tutorials/ssl.md
@@ -39,12 +39,16 @@ You can also specify the connection string via the [`ConnectionString`]({{< apir
 To specify TLS/SSL with  [`MongoClientSettings`]({{< apiref "com/mongodb/async/client/MongoClientSettings.Builder.html#streamFactoryFactory-com.mongodb.connection.StreamFactoryFactory-">}}) , set the ``sslEnabled`` property to ``true``, and the stream factory to [`NettyStreamFactoryFactory`]({{< apiref "com/mongodb/connection/netty/NettyStreamFactoryFactory" >}}), as in
 
 ```java
+
+EventLoopGroup eventLoopGroup = new NioEventLoopGroup();  // make sure application shuts this down
+
+
 MongoClient client = MongoClients.create(MongoClientSettings.builder()
                         .clusterSettings(ClusterSettings.builder()
                                           .hosts(Arrays.asList(new ServerAddress()))
                                           .build())
                         .streamFactoryFactory(NettyStreamFactoryFactory.builder()
-                                          .build())
+                                          .eventLoopGroup(eventLoopGroup).build())
                         .sslSettings(SslSettings.builder()
                                           .enabled(true)
                                           .build())
@@ -75,6 +79,9 @@ If your application must run on Java 6, or for some other reason you need
 to disable host name verification, you must explicitly indicate this using the `invalidHostNameAllowed` property:
 
 ```java
+
+EventLoopGroup eventLoopGroup = new NioEventLoopGroup();  // make sure application shuts this down
+
 MongoClient client = MongoClients.create(MongoClientSettings.builder()
                                                  .clusterSettings(ClusterSettings.builder()
                                                                           .hosts(Arrays.asList(new ServerAddress()))
@@ -83,7 +90,8 @@ MongoClient client = MongoClients.create(MongoClientSettings.builder()
                                                                        .enabled(true)
                                                                        .invalidHostNameAllowed(true)
                                                                        .build())
-                                                  .streamFactoryFactory(NettyStreamFactoryFactory.builder().build())
+                                                  .streamFactoryFactory(NettyStreamFactoryFactory.builder()
+                                                                            .eventLoopGroup(eventLoopGroup).build())
                                                   .build());
 ```
 
diff --git a/docs/reference/content/driver/getting-started/quick-start.md b/docs/reference/content/driver/getting-started/quick-start.md
@@ -32,6 +32,8 @@ import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.MongoCollection;
 
 import org.bson.Document;
+import java.util.Arrays;
+import com.mongodb.Block;
 
 import com.mongodb.client.MongoCursor;
 import static com.mongodb.client.model.Filters.*;
@@ -356,8 +358,6 @@ The following example increments the value of ``i`` by ``100`` for all documents
 UpdateResult updateResult = collection.updateMany(lt("i", 100), inc("i", 100));
 System.out.println(updateResult.getModifiedCount());
 
-UpdateResult updateResult = collection.updateMany(lt("i", 100), new Document("$inc", new Document("i", 100))); System.out.println(updateResult.getModifiedCount());
-
 ```
 
 ## Delete Documents
diff --git a/docs/reference/content/driver/tutorials/aggregation.md b/docs/reference/content/driver/tutorials/aggregation.md
@@ -27,6 +27,8 @@ The [aggregation pipeline]({{<docsref "/core/aggregation-pipeline">}}) is a fram
      import com.mongodb.client.model.Accumulators;
      import com.mongodb.client.model.Projections;
      import com.mongodb.client.model.Filters;
+     
+     import org.bson.Document;
      ```
 
 - Include the following code which the examples in the tutorials will use to print the results of the aggregation:
diff --git a/docs/reference/content/driver/tutorials/authentication.md b/docs/reference/content/driver/tutorials/authentication.md
@@ -137,16 +137,18 @@ create a credential of this type use the
 String user;     // The X.509 certificate derived user name, e.g. "CN=user,OU=OrgUnit,O=myOrg,..."
 // ...
 MongoCredential credential = MongoCredential.createMongoX509Credential(user);
+MongoClientOptions options = MongoClientOptions.builder().sslEnabled(true).build();
+
 
 MongoClient mongoClient = new MongoClient(new ServerAddress("host1", 27017),
-                                         Arrays.asList(credential));
+                                         Arrays.asList(credential), options);
 ```
 
 Or use a connection string that explicitly specifies the
 `authMechanism=MONGODB-X509`:
 
 ```java
-MongoClientURI uri = new MongoClientURI("mongodb://subjectName@host1/?authMechanism=MONGODB-X509");
+MongoClientURI uri = new MongoClientURI("mongodb://subjectName@host1/?authMechanism=MONGODB-X509&ssl=true");
 MongoClient mongoClient = new MongoClient(uri);
 ```
 
@@ -171,7 +173,7 @@ Or use a connection string that explicitly specifies the
 `authMechanism=GSSAPI`:
 
 ```java
-MongoClientURI uri = new MongoClientURI("mongodb://username%40REALM.com@host1/?authMechanism=GSSAPI");
+MongoClientURI uri = new MongoClientURI("mongodb://username%40REALM.ME@host1/?authMechanism=GSSAPI");
 ```
 {{%note%}}
 
diff --git a/docs/reference/content/driver/tutorials/connect-to-mongodb.md b/docs/reference/content/driver/tutorials/connect-to-mongodb.md
@@ -31,7 +31,8 @@ MongoClient constructors, see
     import com.mongodb.MongoClient;
     import com.mongodb.MongoClientURI;
     import com.mongodb.ServerAddress;
-    import com.mongodb.MongoCredential
+    import com.mongodb.MongoCredential;
+    import com.mongodb.MongoClientOptions;
 
     import java.util.Arrays;
     ```
diff --git a/docs/reference/content/driver/tutorials/geospatial-search.md b/docs/reference/content/driver/tutorials/geospatial-search.md
@@ -19,6 +19,7 @@ To support geospatial queries, MongoDB provides various geospatial indexes as we
 - Include the following import statements:
 
      ```java
+     import com.mongodb.Block;
      import com.mongodb.MongoClient;
      import com.mongodb.client.MongoCollection;
      import com.mongodb.client.MongoDatabase;
diff --git a/docs/reference/content/driver/tutorials/gridfs.md b/docs/reference/content/driver/tutorials/gridfs.md
@@ -28,10 +28,12 @@ import com.mongodb.MongoClient;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.gridfs.*;
 import com.mongodb.client.gridfs.model.*;
-
+import org.bson.Document;
+import org.bson.types.ObjectId;
 import java.io.*;
 import java.nio.file.Files;
 import java.nio.charset.StandardCharsets;
+import static com.mongodb.client.model.Filters.eq;
 ```
 
 ## Connect to a MongoDB Deployment
@@ -95,7 +97,7 @@ try {
 
     ObjectId fileId = gridFSBucket.uploadFromStream("mongodb-tutorial", streamToUploadFrom, options);
 } catch (FileNotFoundException e){
-    System.out.println(e.getMessage());
+   // handle exception
 }
 ```
 
@@ -109,17 +111,19 @@ The following example uploads into a `GridFSBucket` via the returned `GridFSUplo
 
 ```java
 try {
-    GridFSUploadStream uploadStream = gridFSBucketFiles.openUploadStream("mongodb-tutorial-2", options);
+    GridFSUploadOptions options = new GridFSUploadOptions()
+                       .chunkSizeBytes(358400)
+                       .metadata(new Document("type", "presentation"));
+
+    GridFSUploadStream uploadStream = gridFSFilesBucket.openUploadStream("mongodb-tutorial-2", options);
     byte[] data = Files.readAllBytes(new File("/tmp/MongoDB-manual-master.pdf").toPath());
 
     uploadStream.write(data);
     uploadStream.close();
-    System.out.println("The fileId of the uploaded file is: " + uploadStream.getFileId().toHexString());
+    System.out.println("The fileId of the uploaded file is: " + uploadStream.getObjectId().toHexString());
 
-} catch (FileNotFoundException e1){
-    System.out.println(e1.getMessage());
-} catch(IOException e2){
-    System.out.println(e2.getMessage());
+} catch(IOException e){
+    // handle exception
 }
 ```
 
@@ -162,21 +166,33 @@ following example downloads a file by its file `_id` into the provided
 `OutputStream`:
 
 ```java
-FileOutputStream streamToDownloadTo = new FileOutputStream("/tmp/mongodb-tutorial.pdf");
-gridFSBucket.downloadToStream(fileId, streamToDownloadTo);
-streamToDownloadTo.close();
-System.out.println(streamToDownloadTo.toString());
+ObjectId fileId; //The id of a file uploaded to GridFS, initialize to valid file id 
+
+try {
+    FileOutputStream streamToDownloadTo = new FileOutputStream("/tmp/mongodb-tutorial.pdf");
+    gridFSBucket.downloadToStream(fileId, streamToDownloadTo);
+    streamToDownloadTo.close();
+    System.out.println(streamToDownloadTo.toString());
+} catch (IOException e) {
+    // handle exception
+}
+
 ```
 
 If you don't know the `_id` of the file but know the filename, then you can pass the filename to the [`downloadToStream`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.html#downloadToStream-java.lang.String-java.io.OutputStream-com.mongodb.client.gridfs.model.GridFSDownloadOptions-" >}}) method. By default, it will download the latest version of the file. Use the [`GridFSDownloadOptions`]({{< apiref "com/mongodb/client/gridfs/model/GridFSDownloadOptions.html" >}}) to configure which version to download.
 
 The following example downloads the original version of the file named "mongodb-tutorial" into the `OutputStream`:
 
 ```java
-FileOutputStream streamToDownloadTo = new FileOutputStream("/tmp/mongodb-tutorial.pdf");
-GridFSDownloadOptions downloadOptions = new GridFSDownloadOptions().revision(0);
-gridFSBucket.downloadToStream("mongodb-tutorial", streamToDownloadTo, downloadOptions);
-streamToDownloadTo.close();   
+try {
+    FileOutputStream streamToDownloadTo = new FileOutputStream("/tmp/mongodb-tutorial.pdf");
+    GridFSDownloadOptions downloadOptions = new GridFSDownloadOptions().revision(0);
+    gridFSBucket.downloadToStream("mongodb-tutorial", streamToDownloadTo, downloadOptions);
+    streamToDownloadTo.close();
+} catch (IOException e) {
+   // handle exception
+}
+
 ```
 
 ### OpenDownloadStream
@@ -187,6 +203,8 @@ The [`openDownloadStream`]({{< apiref "com/mongodb/client/gridfs/GridFSBucket.ht
 The following example reads from the `GridFSBucket` via the returned `InputStream`:
 
 ```java
+ObjectId fileId; //The id of a file uploaded to GridFS, initialize to valid file id 
+
 GridFSDownloadStream downloadStream = gridFSBucket.openDownloadStream(fileId);
 int fileLength = (int) downloadStream.getGridFSFile().getLength();
 byte[] bytesToWriteTo = new byte[fileLength];
@@ -217,6 +235,8 @@ If you should need to rename a file, then use the [`rename`]({{< apiref "com/mon
 The following example renames a file to "mongodbTutorial":
 
 ```java
+ObjectId fileId; //ObjectId of a file uploaded to GridFS
+
 gridFSBucket.rename(fileId, "mongodbTutorial");
 ```
 
@@ -233,5 +253,7 @@ To delete a file from the `GridFSBucket` use the [`delete`]({{< apiref "com/mong
 The following example deletes a file from the `GridFSBucket`:
 
 ```java
+ObjectId fileId; //ObjectId of a file uploaded to GridFS
+
 gridFSBucket.delete(fileId);
 ```
diff --git a/docs/reference/content/driver/tutorials/indexes.md b/docs/reference/content/driver/tutorials/indexes.md
@@ -31,7 +31,7 @@ MongoDB only creates an index if an index of the same specification does not alr
      import com.mongodb.client.MongoCollection;
      import org.bson.Document;
 
-     import com.mongodb.client.model.Indexes.;
+     import com.mongodb.client.model.Indexes;
      import com.mongodb.client.model.IndexOptions;
      import com.mongodb.client.model.Filters;
      ```
diff --git a/docs/reference/content/driver/tutorials/perform-write-operations.md b/docs/reference/content/driver/tutorials/perform-write-operations.md
@@ -212,7 +212,7 @@ See also [Update a Document](#update-a-single-document).
 With the [`replaceOne`]({{< apiref "com/mongodb/client/MongoCollection.html#replaceOne-org.bson.conversions.Bson-TDocument-">}}), you can include an [`UpdateOptions`]({{<apiref "com/mongodb/client/model/UpdateOptions.html">}}) document to specify the [`upsert`]({{<docsref "reference/method/db.collection.update/#upsert-option">}}) option or the [`bypassDocumentationValidation`]({{<docsref "core/document-validation/#bypass-document-validation">}}) option.
 
 ```java
-results = collection.replaceOne(
+collection.replaceOne(
                 eq("name", "Orange Patisserie and Gelateria"),
                 new Document("stars", 5)
                         .append("contact", "TBD")
diff --git a/docs/reference/content/driver/tutorials/text-search.md b/docs/reference/content/driver/tutorials/text-search.md
@@ -21,6 +21,7 @@ The Java driver provides the [`Filters.text()`]({{<apiref "com/mongodb/client/mo
 - Include the following import statements:
 
      ```java
+     import com.mongodb.Block;
      import com.mongodb.MongoClient;
      import com.mongodb.client.MongoCollection;
      import com.mongodb.client.MongoDatabase;
@@ -29,6 +30,7 @@ The Java driver provides the [`Filters.text()`]({{<apiref "com/mongodb/client/mo
      import com.mongodb.client.model.Filters;
      import com.mongodb.client.model.Sorts;
      import com.mongodb.client.model.TextSearchOptions;
+     import com.mongodb.client.model.Projections;
      import org.bson.Document;
      ```
 
