In order to avoid equality testing issues when passed ServerAddress subclass instances, construct new ServerAddress instances in ClusterSettings.Builder.hosts method.

 JAVA-1814

Author: jyemin

src/main/com/mongodb/ClusterSettings.java

@@ -18,10 +18,12 @@
 
 import org.bson.util.annotations.Immutable;
 
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 import static org.bson.util.Assertions.isTrueArgument;
 import static org.bson.util.Assertions.notNull;
@@ -65,7 +67,15 @@ public Builder hosts(final List<ServerAddress> hosts) {
             if (hosts.isEmpty()) {
                 throw new IllegalArgumentException("hosts list may not be empty");
             }
-            this.hosts = Collections.unmodifiableList(new ArrayList<ServerAddress>(new LinkedHashSet<ServerAddress>(hosts)));
+            Set<ServerAddress> hostsSet = new LinkedHashSet<ServerAddress>(hosts.size());
+            for (ServerAddress host : hosts) {
+                try {
+                    hostsSet.add(new ServerAddress(host.getHost(), host.getPort()));
+                } catch (UnknownHostException e) {
+                    throw new MongoInternalException("This can't happen", e);
+                }
+            }
+            this.hosts = Collections.unmodifiableList(new ArrayList<ServerAddress>(hostsSet));
             return this;
         }
 
@@ -231,4 +241,4 @@ else if (builder.requiredClusterType != ClusterType.ReplicaSet) {
         requiredReplicaSetName = builder.requiredReplicaSetName;
         requiredClusterType = builder.requiredClusterType;
     }
-}
+}

src/test/com/mongodb/ClusterSettingsSpecification.groovy

@@ -110,4 +110,13 @@ class ClusterSettingsSpecification extends Specification {
         then:
         settings.getHosts() == [new ServerAddress('server1'), new ServerAddress('server2')]
     }
+
+    def 'should replace ServerAddress subclass instances with ServerAddress'() {
+        when:
+        def settings = ClusterSettings.builder().hosts([new DBAddress('server1/mydb'),
+                                                        new DBAddress('server2/mydb')]).build();
+
+        then:
+        settings.getHosts() == [new ServerAddress('server1'), new ServerAddress('server2')]
+    }
 }