A few more Java 6 stragglers

JAVA-2996

Author: jyemin

driver-core/src/main/com/mongodb/connection/SslSettings.java

@@ -143,8 +143,6 @@ public Builder applyConnectionString(final ConnectionString connectionString) {
          * Create a new SSLSettings from the settings in this builder.
          *
          * @return a new SSL settings
-         * @throws com.mongodb.MongoInternalException if enabled is true, invalidHostNameAllowed is false, and the {@code "java.version"}
-         * system property starts with 1.6
          */
         public SslSettings build() {
             return new SslSettings(this);

driver-core/src/test/functional/com/mongodb/ClusterFixture.java

@@ -16,9 +16,7 @@
 
 package com.mongodb;
 
-import com.mongodb.internal.async.AsyncBatchCursor;
 import com.mongodb.async.FutureResultCallback;
-import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.connection.AsynchronousSocketChannelStreamFactory;
 import com.mongodb.connection.ClusterSettings;
 import com.mongodb.connection.ClusterType;
@@ -32,6 +30,8 @@
 import com.mongodb.connection.StreamFactory;
 import com.mongodb.connection.TlsChannelStreamFactoryFactory;
 import com.mongodb.connection.netty.NettyStreamFactory;
+import com.mongodb.internal.async.AsyncBatchCursor;
+import com.mongodb.internal.async.SingleResultCallback;
 import com.mongodb.internal.binding.AsyncClusterBinding;
 import com.mongodb.internal.binding.AsyncConnectionSource;
 import com.mongodb.internal.binding.AsyncReadBinding;
@@ -373,11 +373,7 @@ public static SslSettings getSslSettings() {
     }
 
     public static SslSettings getSslSettings(final ConnectionString connectionString) {
-        SslSettings.Builder builder = SslSettings.builder().applyConnectionString(connectionString);
-        if (System.getProperty("java.version").startsWith("1.6.")) {
-            builder.invalidHostNameAllowed(true);
-        }
-        return builder.build();
+        return SslSettings.builder().applyConnectionString(connectionString).build();
     }
 
     public static ServerAddress getPrimary() {

driver-core/src/test/functional/com/mongodb/internal/async/client/Fixture.java

@@ -16,7 +16,6 @@
 
 package com.mongodb.internal.async.client;
 
-import com.mongodb.Block;
 import com.mongodb.ClusterFixture;
 import com.mongodb.ConnectionString;
 import com.mongodb.MongoClientSettings;
@@ -26,7 +25,6 @@
 import com.mongodb.MongoTimeoutException;
 import com.mongodb.async.FutureResultCallback;
 import com.mongodb.connection.AsynchronousSocketChannelStreamFactoryFactory;
-import com.mongodb.connection.SslSettings;
 import com.mongodb.connection.StreamFactoryFactory;
 import com.mongodb.connection.TlsChannelStreamFactoryFactory;
 import org.bson.Document;
@@ -63,14 +61,6 @@ public static MongoClientSettings getMongoClientSettings() {
     public static com.mongodb.MongoClientSettings.Builder getMongoClientBuilderFromConnectionString() {
         com.mongodb.MongoClientSettings.Builder builder = com.mongodb.MongoClientSettings.builder()
                 .applyConnectionString(getConnectionString());
-        if (System.getProperty("java.version").startsWith("1.6.")) {
-            builder.applyToSslSettings(new Block<SslSettings.Builder>() {
-                @Override
-                public void apply(final SslSettings.Builder builder) {
-                    builder.invalidHostNameAllowed(true);
-                }
-            });
-        }
         builder.streamFactoryFactory(getStreamFactoryFactory());
         return builder;
     }

driver-legacy/src/test/functional/com/mongodb/Fixture.java

@@ -81,14 +81,7 @@ public static synchronized MongoClientURI getMongoClientURI() {
     }
 
     public static synchronized MongoClientURI getMongoClientURI(final MongoClientOptions.Builder builder) {
-        MongoClientURI mongoClientURI = null;
-        String mongoURIString = getMongoClientURIString();
-        if (System.getProperty("java.version").startsWith("1.6.")) {
-            builder.sslInvalidHostNameAllowed(true);
-        }
-
-        mongoClientURI = new MongoClientURI(mongoURIString, builder);
-        return mongoClientURI;
+        return new MongoClientURI(getMongoClientURIString(), builder);
     }
 
     public static MongoClientOptions getOptions() {

driver-sync/src/test/functional/com/mongodb/client/Fixture.java

@@ -24,7 +24,6 @@
 import com.mongodb.client.internal.MongoClientImpl;
 import com.mongodb.connection.ServerDescription;
 import com.mongodb.connection.ServerSettings;
-import com.mongodb.connection.SslSettings;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -93,14 +92,6 @@ public void apply(final ServerSettings.Builder builder) {
                             builder.minHeartbeatFrequency(MIN_HEARTBEAT_FREQUENCY_MS, TimeUnit.MILLISECONDS);
                         }
                     });
-            if (System.getProperty("java.version").startsWith("1.6.")) {
-                builder.applyToSslSettings(new Block<SslSettings.Builder>() {
-                    @Override
-                    public void apply(final SslSettings.Builder builder) {
-                        builder.invalidHostNameAllowed(true);
-                    }
-                });
-            }
             mongoClientSettings = builder.build();
         }
         return mongoClientSettings;

driver-sync/src/test/functional/com/mongodb/client/TransactionProseTest.java

@@ -20,7 +20,6 @@
 import com.mongodb.MongoClientSettings;
 import com.mongodb.MongoException;
 import com.mongodb.connection.SocketSettings;
-import com.mongodb.connection.SslSettings;
 import org.bson.Document;
 import org.junit.After;
 import org.junit.Before;
@@ -47,14 +46,6 @@ public void setUp() {
         assumeTrue(canRunTests());
         MongoClientSettings.Builder builder = MongoClientSettings.builder()
                 .applyConnectionString(getMultiMongosConnectionString());
-        if (System.getProperty("java.version").startsWith("1.6.")) {
-            builder.applyToSslSettings(new Block<SslSettings.Builder>() {
-                @Override
-                public void apply(final SslSettings.Builder builder) {
-                    builder.invalidHostNameAllowed(true);
-                }
-            });
-        }
 
         client = MongoClients.create(MongoClientSettings.builder(builder.build())
                 .applyToSocketSettings(new Block<SocketSettings.Builder>() {