Author: mfranklin
Date: Tue Oct 16 01:43:21 2012
New Revision: 1398605
URL: http://svn.apache.org/viewvc?rev=1398605&view=rev
Log:
Forcing collection names in repositories
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java?rev=1398605&r1=1398604&r2=1398605&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
Tue Oct 16 01:43:21 2012
@@ -36,7 +36,7 @@ import static org.springframework.data.m
@Repository
public class MongoDbPageLayoutRepository implements PageLayoutRepository {
- public static final String COLLECTION = "mongoDbPageLayout";
+ public static final String COLLECTION = "pageLayout";
@Autowired
private MongoOperations template;
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java?rev=1398605&r1=1398604&r2=1398605&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
Tue Oct 16 01:43:21 2012
@@ -43,6 +43,8 @@ import static org.springframework.data.m
@Repository
public class MongoDbPageRepository implements PageRepository {
+ public static final String COLLECTION = "page";
+
@Autowired
private MongoOperations mongoTemplate;
@@ -51,7 +53,7 @@ public class MongoDbPageRepository imple
@Override
public List<Page> getAllPages(Long userId, PageType pageType) {
- List<MongoDbPage> pages = mongoTemplate.find(new
Query(where("pageType").is(pageType).andOperator(where("ownerId").is(userId))),
MongoDbPage.class);
+ List<MongoDbPage> pages = mongoTemplate.find(new
Query(where("pageType").is(pageType).andOperator(where("ownerId").is(userId))),
MongoDbPage.class, COLLECTION);
hydratePages(pages);
return CollectionUtils.<Page>toBaseTypedList(pages);
}
@@ -59,8 +61,8 @@ public class MongoDbPageRepository imple
@Override
public int deletePages(Long userId, PageType pageType) {
Query query = new
Query(where("pageType").is(pageType).andOperator(where("ownerId").is(userId)));
- int count = (int)mongoTemplate.count(query, MongoDbPage.class);
- mongoTemplate.remove(query, MongoDbPage.class);
+ int count = (int)mongoTemplate.count(query, COLLECTION);
+ mongoTemplate.remove(query, COLLECTION);
return count;
}
@@ -71,12 +73,12 @@ public class MongoDbPageRepository imple
@Override
public boolean hasPersonPage(long userId) {
- return mongoTemplate.count(new
Query(where("pageType").is(PageType.PERSON_PROFILE).andOperator(where("ownerId").is(userId))),
MongoDbPage.class) > 0;
+ return mongoTemplate.count(new
Query(where("pageType").is(PageType.PERSON_PROFILE).andOperator(where("ownerId").is(userId))),
COLLECTION) > 0;
}
@Override
public List<PageUser> getPagesForUser(Long userId, PageType pageType) {
- List<MongoDbPage> pages = mongoTemplate.find(new
Query(where("members").elemMatch(where("userId").is(userId)).andOperator(where("pageType").is(pageType))),
MongoDbPage.class);
+ List<MongoDbPage> pages = mongoTemplate.find(new
Query(where("members").elemMatch(where("userId").is(userId)).andOperator(where("pageType").is(pageType))),
MongoDbPage.class, COLLECTION);
List<PageUser> userList = Lists.newArrayList();
for(MongoDbPage page : pages) {
converter.hydrate(page, Page.class);
@@ -102,7 +104,7 @@ public class MongoDbPageRepository imple
@Override
public Page get(long id) {
- MongoDbPage fromDb = mongoTemplate.findById(id, MongoDbPage.class);
+ MongoDbPage fromDb = mongoTemplate.findById(id, MongoDbPage.class,
COLLECTION);
if(fromDb == null) {
throw new IllegalStateException("Could not find requested page: "
+ id);
}
@@ -113,14 +115,14 @@ public class MongoDbPageRepository imple
@Override
public Page save(Page item) {
MongoDbPage converted = converter.convert(item, Page.class);
- mongoTemplate.save(converted);
+ mongoTemplate.save(converted, COLLECTION);
converter.hydrate(converted, Page.class);
return converted;
}
@Override
public void delete(Page item) {
- mongoTemplate.remove(new Query(where("id").is(item.getId())),
MongoDbPage.class);
+ mongoTemplate.remove(new Query(where("id").is(item.getId())),
COLLECTION);
}
private void hydratePages(List<MongoDbPage> pages) {
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java?rev=1398605&r1=1398604&r2=1398605&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
Tue Oct 16 01:43:21 2012
@@ -31,6 +31,7 @@ import java.util.List;
/**
*/
public class MongoDbPageTemplateRepository implements PageTemplateRepository {
+ public static final String COLLECTION = "pageTemplate";
@Autowired
private MongoDbConverter converter;
Modified:
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java
URL:
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java?rev=1398605&r1=1398604&r2=1398605&view=diff
==============================================================================
---
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java
(original)
+++
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java
Tue Oct 16 01:43:21 2012
@@ -41,6 +41,7 @@ import static org.springframework.data.m
*/
@Repository
public class MongoDbWidgetRepository implements WidgetRepository {
+ public static final String COLLECTION = "widget";
@Autowired
private MongoOperations template;
@@ -55,18 +56,18 @@ public class MongoDbWidgetRepository imp
@Override
public List<Widget> getLimitedList(int offset, int pageSize) {
- return hydrateWidgets(template.find(new
Query().skip(offset).limit(pageSize), MongoDbWidget.class));
+ return hydrateWidgets(template.find(new
Query().skip(offset).limit(pageSize), MongoDbWidget.class, COLLECTION));
}
@Override
public int getCountAll() {
- return (int)template.count(new Query(), MongoDbWidget.class);
+ return (int)template.count(new Query(), COLLECTION);
}
@Override
public List<Widget> getByFreeTextSearch(String searchTerm, int offset, int
pageSize) {
Query query = new
Query(getFreeTextClause(searchTerm)).skip(offset).limit(pageSize);
- return hydrateWidgets(template.find(query, MongoDbWidget.class));
+ return hydrateWidgets(template.find(query, MongoDbWidget.class,
COLLECTION));
}
@Override
@@ -78,26 +79,26 @@ public class MongoDbWidgetRepository imp
public List<Widget> getByStatus(WidgetStatus widgetStatus, int offset, int
pageSize) {
Query query = new
Query(where("widgetStatus").is(widgetStatus)).skip(offset).limit(pageSize);
query.sort().on("title", Order.ASCENDING);
- List<MongoDbWidget> widgets = template.find(query,
MongoDbWidget.class);
+ List<MongoDbWidget> widgets = template.find(query,
MongoDbWidget.class, COLLECTION);
return hydrateWidgets(widgets);
}
@Override
public int getCountByStatus(WidgetStatus widgetStatus) {
- return (int)template.count(new
Query(where("widgetStatus").is(widgetStatus)), MongoDbWidget.class);
+ return (int)template.count(new
Query(where("widgetStatus").is(widgetStatus)), COLLECTION);
}
@Override
public List<Widget> getByStatusAndTypeAndFreeTextSearch(WidgetStatus
widgetStatus, String type, String searchTerm, int offset, int pageSize) {
Query query = getWidgetStatusFreeTextQuery(widgetStatus, type,
searchTerm).limit(pageSize).skip(offset);
query.sort().on("title", Order.ASCENDING);
- List<MongoDbWidget> widgets = template.find(query,
MongoDbWidget.class);
+ List<MongoDbWidget> widgets = template.find(query,
MongoDbWidget.class, COLLECTION);
return hydrateWidgets(widgets);
}
@Override
public int getCountByStatusAndTypeAndFreeText(WidgetStatus widgetStatus,
String type, String searchTerm) {
- return (int)template.count(getWidgetStatusFreeTextQuery(widgetStatus,
type, searchTerm), MongoDbWidget.class);
+ return (int)template.count(getWidgetStatusFreeTextQuery(widgetStatus,
type, searchTerm), COLLECTION);
}
@Override
@@ -112,7 +113,7 @@ public class MongoDbWidgetRepository imp
@Override
public Widget getByUrl(String widgetUrl) {
- return hydrateWidget(template.findOne(new
Query(where("url").is(widgetUrl)), MongoDbWidget.class));
+ return hydrateWidget(template.findOne(new
Query(where("url").is(widgetUrl)), MongoDbWidget.class, COLLECTION));
}
@Override
@@ -152,20 +153,20 @@ public class MongoDbWidgetRepository imp
@Override
public Widget get(long id) {
- return hydrateWidget(template.findById(id, MongoDbWidget.class));
+ return hydrateWidget(template.findById(id, MongoDbWidget.class,
COLLECTION));
}
@Override
public Widget save(Widget item) {
MongoDbWidget converted = converter.convert(item, Widget.class);
- template.save(converted);
+ template.save(converted, COLLECTION);
converter.hydrate(converted, Widget.class);
return converted;
}
@Override
public void delete(Widget item) {
- template.remove(template.findById(item.getId(), MongoDbWidget.class));
+ template.remove(template.findById(item.getId(), MongoDbWidget.class,
COLLECTION));
}
private List<Widget> hydrateWidgets(List<MongoDbWidget> widgets) {
