DATAMONGO-1158 - Add config option for credentials to mongo-client.

We now reject mongo-options configuration when using mongo-java-driver generation 3 and above.

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOptionsFactoryBean.java

@@ -32,8 +32,9 @@
  * @author Mike Saavedra
  * @author Thomas Darimont
  * @author Christoph Strobl
+ * @deprecated since 1.7. Please use {@link MongoClientOptionsFactoryBean} instead.
  */
-@SuppressWarnings("deprecation")
+@Deprecated
 public class MongoOptionsFactoryBean implements FactoryBean<MongoOptions>, InitializingBean {
 
 	private static final MongoOptions DEFAULT_MONGO_OPTIONS = new MongoOptions();
@@ -216,6 +217,12 @@ public void setSslSocketFactory(SSLSocketFactory sslSocketFactory) {
 	 */
 	public void afterPropertiesSet() {
 
+		if (MongoClientVersion.isMongo3Driver()) {
+			throw new IllegalArgumentException(
+					String
+							.format("Usage of 'mongo-options' is no longer supported for mongo-java-driver version 3 and above. Please use 'mongo-client-options' and refer to chapter 'MongoDB 3.0 Support' for details."));
+		}
+
 		MongoOptions options = new MongoOptions();
 
 		options.setConnectionsPerHost(connectionsPerHost);
@@ -233,12 +240,9 @@ public void afterPropertiesSet() {
 			options.setSocketFactory(sslSocketFactory != null ? sslSocketFactory : SSLSocketFactory.getDefault());
 		}
 
-		if (!MongoClientVersion.isMongo3Driver()) {
-
-			ReflectiveMongoOptionsInvoker.setAutoConnectRetry(options, autoConnectRetry);
-			ReflectiveMongoOptionsInvoker.setMaxAutoConnectRetryTime(options, maxAutoConnectRetryTime);
-			ReflectiveMongoOptionsInvoker.setSlaveOk(options, slaveOk);
-		}
+		ReflectiveMongoOptionsInvoker.setAutoConnectRetry(options, autoConnectRetry);
+		ReflectiveMongoOptionsInvoker.setMaxAutoConnectRetryTime(options, maxAutoConnectRetryTime);
+		ReflectiveMongoOptionsInvoker.setSlaveOk(options, slaveOk);
 
 		this.options = options;
 	}
@@ -266,4 +270,5 @@ public Class<?> getObjectType() {
 	public boolean isSingleton() {
 		return true;
 	}
+
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoDbFactoryParserIntegrationTests.java

@@ -21,6 +21,7 @@
 import static org.springframework.data.mongodb.MongoClientVersion.*;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
@@ -47,13 +48,18 @@
  * Integration tests for {@link MongoDbFactoryParser}.
  * 
  * @author Oliver Gierke
- * @auhtor Christoph Strobl
+ * @author Christoph Strobl
  */
 public class MongoDbFactoryParserIntegrationTests {
 
 	DefaultListableBeanFactory factory;
 	BeanDefinitionReader reader;
 
+	@BeforeClass
+	public static void validateMongoDriver() {
+		assumeFalse(isMongo3Driver());
+	}
+
 	@Before
 	public void setUp() {
 		factory = new DefaultListableBeanFactory();
@@ -136,8 +142,6 @@ public void createsDbFactoryBean() {
 	@Test
 	public void parsesMaxAutoConnectRetryTimeCorrectly() {
 
-		assumeFalse(isMongo3Driver());
-
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/db-factory-bean.xml"));
 		Mongo mongo = factory.getBean(Mongo.class);
 		assertThat(ReflectiveMongoOptionsInvokerTestUtil.getMaxAutoConnectRetryTime(mongo.getMongoOptions()), is(27L));

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoNamespaceTests.java

@@ -16,11 +16,13 @@
 package org.springframework.data.mongodb.config;
 
 import static org.junit.Assert.*;
+import static org.junit.Assume.*;
 import static org.springframework.data.mongodb.MongoClientVersion.*;
 import static org.springframework.test.util.ReflectionTestUtils.*;
 
 import javax.net.ssl.SSLSocketFactory;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +56,11 @@ public class MongoNamespaceTests {
 
 	@Autowired ApplicationContext ctx;
 
+	@BeforeClass
+	public static void validateMongoDriver() {
+		assumeFalse(isMongo3Driver());
+	}
+
 	@Test
 	public void testMongoSingleton() throws Exception {
 
@@ -251,12 +258,8 @@ public void testMongoSingletonWithPropertyPlaceHolders() throws Exception {
 		assertEquals(0, mongoOpts.getWriteConcern().getWtimeout());
 		assertEquals(true, mongoOpts.getWriteConcern().fsync());
 
-		if (!isMongo3Driver()) {
-			assertEquals(true, mongoOpts.fsync);
-			assertEquals(true, ReflectiveMongoOptionsInvokerTestUtil.getAutoConnectRetry(mongoOpts));
-			assertEquals(true, ReflectiveMongoOptionsInvokerTestUtil.getSlaveOk(mongoOpts));
-		} else {
-			assertEquals(false, mongoOpts.fsync);
-		}
+		assertEquals(true, mongoOpts.fsync);
+		assertEquals(true, ReflectiveMongoOptionsInvokerTestUtil.getAutoConnectRetry(mongoOpts));
+		assertEquals(true, ReflectiveMongoOptionsInvokerTestUtil.getSlaveOk(mongoOpts));
 	}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoOptionsFactoryBeanUnitTests.java

@@ -23,6 +23,7 @@
 
 import javax.net.ssl.SSLSocketFactory;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.mongodb.MongoOptions;
@@ -36,14 +37,17 @@
  */
 public class MongoOptionsFactoryBeanUnitTests {
 
+	@BeforeClass
+	public static void validateMongoDriver() {
+		assumeFalse(isMongo3Driver());
+	}
+
 	/**
 	 * @see DATADOC-280
 	 */
 	@Test
 	public void setsMaxConnectRetryTime() {
 
-		assumeFalse(isMongo3Driver());
-
 		MongoOptionsFactoryBean bean = new MongoOptionsFactoryBean();
 		bean.setMaxAutoConnectRetryTime(27);
 		bean.afterPropertiesSet();