Merge pull request #1 from jorge-imperial/atlas_connection

Allow connecting to Atlas environments using a flag in the properties…

Author: jorge-imperial

src/main/java/com/mongodb/examples/springdatabulkinsert/MongoConfig.java

@@ -24,25 +24,33 @@ public class MongoConfig   {
     @Value("${truststore.pwd}")
     private String trustStorePwd;
 
+    @Value("${mongodb.atlas}")
+    private boolean atlas;
+
     @Bean
     public MongoClient mongo() {
 
         ConnectionString connectionString = new ConnectionString(uri);
 
-        SSLFactory sslFactory = SSLFactory.builder()
-                .withTrustMaterial(Paths.get(trustStorePath), trustStorePwd.toCharArray())
-                .build();
-
-        SSLContext sslContext = sslFactory.getSslContext();
-        MongoClientSettings mongoClientSettings = MongoClientSettings.builder()
-                .applyConnectionString(connectionString)
-                .applyToSslSettings(builder -> {
-                    builder.context(sslContext);
-                    builder.invalidHostNameAllowed(true);
-                    builder.enabled(true);
+            MongoClientSettings mongoClientSettings = MongoClientSettings.builder()
+                    .applyConnectionString(connectionString)
+                    .applyToSslSettings(builder -> {
+
+                        if (!atlas) {
+                            // Use SSLContext if a trustStore has been provided
+                            if (!trustStorePath.isEmpty()) {
+                                SSLFactory sslFactory = SSLFactory.builder()
+                                        .withTrustMaterial(Paths.get(trustStorePath), trustStorePwd.toCharArray())
+                                        .build();
+                                SSLContext sslContext = sslFactory.getSslContext();
+                                builder.context(sslContext);
+                                builder.invalidHostNameAllowed(true);
+                            }
+                        }
+                        builder.enabled(true);
+                    })
+                    .build();
 
-                })
-                .build();
 
         return MongoClients.create(mongoClientSettings);
     }

src/main/resources/application.properties

@@ -1,6 +1,10 @@
 
 mongodb.database=bulk
-mongodb.uri=mongodb://root:[email protected]:37017,m02.mdbkrb5.net:37017,m03.mdbkrb5.net:37017/admin?authMechanism=SCRAM-SHA-1&authSource=admin&tls=true
+
+#mongodb.uri=mongodb://root:[email protected]:37017,m02.mdbkrb5.net:37017,m03.mdbkrb5.net:37017/admin?authMechanism=SCRAM-SHA-1&authSource=admin&tls=true
+
+mongodb.uri=mongodb+srv://root:[email protected]/?retryWrites=true&w=majority
+mongodb.atlas=1
 
 truststore.path=/etc/ssl/truststore.jks
 truststore.pwd=P4ssw0rd