From 30e96f9c976cc2b3ad72cddf3450430976471785 Mon Sep 17 00:00:00 2001 From: Thomas Risberg Date: Tue, 17 May 2011 12:13:42 -0400 Subject: [PATCH] DATADOC-88 added accessors for Mongo and database name to MongoDbFactory --- .../data/document/mongodb/MongoDbFactory.java | 5 +++++ .../data/document/mongodb/MongoDbFactoryBean.java | 8 ++++++++ .../data/document/mongodb/MongoTemplate.java | 5 ++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactory.java index 9dcc371f6..fcef8fc4f 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactory.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/MongoDbFactory.java @@ -3,9 +3,14 @@ package org.springframework.data.document.mongodb; import org.springframework.dao.DataAccessException; import com.mongodb.DB; +import com.mongodb.Mongo; public interface MongoDbFactory { DB getDb() throws DataAccessException; + Mongo getMongo(); + + String getDatabaseName(); + } 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 27637c09e..d2fd3db08 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 @@ -100,6 +100,14 @@ public class MongoDbFactoryBean implements MongoDbFactory, FactoryBean, Init return MongoDbUtils.getDB(mongo, databaseName, username, password == null ? null : password.toCharArray()); } + public Mongo getMongo() { + return this.mongo; + } + + public String getDatabaseName() { + return this.databaseName; + } + public DB getObject() throws Exception { return getDb(); } 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 d8893f92c..20c3be316 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 @@ -1122,9 +1122,8 @@ public class MongoTemplate implements MongoOperations, ApplicationEventPublisher } private void initializeMappingMongoConverter(MappingMongoConverter converter) { - DB db = this.mongoDbFactory.getDb(); - converter.setMongo(db.getMongo()); - converter.setDefaultDatabase(db.getName()); + converter.setMongo(this.mongoDbFactory.getMongo()); + converter.setDefaultDatabase(this.mongoDbFactory.getDatabaseName()); } /**