From 3e38595fe89b60f3185548525a1bf0f4626ea8be Mon Sep 17 00:00:00 2001
From: Thomas Risberg <trisberg@vmware.com>
Date: Fri, 20 May 2011 12:58:07 -0400
Subject: [PATCH] DATADOC-142 changed constructor taking Mongo and database
 name to accept user credentials

---
 .../data/document/mongodb/MongoDbFactoryBean.java     |  7 +++++++
 .../data/document/mongodb/MongoTemplate.java          | 11 ++++++-----
 .../data/document/mongodb/TestMongoConfiguration.java |  2 --
 spring-data-mongodb/template.mf                       |  1 +
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactoryBean.java
index e5f23d707..439dbc178 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactoryBean.java
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.data.authentication.UserCredentials;
 import org.springframework.util.Assert;
 
 import com.mongodb.DB;
@@ -52,6 +53,12 @@ public class MongoDbFactoryBean implements MongoDbFactory, FactoryBean<MongoDbFa
 	public MongoDbFactoryBean() {
 	}
 
+	public MongoDbFactoryBean(Mongo mongo, String databaseName, UserCredentials userCredentials) throws DataAccessException {
+		this(mongo, databaseName);
+		this.username = userCredentials.getUsername();
+		this.password = userCredentials.getPassword();
+	}
+
 	public MongoDbFactoryBean(Mongo mongo, String databaseName) throws DataAccessException {
 		Assert.notNull(mongo, "Mongo must not be null");
 		Assert.hasText(databaseName, "Database name must not be empty");
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
index c4bf66970..9cd123577 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoTemplate.java
@@ -50,6 +50,7 @@ import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.authentication.UserCredentials;
 import org.springframework.data.document.mongodb.convert.MappingMongoConverter;
 import org.springframework.data.document.mongodb.convert.MongoConverter;
 import org.springframework.data.document.mongodb.index.IndexDefinition;
@@ -125,15 +126,15 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 	}
 
 	/**
-	 * Constructor used for a template configuration with a custom
-	 * {@link org.springframework.data.document.mongodb.convert.MongoConverter}
+	 * Constructor used for a template configuration with user credentials in the form of
+	 * {@link org.springframework.data.authentication.UserCredentials}
 	 *
 	 * @param mongo
 	 * @param databaseName
-	 * @param mongoConverter
+	 * @param userCredentials
 	 */
-	public MongoTemplate(Mongo mongo, String databaseName, MongoConverter mongoConverter) {
-		this(new MongoDbFactoryBean(mongo, databaseName), mongoConverter, null, null);
+	public MongoTemplate(Mongo mongo, String databaseName, UserCredentials userCredentials) {
+		this(new MongoDbFactoryBean(mongo, databaseName, userCredentials));
 	}
 
 	/**
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/TestMongoConfiguration.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/TestMongoConfiguration.java
index c95f62cff..b76b5cad6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/TestMongoConfiguration.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/TestMongoConfiguration.java
@@ -1,8 +1,6 @@
 package org.springframework.data.document.mongodb;
 
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import com.mongodb.Mongo;
diff --git a/spring-data-mongodb/template.mf b/spring-data-mongodb/template.mf
index e20721be3..b79cb3b94 100644
--- a/spring-data-mongodb/template.mf
+++ b/spring-data-mongodb/template.mf
@@ -14,6 +14,7 @@ Import-Template:
  org.springframework.transaction.*;version="[3.0.0, 4.0.0)",
  org.springframework.data.core.*;version="[1.0.0, 2.0.0)",
  org.springframework.data.annotation.*;version="[1.0.0, 2.0.0)",
+ org.springframework.data.authentication.*;version="[1.0.0, 2.0.0)",
  org.springframework.data.mapping.*;version="[1.0.0, 2.0.0)",
  org.springframework.data.mapping.model.*;version="[1.0.0, 2.0.0)",
  org.springframework.data.domain.*;version="[1.0.0, 2.0.0)",