JAVA-2387: Mongo.getAddressList returns the seed list, as per the documentation, instead of the list of discovered servers

jyemin · jyemin · commit 8a3cbc9d112f · 2016-11-18T08:46:38.000-05:00
diff --git a/driver-core/src/main/com/mongodb/connection/Cluster.java b/driver-core/src/main/com/mongodb/connection/Cluster.java
@@ -29,6 +29,14 @@
  */
 public interface Cluster extends Closeable{
 
+    /**
+     * Gets the cluster settings with which this cluster was created.
+     *
+     * @return the cluster settings
+     * @since 3.4
+     */
+    ClusterSettings getSettings();
+
     /**
      * Get the description of this cluster.  This method will not return normally until the cluster type is known.
      *
diff --git a/driver-core/src/test/unit/com/mongodb/connection/BaseClusterSpecification.groovy b/driver-core/src/test/unit/com/mongodb/connection/BaseClusterSpecification.groovy
@@ -49,6 +49,19 @@ class BaseClusterSpecification extends Specification {
     private final List<ServerAddress> allServers = [firstServer, secondServer, thirdServer]
     private final TestClusterableServerFactory factory = new TestClusterableServerFactory()
 
+    def 'should get cluster settings'() {
+        given:
+        def clusterSettings = builder().mode(MULTIPLE)
+                .hosts([firstServer, secondServer, thirdServer])
+                .serverSelectionTimeout(1, SECONDS)
+                .serverSelector(new ServerAddressSelector(firstServer))
+                .build()
+        def cluster = new MultiServerCluster(new ClusterId(), clusterSettings, factory)
+
+        expect:
+        cluster.getSettings() == clusterSettings
+    }
+
     def 'should compose server selector passed to selectServer with server selector in cluster settings'() {
         given:
         def cluster = new MultiServerCluster(new ClusterId(),
diff --git a/driver/src/main/com/mongodb/Mongo.java b/driver/src/main/com/mongodb/Mongo.java
@@ -390,8 +390,7 @@ public ReadPreference getReadPreference() {
      * @throws MongoException if there's a failure
      */
     public List<ServerAddress> getAllAddress() {
-        //TODO It should return the address list without auto-discovered nodes. Not sure if it's required. Maybe users confused with name.
-        return getServerAddressList();
+        return cluster.getSettings().getHosts();
     }
 
     /**
diff --git a/driver/src/test/unit/com/mongodb/MongoConstructorsTest.java b/driver/src/test/unit/com/mongodb/MongoConstructorsTest.java
@@ -22,10 +22,12 @@
 import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
 
 public class MongoConstructorsTest {
 
@@ -52,11 +54,18 @@ public void shouldUseGivenHost() throws UnknownHostException {
     }
 
     @Test
-    @Ignore
-    public void shouldUseGivenServerAddress() throws UnknownHostException {
-        Mongo mongo = new MongoClient(new ServerAddress("localhost"));
+    public void shouldGetSeedList() throws UnknownHostException {
+        List<ServerAddress> seedList = Arrays.asList(new ServerAddress("localhost"), new ServerAddress("localhost:27018"));
+        Mongo mongo = new MongoClient(seedList);
         try {
-            assertEquals(Arrays.asList(new ServerAddress("localhost")), mongo.getServerAddressList());
+            assertEquals(seedList, mongo.getAllAddress());
+            try {
+                mongo.getAllAddress().add(new ServerAddress("localhost:27019"));
+                fail("Address list modification should be unsupported");
+            } catch (UnsupportedOperationException e) {
+                // all good
+            }
+
         } finally {
             mongo.close();
         }

Original file line number	Diff line number	Diff line change
`@@ -390,8 +390,7 @@ public ReadPreference getReadPreference() {`
`390`	`390`	`* @throws MongoException if there's a failure`
`391`	`391`	`*/`
`392`	`392`	`public List<ServerAddress> getAllAddress() {`
`393`		`- //TODO It should return the address list without auto-discovered nodes. Not sure if it's required. Maybe users confused with name.`
`394`		`- return getServerAddressList();`
	`393`	`+ return cluster.getSettings().getHosts();`
`395`	`394`	`}`
`396`	`395`
`397`	`396`	`/**`