DATADOC-88 - Create MongoDbFactory to consolidate DB, Server location, and user credentials into one location

Author: Mark Pollack

spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml

@@ -25,7 +25,7 @@
     <property name="port" value="27017"/>
   </bean>
 
-  <bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
+  <bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.SimpleMongoDbFactory">
   	<constructor-arg name="mongo" ref="mongo"/>
   	<constructor-arg name="databaseName" value="database"/>
   </bean>

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactory.java

@@ -11,6 +11,4 @@ public interface MongoDbFactory {
 
 	Mongo getMongo();
 
-	String getDatabaseName();
-	
 }

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactoryBean.java

@@ -122,7 +122,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	 * @param databaseName
 	 */
 	public MongoTemplate(Mongo mongo, String databaseName) {
-		this(new MongoDbFactoryBean(mongo, databaseName), null, null, null);
+		this(new SimpleMongoDbFactory(mongo, databaseName), null, null, null);
 	}
 
 	/**
@@ -134,7 +134,7 @@ public MongoTemplate(Mongo mongo, String databaseName) {
 	 * @param userCredentials
 	 */
 	public MongoTemplate(Mongo mongo, String databaseName, UserCredentials userCredentials) {
-		this(new MongoDbFactoryBean(mongo, databaseName, userCredentials));
+		this(new SimpleMongoDbFactory(mongo, databaseName, userCredentials));
 	}
 
 	/**

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java

@@ -0,0 +1,58 @@
+package org.springframework.data.document.mongodb;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.authentication.UserCredentials;
+import org.springframework.util.Assert;
+
+import com.mongodb.DB;
+import com.mongodb.Mongo;
+
+public class SimpleMongoDbFactory implements MongoDbFactory {
+
+  /**
+   * Logger, available to subclasses.
+   */
+  protected final Log logger = LogFactory.getLog(getClass());
+
+  private Mongo mongo;
+  private String databaseName;
+  private String username;
+  private String password;
+
+  /**
+   * Create an instance of SimpleMongoDbFactory given the Mongo instance and database name
+   * @param mongo Mongo instance, not null
+   * @param databaseName Database name, not null
+   */
+  public SimpleMongoDbFactory(Mongo mongo, String databaseName) {
+    Assert.notNull(mongo, "Mongo must not be null");
+    Assert.hasText(databaseName, "Database name must not be empty");
+    this.mongo = mongo;
+    this.databaseName = databaseName;
+  }
+  
+  /**
+   * Create an instance of SimpleMongoDbFactory given the Mongo instance, database name, and username/password
+   * @param mongo Mongo instance, not null
+   * @param databaseName Database name, not null
+   * @param userCredentials username and password
+   */
+  public SimpleMongoDbFactory(Mongo mongo, String databaseName, UserCredentials userCredentials) {
+    this(mongo, databaseName);
+    this.username = userCredentials.getUsername();
+    this.password = userCredentials.getPassword();
+  }
+
+  public DB getDb() throws DataAccessException {
+    Assert.notNull(mongo, "Mongo must not be null");
+    Assert.hasText(databaseName, "Database name must not be empty");
+    return MongoDbUtils.getDB(mongo, databaseName, username, password == null ? null : password.toCharArray());
+  }
+
+  public Mongo getMongo() {
+    return this.mongo;
+  }
+
+}

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/SimpleMongoDbFactory.java

@@ -26,8 +26,8 @@
 import org.springframework.core.type.filter.AnnotationTypeFilter;
 import org.springframework.data.annotation.Persistent;
 import org.springframework.data.document.mongodb.MongoDbFactory;
-import org.springframework.data.document.mongodb.MongoDbFactoryBean;
 import org.springframework.data.document.mongodb.MongoTemplate;
+import org.springframework.data.document.mongodb.SimpleMongoDbFactory;
 import org.springframework.data.document.mongodb.convert.MappingMongoConverter;
 import org.springframework.data.document.mongodb.mapping.Document;
 import org.springframework.data.document.mongodb.mapping.MongoMappingContext;
@@ -48,7 +48,7 @@ public abstract class AbstractMongoConfiguration {
 
 	@Bean
 	public MongoDbFactory mongoDbFactory() throws Exception {
-		return new MongoDbFactoryBean(mongo(), defaultDatabaseName());
+		return new SimpleMongoDbFactory(mongo(), defaultDatabaseName());
 	}
 
 	public String mappingBasePackage() {