Updated location of the examples

rozza · rozza · commit ed059eb2a538 · 2018-03-21T16:38:52.000Z
JAVA-2751
diff --git a/docs/reference/content/driver/getting-started/quick-start-pojo.md b/docs/reference/content/driver/getting-started/quick-start-pojo.md
@@ -13,7 +13,7 @@ title = "Quick Start - POJOs"
 {{% note %}}
 POJOs stands for Plain Old Java Objects.
 
-The following code snippets come from the [`PojoQuickTour.java`]({{< srcref "driver/src/examples/tour/PojoQuickTour.java">}}) example code
+The following code snippets come from the [`PojoQuickTour.java`]({{< srcref "driver-sync/src/examples/tour/PojoQuickTour.java">}}) example code
 that can be found with the driver source on github.
 {{% /note %}}
 
@@ -47,7 +47,7 @@ import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
 import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
 ```
 
-- The following POJO classes. The full source is available on github for the [Person]({{< srcref "driver/src/examples/tour/Person.java">}}) and [Address]({{< srcref "driver/src/examples/tour/Address.java">}})
+- The following POJO classes. The full source is available on github for the [Person]({{< srcref "driver-sync/src/examples/tour/Person.java">}}) and [Address]({{< srcref "driver-sync/src/examples/tour/Address.java">}})
 POJOs. Here are the main implementation details:
 
 ```java
diff --git a/docs/reference/content/driver/getting-started/quick-start.md b/docs/reference/content/driver/getting-started/quick-start.md
@@ -11,7 +11,7 @@ title = "Quick Start"
 # MongoDB Driver Quick Start
 
 {{% note %}}
-The following code snippets come from the [`QuickTour.java`]({{< srcref "driver/src/examples/tour/QuickTour.java">}}) example code
+The following code snippets come from the [`QuickTour.java`]({{< srcref "driver-sync/src/examples/tour/QuickTour.java">}}) example code
 that can be found with the driver source on github.
 {{% /note %}}
 
diff --git a/docs/reference/content/driver/tutorials/gridfs.md b/docs/reference/content/driver/tutorials/gridfs.md
@@ -15,7 +15,7 @@ pre = "<i class='fa'></i>"
 
 When you query a GridFS store for a file, the Java driver will reassemble the chunks as needed.
 
-The following code snippets come from the [`GridFSTour.java`]({{< srcref "driver/src/examples/gridfs/GridFSTour.java">}}) example code
+The following code snippets come from the [`GridFSTour.java`]({{< srcref "driver-sync/src/examples/gridfs/GridFSTour.java">}}) example code
 that can be found with the driver source on github.
 
 ## Prerequisites
