JAVA-780: Made MongoClientURI constructor that takes a MongoClientOptions.Builder public

Author: jyemin

src/main/com/mongodb/MongoClientURI.java

@@ -159,7 +159,16 @@ public MongoClientURI(final String uri) {
         this(uri, new MongoClientOptions.Builder());
     }
 
-    MongoClientURI(String uri, MongoClientOptions.Builder builder) {
+    /**
+     * Creates a MongoURI from the given URI string, and MongoClientOptions.Builder.  The builder can be configured
+     * with default options, which may be overridden by options specified in the URI string.
+     *
+     * @param uri  the URI
+     * @param builder a Builder
+     * @see com.mongodb.MongoClientURI#getOptions()
+     * @since 2.11.0
+     */
+    public MongoClientURI(String uri, MongoClientOptions.Builder builder) {
         try {
             this.uri = uri;
             if (!uri.startsWith(PREFIX))

src/test/com/mongodb/MongoClientURITest.java

@@ -31,6 +31,11 @@ public void testUnsupportedOption() {
         new MongoClientURI("mongodb://localhost/?unknownOption=true");
     }
 
+    @Test
+    public void testURIGetter() {
+       assertEquals("mongodb://localhost", new MongoClientURI("mongodb://localhost").getURI());
+    }
+
     @Test
     public void testOptionsWithoutTrailingSlash() {
         try {
@@ -197,6 +202,14 @@ public void testOptions() {
         assertOnOptions(uMixed.getOptions());
     }
 
+    @Test
+    public void testBuilderOverrides() {
+        MongoClientURI uri = new MongoClientURI("mongodb://localhost/?maxPoolSize=150",
+                MongoClientOptions.builder().autoConnectRetry(true).connectionsPerHost(200));
+        assertTrue(uri.getOptions().isAutoConnectRetry());
+        assertEquals(150, uri.getOptions().getConnectionsPerHost());
+    }
+
     @Test()
     public void testURIDefaults() throws UnknownHostException {
         MongoClientURI uri = new MongoClientURI("mongodb://localhost");