Skip to content

Commit 60774dc

Browse files
author
Thomas Risberg
committed
DATADOC-88 switched test config files to use MongoDbFactory
1 parent c9d5565 commit 60774dc

File tree

12 files changed

+75
-34
lines changed

12 files changed

+75
-34
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,13 @@
2525
<property name="port" value="27017"/>
2626
</bean>
2727

28+
<bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
29+
<constructor-arg name="mongo" ref="mongo"/>
30+
<constructor-arg name="databaseName" value="test"/>
31+
</bean>
32+
2833
<bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
29-
<constructor-arg name="mongo" ref="mongo"/>
30-
<constructor-arg name="databaseName" value="test"/>
34+
<constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
3135
<constructor-arg name="mongoConverter" ref="mappingConverter"/>
3236
</bean>
3337

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @author Thomas Risberg
3434
* @since 1.0
3535
*/
36-
public class MongoDbFactoryBean implements MongoDbFactory, FactoryBean<DB>, InitializingBean {
36+
public class MongoDbFactoryBean implements MongoDbFactory, FactoryBean<MongoDbFactory>, InitializingBean {
3737
//ToDo: add PersistenceExceptionTranslator ???
3838

3939
/**
@@ -108,12 +108,12 @@ public String getDatabaseName() {
108108
return this.databaseName;
109109
}
110110

111-
public DB getObject() throws Exception {
112-
return getDb();
111+
public MongoDbFactory getObject() throws Exception {
112+
return this;
113113
}
114114

115-
public Class<? extends DB> getObjectType() {
116-
return DB.class;
115+
public Class<? extends MongoDbFactory> getObjectType() {
116+
return MongoDbFactory.class;
117117
}
118118

119119
public boolean isSingleton() {

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public class MongoTemplate implements MongoOperations, ApplicationEventPublisher
108108
* @param databaseName
109109
*/
110110
public MongoTemplate(Mongo mongo, String databaseName) {
111-
this(mongo, databaseName, null);
111+
this(new MongoDbFactoryBean(mongo, databaseName));
112112
}
113113

114114
/**
@@ -174,6 +174,15 @@ public MongoConverter getConverter() {
174174
return this.mongoConverter;
175175
}
176176

177+
/**
178+
* Returns the {@link org.springframework.data.document.mongodb.MongoDbFactory}.
179+
*
180+
* @return
181+
*/
182+
public MongoDbFactory getDbFactory() {
183+
return this.mongoDbFactory;
184+
}
185+
177186
/* (non-Javadoc)
178187
* @see org.springframework.data.document.mongodb.MongoOperations#getDefaultCollectionName()
179188
*/

spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/MongoTemplateTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void setMongo(Mongo mongo) throws Exception {
8787
MappingMongoConverter converter = new MappingMongoConverter(mappingContext);
8888
converter.afterPropertiesSet();
8989

90-
this.mappingTemplate = new MongoTemplate(mongo, "database", converter);
90+
this.mappingTemplate = new MongoTemplate(template.getDbFactory(), converter);
9191
}
9292

9393
@Before

spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/analytics/MvcAnalyticsTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class MvcAnalyticsTests {
3434
public void setUp() throws Exception {
3535
Mongo m = new Mongo();
3636
mongoTemplate = new MongoTemplate(m, "mvc");
37-
mongoDummyTemplate = new MongoTemplate(m, "mvc", new AbstractMongoConverter() {
37+
mongoDummyTemplate = new MongoTemplate(mongoTemplate.getDbFactory(), new AbstractMongoConverter() {
3838
public void write(Object t, DBObject dbo) {
3939
}
4040

spring-data-mongodb/src/test/resources/geospatial.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@
77

88
<mongo:mongo host="localhost" port="27017"/>
99

10+
<bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
11+
<constructor-arg name="mongo" ref="mongo"/>
12+
<constructor-arg name="databaseName" value="geospatial"/>
13+
</bean>
14+
1015
<mongo:mapping-converter base-package="org.springframework.data.document.mongodb"/>
1116

1217
<bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
13-
<constructor-arg ref="mongo"/>
14-
<constructor-arg name="databaseName" value="geospatial"/>
15-
<constructor-arg ref="mappingConverter"/>
18+
<constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
19+
<constructor-arg name="mongoConverter" ref="mappingConverter"/>
1620
</bean>
1721

1822
<bean class="org.springframework.data.document.mongodb.mapping.event.MappingEventListener"/>

spring-data-mongodb/src/test/resources/infrastructure.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@
88
<property name="port" value="27017"/>
99
</bean>
1010

11+
<bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
12+
<constructor-arg name="mongo" ref="mongo"/>
13+
<constructor-arg name="databaseName" value="database"/>
14+
</bean>
15+
1116
<bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
12-
<constructor-arg ref="mongo"/>
13-
<constructor-arg value="database"/>
14-
<constructor-arg ref="mongoConverter" />
17+
<constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
18+
<constructor-arg name="mongoConverter" ref="mongoConverter" />
1519
</bean>
1620

1721
<bean id="mongoConverter" class="org.springframework.data.document.mongodb.convert.SimpleMongoConverter" />

spring-data-mongodb/src/test/resources/mapping.xml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@
66
http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd">
77

88
<mongo:mongo host="localhost" port="27017"/>
9+
10+
<bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
11+
<constructor-arg name="mongo" ref="mongo"/>
12+
<constructor-arg name="databaseName" value="database"/>
13+
</bean>
14+
915
<mongo:mapping-converter base-package="org.springframework.data.document.mongodb.mapping"/>
1016

1117
<bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
12-
<constructor-arg ref="mongo"/>
13-
<constructor-arg name="databaseName" value="database"/>
14-
<constructor-arg ref="mappingConverter"/>
18+
<constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
19+
<constructor-arg name="mongoConverter" ref="mappingConverter"/>
1520
</bean>
1621

1722
<bean class="org.springframework.data.document.mongodb.mapping.event.LoggingEventListener"/>

spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/config/MongoNamespaceTests-context.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,13 @@
3232

3333
<bean id="readConverter" class="org.springframework.data.document.mongodb.PersonReadConverter"/>
3434

35+
<bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
36+
<constructor-arg name="mongo" ref="mongo"/>
37+
<constructor-arg name="databaseName" value="database"/>
38+
</bean>
39+
3540
<bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
36-
<constructor-arg name="mongo" ref="mongo"/>
37-
<constructor-arg name="databaseName" value="database"/>
41+
<constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
3842
<constructor-arg name="mongoConverter" ref="mappingConverter"/>
3943
</bean>
4044

spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/PersonRepositoryIntegrationTests-context.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,16 @@
55

66
<bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
77
<constructor-arg>
8-
<bean id="mongo" class="org.springframework.data.document.mongodb.MongoFactoryBean">
9-
<property name="host" value="localhost"/>
10-
<property name="port" value="27017"/>
8+
<bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
9+
<constructor-arg name="mongo">
10+
<bean id="mongo" class="org.springframework.data.document.mongodb.MongoFactoryBean">
11+
<property name="host" value="localhost"/>
12+
<property name="port" value="27017"/>
13+
</bean>
14+
</constructor-arg>
15+
<constructor-arg name="databaseName" value="repositories"/>
1116
</bean>
1217
</constructor-arg>
13-
<constructor-arg value="repositories" />
1418
<constructor-arg>
1519
<bean id="mongoConverter" class="org.springframework.data.document.mongodb.convert.MappingMongoConverter">
1620
<constructor-arg ref="mappingContext" />

spring-data-mongodb/src/test/resources/org/springframework/data/document/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@
88
http://www.springframework.org/schema/data/repository http://www.springframework.org/schema/data/repository/spring-repository-1.0.xsd">
99

1010
<mongo:mongo id="mongo" />
11+
12+
<bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
13+
<constructor-arg name="mongo" ref="mongo"/>
14+
<constructor-arg name="databaseName" value="repositories"/>
15+
</bean>
1116

1217
<bean id="mongoTemplate" class="org.springframework.data.document.mongodb.MongoTemplate">
13-
<constructor-arg ref="mongo" />
14-
<constructor-arg value="repositories" />
15-
<constructor-arg>
18+
<constructor-arg name="mongoDbFactory" ref="mongoDbFactory" />
19+
<constructor-arg name="mongoConverter">
1620
<mongo:mapping-converter />
1721
</constructor-arg>
1822
</bean>

spring-data-mongodb/src/test/resources/template-mapping.xml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99

1010
<mongo:mongo host="localhost" port="27017"/>
1111

12+
<bean id="mongoDbFactory" class="org.springframework.data.document.mongodb.MongoDbFactoryBean">
13+
<constructor-arg name="mongo" ref="mongo"/>
14+
<constructor-arg name="databaseName" value="database"/>
15+
</bean>
16+
1217
<bean id="mappingConverter1" class="org.springframework.data.document.mongodb.convert.MappingMongoConverter">
1318
<constructor-arg ref="mappingContext" />
1419
<property name="converters">
@@ -22,9 +27,8 @@
2227
<bean id="mappingContext" class="org.springframework.data.document.mongodb.mapping.MongoMappingContext"/>
2328

2429
<bean id="mongoTemplate1" class="org.springframework.data.document.mongodb.MongoTemplate">
25-
<constructor-arg ref="mongo"/>
26-
<constructor-arg name="databaseName" value="database"/>
27-
<constructor-arg ref="mappingConverter1"/>
30+
<constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
31+
<constructor-arg name="mongoConverter" ref="mappingConverter1"/>
2832
</bean>
2933

3034
<mongo:mapping-converter id="mappingConverter2" base-package="org.springframework.data.document.mongodb.mapping"
@@ -40,9 +44,8 @@
4044
</mongo:mapping-converter>
4145

4246
<bean id="mongoTemplate2" class="org.springframework.data.document.mongodb.MongoTemplate">
43-
<constructor-arg ref="mongo"/>
44-
<constructor-arg name="databaseName" value="database"/>
45-
<constructor-arg ref="mappingConverter2"/>
47+
<constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
48+
<constructor-arg name="mongoConverter" ref="mappingConverter2"/>
4649
</bean>
4750

4851

0 commit comments

Comments
 (0)