diff --git a/driver-sync/src/examples/documentation/ChangeStreamSamples.java b/driver-sync/src/examples/documentation/ChangeStreamSamples.java
@@ -16,8 +16,8 @@
 
 package documentation;
 
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.MongoDatabase;
@@ -47,12 +47,11 @@ public final class ChangeStreamSamples {
     public static void main(final String[] args) {
         MongoClient mongoClient;
 
-        // Create a new MongoClient with a MongoDB URI string.
         if (args.length == 0) {
-            // Defaults to a localhost replicaset on ports: 27017, 27018, 27019
-            mongoClient = new MongoClient(new MongoClientURI("mongodb://localhost:27017,localhost:27018,localhost:27019"));
+            // connect to the local database server
+            mongoClient = MongoClients.create("mongodb://localhost:27017,localhost:27018,localhost:27019");
         } else {
-            mongoClient = new MongoClient(new MongoClientURI(args[0]));
+            mongoClient = MongoClients.create(args[0]);
         }
 
         // Select the MongoDB database.
diff --git a/driver-sync/src/examples/documentation/DocumentationSamples.java b/driver-sync/src/examples/documentation/DocumentationSamples.java
@@ -17,7 +17,7 @@
 package documentation;
 
 import com.mongodb.Block;
-import com.mongodb.DatabaseTestCase;
+import com.mongodb.client.DatabaseTestCase;
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoCursor;
@@ -39,8 +39,8 @@
 
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
-import static com.mongodb.Fixture.getDefaultDatabaseName;
-import static com.mongodb.Fixture.getMongoClient;
+import static com.mongodb.client.Fixture.getDefaultDatabaseName;
+import static com.mongodb.client.Fixture.getMongoClient;
 import static com.mongodb.client.model.Filters.all;
 import static com.mongodb.client.model.Filters.and;
 import static com.mongodb.client.model.Filters.elemMatch;
diff --git a/driver-sync/src/examples/gridfs/GridFSTour.java b/driver-sync/src/examples/gridfs/GridFSTour.java
@@ -17,8 +17,8 @@
 package gridfs;
 
 import com.mongodb.Block;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.gridfs.GridFSBucket;
 import com.mongodb.client.gridfs.GridFSBuckets;
@@ -56,9 +56,9 @@ public static void main(final String[] args) throws FileNotFoundException, IOExc
 
         if (args.length == 0) {
             // connect to the local database server
-            mongoClient = new MongoClient();
+            mongoClient = MongoClients.create();
         } else {
-            mongoClient = new MongoClient(new MongoClientURI(args[0]));
+            mongoClient = MongoClients.create(args[0]);
         }
 
         // get handle to "mydb" database
diff --git a/driver-sync/src/examples/gridfs/package-info.java b/driver-sync/src/examples/gridfs/package-info.java
diff --git a/driver-sync/src/examples/primer/AggregatePrimer.java b/driver-sync/src/examples/primer/AggregatePrimer.java
diff --git a/driver-sync/src/examples/primer/IndexesPrimer.java b/driver-sync/src/examples/primer/IndexesPrimer.java
@@ -16,7 +16,6 @@
 
 package primer;
 
-
 import org.junit.Test;
 
 // @imports: start
diff --git a/driver-sync/src/examples/primer/InsertPrimer.java b/driver-sync/src/examples/primer/InsertPrimer.java
diff --git a/driver-sync/src/examples/primer/PrimerTestCase.java b/driver-sync/src/examples/primer/PrimerTestCase.java
@@ -16,10 +16,10 @@
 
 package primer;
 
-import com.mongodb.DatabaseTestCase;
+import com.mongodb.client.DatabaseTestCase;
 import com.mongodb.client.MongoDatabase;
 
-import static com.mongodb.Fixture.getMongoClient;
+import static com.mongodb.client.Fixture.getMongoClient;
 
 public class PrimerTestCase extends DatabaseTestCase {
     MongoDatabase db = getDatabase();
diff --git a/driver-sync/src/examples/primer/QueryPrimer.java b/driver-sync/src/examples/primer/QueryPrimer.java
@@ -23,8 +23,13 @@
 import com.mongodb.Block;
 import com.mongodb.client.FindIterable;
 
-import static com.mongodb.client.model.Filters.*;
+import static com.mongodb.client.model.Filters.and;
+import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Filters.gt;
+import static com.mongodb.client.model.Filters.lt;
+import static com.mongodb.client.model.Filters.or;
 import static com.mongodb.client.model.Sorts.ascending;
+
 import static java.util.Arrays.asList;
 // @imports: end
 
diff --git a/driver-sync/src/examples/primer/RemovePrimer.java b/driver-sync/src/examples/primer/RemovePrimer.java
diff --git a/driver-sync/src/examples/primer/UpdatePrimer.java b/driver-sync/src/examples/primer/UpdatePrimer.java
@@ -17,6 +17,7 @@
 package primer;
 
 import org.junit.Test;
+
 // @import: start
 import org.bson.Document;
 
diff --git a/driver-sync/src/examples/tour/Address.java b/driver-sync/src/examples/tour/Address.java
diff --git a/driver-sync/src/examples/tour/Decimal128QuickTour.java b/driver-sync/src/examples/tour/Decimal128QuickTour.java
@@ -16,8 +16,8 @@
 
 package tour;
 
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Filters;
@@ -40,11 +40,12 @@ public static void main(final String[] args) {
 
         if (args.length == 0) {
             // connect to the local database server
-            mongoClient = new MongoClient();
+            mongoClient = MongoClients.create();
         } else {
-            mongoClient = new MongoClient(new MongoClientURI(args[0]));
+            mongoClient = MongoClients.create(args[0]);
         }
 
+
         // get handle to "mydb" database
         MongoDatabase database = mongoClient.getDatabase("mydb");
 
diff --git a/driver-sync/src/examples/tour/Person.java b/driver-sync/src/examples/tour/Person.java
diff --git a/driver-sync/src/examples/tour/PojoQuickTour.java b/driver-sync/src/examples/tour/PojoQuickTour.java
@@ -17,8 +17,9 @@
 package tour;
 
 import com.mongodb.Block;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.result.DeleteResult;
@@ -51,13 +52,13 @@ public static void main(final String[] args) {
 
         if (args.length == 0) {
             // connect to the local database server
-            mongoClient = new MongoClient();
+            mongoClient = MongoClients.create();
         } else {
-            mongoClient = new MongoClient(new MongoClientURI(args[0]));
+            mongoClient = MongoClients.create(args[0]);
         }
 
         // create codec registry for POJOs
-        CodecRegistry pojoCodecRegistry = fromRegistries(MongoClient.getDefaultCodecRegistry(),
+        CodecRegistry pojoCodecRegistry = fromRegistries(MongoClientSettings.getDefaultCodecRegistry(),
                 fromProviders(PojoCodecProvider.builder().automatic(true).build()));
 
         // get handle to "mydb" database
diff --git a/driver-sync/src/examples/tour/QuickTour.java b/driver-sync/src/examples/tour/QuickTour.java
@@ -17,8 +17,8 @@
 package tour;
 
 import com.mongodb.Block;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.MongoDatabase;
@@ -67,9 +67,9 @@ public static void main(final String[] args) {
 
         if (args.length == 0) {
             // connect to the local database server
-            mongoClient = new MongoClient();
+            mongoClient = MongoClients.create();
         } else {
-            mongoClient = new MongoClient(new MongoClientURI(args[0]));
+            mongoClient = MongoClients.create(args[0]);
         }
 
         // get handle to "mydb" database
diff --git a/driver-sync/src/examples/tour/QuickTourAdmin.java b/driver-sync/src/examples/tour/QuickTourAdmin.java
@@ -16,8 +16,8 @@
 
 package tour;
 
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.CreateCollectionOptions;
@@ -42,9 +42,9 @@ public static void main(final String[] args) {
 
         if (args.length == 0) {
             // connect to the local database server
-            mongoClient = new MongoClient();
+            mongoClient = MongoClients.create();
         } else {
-            mongoClient = new MongoClient(new MongoClientURI(args[0]));
+            mongoClient = MongoClients.create(args[0]);
         }
 
         // get handle to "mydb" database
diff --git a/driver-sync/src/examples/tour/package-info.java b/driver-sync/src/examples/tour/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2008-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This package contains the quick tour examples
+ */
+package tour;
