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

DATADOC-12 - Rename query methods in MongoTemplate

Browse Source
This commit is contained in:
Mark Pollack
2010-12-02 14:00:49 -05:00
parent 2af7e57299
commit 6bd97203b1
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,7 +239,7 @@ public class MongoTemplate implements InitializingBean {
}
}
public <T> List<T> queryForCollection(Class<T> targetClass) {
public <T> List<T> getCollection(Class<T> targetClass) {
List<T> results = new ArrayList<T>();
DBCollection collection = getDb().getCollection(getDefaultCollectionName());
@@ -253,7 +253,7 @@ public class MongoTemplate implements InitializingBean {
return results;
}
public <T> List<T> queryForCollection(String collectionName, Class<T> targetClass) {
public <T> List<T> getCollection(String collectionName, Class<T> targetClass) {
List<T> results = new ArrayList<T>();
DBCollection collection = getDb().getCollection(collectionName);
@@ -267,7 +267,7 @@ public class MongoTemplate implements InitializingBean {
return results;
}
public <T> List<T> queryForCollection(String collectionName, Class<T> targetClass, MongoReader<T> reader) {
public <T> List<T> getCollection(String collectionName, Class<T> targetClass, MongoReader<T> reader) {
List<T> results = new ArrayList<T>();
DBCollection collection = getDb().getCollection(collectionName);
for (DBObject dbo : collection.find()) {
@@ -278,34 +278,34 @@ public class MongoTemplate implements InitializingBean {
// Queries that take JavaScript to express the query.
public <T> List<T> queryForList(String query, Class<T> targetClass) {
return queryForList(getDefaultCollectionName(), (DBObject)JSON.parse(query), targetClass);
public <T> List<T> queryUsingJavaScript(String query, Class<T> targetClass) {
return query(getDefaultCollectionName(), (DBObject)JSON.parse(query), targetClass); //
}
public <T> List<T> queryForList(String query, Class<T> targetClass, MongoReader<T> reader) {
return queryForList(getDefaultCollectionName(), (DBObject)JSON.parse(query), targetClass, reader);
public <T> List<T> queryUsingJavaScript(String query, Class<T> targetClass, MongoReader<T> reader) {
return query(getDefaultCollectionName(), (DBObject)JSON.parse(query), targetClass, reader);
}
public <T> List<T> queryForList(String collectionName, String query, Class<T> targetClass) {
return queryForList(collectionName, (DBObject)JSON.parse(query), targetClass);
public <T> List<T> queryUsingJavaScript(String collectionName, String query, Class<T> targetClass) {
return query(collectionName, (DBObject)JSON.parse(query), targetClass); //
}
public <T> List<T> queryForList(String collectionName, String query, Class<T> targetClass, MongoReader<T> reader) {
return queryForList(collectionName, (DBObject)JSON.parse(query), targetClass, reader);
public <T> List<T> queryUsingJavaScript(String collectionName, String query, Class<T> targetClass, MongoReader<T> reader) {
return query(collectionName, (DBObject)JSON.parse(query), targetClass, reader);
}
// Queries that take DBObject to express the query
public <T> List<T> queryForList(DBObject query, Class<T> targetClass) {
return queryForList(getDefaultCollectionName(), query, targetClass);
public <T> List<T> query(DBObject query, Class<T> targetClass) {
return query(getDefaultCollectionName(), query, targetClass); //
}
public <T> List<T> queryForList(DBObject query, Class<T> targetClass, MongoReader<T> reader) {
return queryForList(getDefaultCollectionName(), query, targetClass, reader);
public <T> List<T> query(DBObject query, Class<T> targetClass, MongoReader<T> reader) {
return query(getDefaultCollectionName(), query, targetClass, reader);
}
public <T> List<T> queryForList(String collectionName, DBObject query, Class<T> targetClass) {
public <T> List<T> query(String collectionName, DBObject query, Class<T> targetClass) {
DBCollection collection = getDb().getCollection(collectionName);
List<T> results = new ArrayList<T>();
for (DBObject dbo : collection.find(query)) {
@@ -318,7 +318,7 @@ public class MongoTemplate implements InitializingBean {
return results;
}
public <T> List<T> queryForList(String collectionName, DBObject query, Class<T> targetClass, MongoReader<T> reader) {
public <T> List<T> query(String collectionName, DBObject query, Class<T> targetClass, MongoReader<T> reader) {
DBCollection collection = getDb().getCollection(collectionName);
List<T> results = new ArrayList<T>();
for (DBObject dbo : collection.find(query)) {

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

@@ -57,11 +57,11 @@ public class MvcAnalyticsTests {
createAndStoreMvcEvent(3, 3);
createAndStoreMvcEvent(8, 4);
List<MvcEvent> mvcEvents = mongoTemplate.queryForCollection("mvc",
List<MvcEvent> mvcEvents = mongoTemplate.getCollection("mvc",
MvcEvent.class);
Assert.assertEquals(22, mvcEvents.size());
List<MvcEvent> mvcEvents2 = mongoTemplate.queryForCollection("mvc", MvcEvent.class,
List<MvcEvent> mvcEvents2 = mongoTemplate.getCollection("mvc", MvcEvent.class,
new MongoReader<MvcEvent>() {
public MvcEvent read(Class<? extends MvcEvent> clazz, DBObject dbo) {
return null;
@@ -92,7 +92,7 @@ public class MvcAnalyticsTests {
for (DBObject dbo : mongoTemplate.getCollection("counters").find(query)) {
System.out.println(dbo);
}
List<ControllerCounter> counters = mongoTemplate.queryForList("counters", "{ 'name' : 'SignUpController'} ", ControllerCounter.class);
List<ControllerCounter> counters = mongoTemplate.queryUsingJavaScript("counters", "{ 'name' : 'SignUpController'} ", ControllerCounter.class);
for (ControllerCounter controllerCounter : counters) {
System.out.println(controllerCounter);
}
@@ -108,7 +108,7 @@ public class MvcAnalyticsTests {
@Test
public void listAllMvcEvents() {
List<MvcEvent> mvcEvents = mongoTemplate.queryForCollection("mvc",
List<MvcEvent> mvcEvents = mongoTemplate.getCollection("mvc",
MvcEvent.class);
for (MvcEvent mvcEvent : mvcEvents) {
System.out.println(mvcEvent.getDate());