correct ipv6 address handling when building MongoClients

fixes JIRA-2245

Author: Justin Lee

driver-core/src/main/com/mongodb/ServerAddress.java

@@ -109,7 +109,7 @@ public ServerAddress(final String host, final int port) {
                 }
                 portToUse = Integer.parseInt(host.substring(portIdx + 2));
             }
-            hostToUse = host.substring(1, idx);
+            hostToUse = host.substring(0, idx + 1);
         } else {
             int idx = hostToUse.indexOf(":");
             if (idx > 0) {
@@ -129,6 +129,16 @@ public ServerAddress(final String host, final int port) {
         this.port = portToUse;
     }
 
+    private String join(final String delimiter, final String[] array, final int start, final int end) {
+        StringBuilder builder = new StringBuilder();
+        for (int i = start; i <= end; i++) {
+            builder.append(array[i]);
+            if (i < end) {
+                builder.append(delimiter);
+            }
+        }
+        return builder.toString();
+    }
     @Override
     public boolean equals(final Object o) {
         if (this == o) {

driver-core/src/test/unit/com/mongodb/ServerAddressSpecification.groovy

@@ -29,18 +29,18 @@ class ServerAddressSpecification extends Specification {
 
         where:
         address                                                 | host                           | port
-        new ServerAddress()                                     | ServerAddress.defaultHost() | ServerAddress.defaultPort()
+        new ServerAddress()                                     | ServerAddress.defaultHost()    | ServerAddress.defaultPort()
         new ServerAddress('10.0.0.1:1000')                      | '10.0.0.1'                     | 1000
         new ServerAddress('10.0.0.1')                           | '10.0.0.1'                     | ServerAddress.defaultPort()
         new ServerAddress('10.0.0.1', 1000)                     | '10.0.0.1'                     | 1000
         new ServerAddress('somewhere')                          | 'somewhere'                    | ServerAddress.defaultPort()
         new ServerAddress('SOMEWHERE')                          | 'somewhere'                    | ServerAddress.defaultPort()
         new ServerAddress('somewhere:1000')                     | 'somewhere'                    | 1000
         new ServerAddress('somewhere', 1000)                    | 'somewhere'                    | 1000
-        new ServerAddress('[2010:836b:4179::836b:4179]')        | '2010:836b:4179::836b:4179'    | ServerAddress.defaultPort()
-        new ServerAddress('[2010:836B:4179::836B:4179]')        | '2010:836b:4179::836b:4179'    | ServerAddress.defaultPort()
-        new ServerAddress('[2010:836B:4179::836B:4179]:1000')   | '2010:836b:4179::836b:4179'    | 1000
-        new ServerAddress('[2010:836B:4179::836B:4179]', 1000)  | '2010:836b:4179::836b:4179'    | 1000
+        new ServerAddress('[2010:836b:4179::836b:4179]')        | '[2010:836b:4179::836b:4179]'  | ServerAddress.defaultPort()
+        new ServerAddress('[2010:836B:4179::836B:4179]')        | '[2010:836b:4179::836b:4179]'  | ServerAddress.defaultPort()
+        new ServerAddress('[2010:836B:4179::836B:4179]:1000')   | '[2010:836b:4179::836b:4179]'  | 1000
+        new ServerAddress('[2010:836B:4179::836B:4179]', 1000)  | '[2010:836b:4179::836b:4179]'  | 1000
     }
 
     def 'ipv4 host with a port specified should throw when a port is also specified as an argument'() {

driver-core/src/test/unit/com/mongodb/connection/JMXConnectionPoolListenerSpecification.groovy

@@ -120,7 +120,7 @@ class JMXConnectionPoolListenerSpecification extends Specification {
         ObjectName objectName = new ObjectName(beanName)
 
         then:
-        objectName.toString() == "org.mongodb.driver:type=ConnectionPool,clusterId=${serverId.clusterId.value},host=\"::1\",port=27017"
+        objectName.toString() == "org.mongodb.driver:type=ConnectionPool,clusterId=${serverId.clusterId.value},host=\"[::1]\",port=27017"
     }
 
     def 'should include the description in the object name if set'() {