Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Pollack
2011-05-24 17:23:02 -04:00
parent 2284a5137e
commit 69b1b9b96b
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,6 @@ public interface MongoDbFactory {
DB getDb() throws DataAccessException;
Mongo getMongo();
DB getDb(String dbName) throws DataAccessException;
}

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

@@ -50,6 +50,14 @@ public class SimpleMongoDbFactory implements MongoDbFactory {
Assert.hasText(databaseName, "Database name must not be empty");
return MongoDbUtils.getDB(mongo, databaseName, username, password == null ? null : password.toCharArray());
}
public DB getDb(String dbName) throws DataAccessException {
Assert.notNull(mongo, "Mongo must not be null");
Assert.hasText(dbName, "Database name must not be empty");
return MongoDbUtils.getDB(mongo, dbName, username, password == null ? null : password.toCharArray());
}
public Mongo getMongo() {
return this.mongo;

2
spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java
View File

@@ -596,7 +596,7 @@ public class MappingMongoConverter extends AbstractMongoConverter implements App
}
String dbname = dbref.db();
DB db = StringUtils.hasText(dbname) ? mongoDbFactory.getMongo().getDB(dbname) : mongoDbFactory.getDb();
DB db = StringUtils.hasText(dbname) ? mongoDbFactory.getDb(dbname) : mongoDbFactory.getDb();
return new DBRef(db, collection, id);
}