You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/12/28 18:43:30 UTC
svn commit: r1426593 [9/16] - in /rave/branches/mongo: ./ rave-components/
rave-components/rave-commons/
rave-components/rave-commons/src/main/java/org/apache/rave/persistence/
rave-components/rave-core/
rave-components/rave-core/src/main/java/org/apac...
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java Fri Dec 28 17:43:23 2012
@@ -56,7 +56,9 @@ public class MongoDbMapReduceStatisticsA
public MongoDbMapReduceStatisticsAggregator(MongoOperations mongoOperations) {
this.mongoOperations = mongoOperations;
}
- public WidgetStatistics getWidgetStatistics(long widget_id, long user_id) {
+
+ @Override
+ public WidgetStatistics getWidgetStatistics(String widget_id, String user_id) {
WidgetUsersMapReduceResult userResult = mongoOperations.findById(widget_id, WidgetUsersMapReduceResult.class, WIDGET_USERS);
WidgetRatingsMapReduceResult ratingResult = mongoOperations.findById(widget_id, WidgetRatingsMapReduceResult.class, WIDGET_RATINGS);
@@ -73,12 +75,12 @@ public class MongoDbMapReduceStatisticsA
}
@Override
- public Map<Long, WidgetStatistics> getAllWidgetStatistics(long userId) {
+ public Map<String , WidgetStatistics> getAllWidgetStatistics(String userId) {
List<WidgetRatingsMapReduceResult> widgetStats = mongoOperations.findAll(WidgetRatingsMapReduceResult.class, WIDGET_RATINGS);
List<WidgetUsersMapReduceResult> widgetUsers = mongoOperations.findAll(WidgetUsersMapReduceResult.class, WIDGET_USERS);
- Map<Long, WidgetStatistics> stats = Maps.newHashMap();
- Map<Long, Integer> userStats = mapUsersResults(widgetUsers);
+ Map<String, WidgetStatistics> stats = Maps.newHashMap();
+ Map<String, Integer> userStats = mapUsersResults(widgetUsers);
if (widgetStats.size() > 0) {
addCombinedStats(userId, widgetStats, userStats, stats);
@@ -113,8 +115,8 @@ public class MongoDbMapReduceStatisticsA
}
}
- private Map<Long, Integer> mapUsersResults(List<WidgetUsersMapReduceResult> widgetUsersMapReduceResults) {
- Map<Long, Integer> map = Maps.newHashMap();
+ private Map<String, Integer> mapUsersResults(List<WidgetUsersMapReduceResult> widgetUsersMapReduceResults) {
+ Map<String, Integer> map = Maps.newHashMap();
for (WidgetUsersMapReduceResult result : widgetUsersMapReduceResults) {
if (result.getId() != null) {
map.put(result.getId(), result.getValue().size());
@@ -135,18 +137,18 @@ public class MongoDbMapReduceStatisticsA
return mongoOperations.mapReduce(WIDGET_COLLECTION, RATINGS_MAP, RATINGS_REDUCE, getOptions(WIDGET_RATINGS), WidgetRatingsMapReduceResult.class);
}
- private void addUserCount(Map<Long, Integer> users, Map<Long, WidgetStatistics> stats) {
- for (Map.Entry<Long, Integer> result : users.entrySet()) {
+ private void addUserCount(Map<String, Integer> users, Map<String, WidgetStatistics> stats) {
+ for (Map.Entry<String, Integer> result : users.entrySet()) {
WidgetStatistics widgetStatistics = getTotalUserOnlyWidgetStatistics(result.getValue());
stats.put(result.getKey(), widgetStatistics);
}
}
- private void addCombinedStats(long userId, List<WidgetRatingsMapReduceResult> widgetStats, Map<Long, Integer> usersMap, Map<Long, WidgetStatistics> stats) {
+ private void addCombinedStats(String userId, List<WidgetRatingsMapReduceResult> widgetStats, Map<String, Integer> usersMap, Map<String , WidgetStatistics> stats) {
for (WidgetRatingsMapReduceResult result : widgetStats) {
stats.put(result.getId(), createWidgetStatisticsFromResults(userId, result));
}
- for(Map.Entry<Long, Integer> id : usersMap.entrySet()) {
+ for(Map.Entry<String, Integer> id : usersMap.entrySet()) {
Integer value = id.getValue();
if(stats.containsKey(id.getKey())) {
stats.get(id.getKey()).setTotalUserCount(value);
@@ -164,7 +166,7 @@ public class MongoDbMapReduceStatisticsA
return stat;
}
- private WidgetStatistics createWidgetStatisticsFromResults(long user_id, WidgetRatingsMapReduceResult statsResult) {
+ private WidgetStatistics createWidgetStatisticsFromResults(String user_id, WidgetRatingsMapReduceResult statsResult) {
WidgetStatistics statistics = new WidgetStatistics();
WidgetRatingsMapReduceResult.WidgetStatisticsMapReduceResult result = statsResult.getValue();
if (result != null) {
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java Fri Dec 28 17:43:23 2012
@@ -26,10 +26,9 @@ import org.springframework.beans.factory
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.stereotype.Repository;
-import static org.apache.rave.portal.model.util.MongoDbModelUtil.generateId;
+import static org.apache.rave.portal.repository.util.CollectionNames.OAUTH_TOKEN_COLLECTION;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
-import static org.apache.rave.portal.repository.util.CollectionNames.OAUTH_TOKEN_COLLECTION;
@Repository
public class MongoDbOAuthTokenInfoRepository implements OAuthTokenInfoRepository {
@@ -56,15 +55,12 @@ public class MongoDbOAuthTokenInfoReposi
}
@Override
- public OAuthTokenInfo get(long id) {
+ public OAuthTokenInfo get(String id) {
return template.findById(id, CLASS, OAUTH_TOKEN_COLLECTION);
}
@Override
public OAuthTokenInfo save(OAuthTokenInfo item) {
- if(item.getId() == null) {
- item.setId(generateId());
- }
template.save(item, OAUTH_TOKEN_COLLECTION);
return item;
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java Fri Dec 28 17:43:23 2012
@@ -26,10 +26,9 @@ import org.springframework.beans.factory
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.stereotype.Repository;
-import static org.apache.rave.portal.model.util.MongoDbModelUtil.generateId;
+import static org.apache.rave.portal.repository.util.CollectionNames.OAUTH_CONSUMER_COLLECTION;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
-import static org.apache.rave.portal.repository.util.CollectionNames.OAUTH_CONSUMER_COLLECTION;
@Repository
public class MongoDbOauthConsumerStoreRepository implements OAuthConsumerStoreRepository {
@@ -49,15 +48,12 @@ public class MongoDbOauthConsumerStoreRe
}
@Override
- public OAuthConsumerStore get(long id) {
+ public OAuthConsumerStore get(String id) {
return template.findById(id, CLASS, OAUTH_CONSUMER_COLLECTION);
}
@Override
public OAuthConsumerStore save(OAuthConsumerStore item) {
- if(item.getId() == null) {
- item.setId(generateId());
- }
template.save(item, OAUTH_CONSUMER_COLLECTION);
return item;
}
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=1426593&r1=1426592&r2=1426593&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 Fri Dec 28 17:43:23 2012
@@ -20,8 +20,8 @@
package org.apache.rave.portal.repository.impl;
import org.apache.commons.lang.NotImplementedException;
-import org.apache.rave.portal.model.PageLayout;
import org.apache.rave.portal.model.MongoDbPageLayout;
+import org.apache.rave.portal.model.PageLayout;
import org.apache.rave.portal.repository.PageLayoutRepository;
import org.apache.rave.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,9 +31,8 @@ import org.springframework.stereotype.Re
import java.util.List;
-import static org.apache.rave.portal.model.util.MongoDbModelUtil.generateId;
-import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.apache.rave.portal.repository.util.CollectionNames.PAGE_LAYOUT_COLLECTION;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
@Repository
public class MongoDbPageLayoutRepository implements PageLayoutRepository {
@@ -64,7 +63,7 @@ public class MongoDbPageLayoutRepository
}
@Override
- public PageLayout get(long id) {
+ public PageLayout get(String id) {
throw new NotImplementedException("No use for an id");
}
@@ -73,7 +72,6 @@ public class MongoDbPageLayoutRepository
MongoDbPageLayout toSave = (MongoDbPageLayout)getByPageLayoutCode(item.getCode());
if(toSave == null) {
toSave = new MongoDbPageLayout();
- toSave.setId(generateId());
}
update(item, toSave);
template.save(toSave, PAGE_LAYOUT_COLLECTION);
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=1426593&r1=1426592&r2=1426593&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 Fri Dec 28 17:43:23 2012
@@ -28,7 +28,6 @@ import org.apache.rave.portal.model.impl
import org.apache.rave.portal.repository.MongoPageOperations;
import org.apache.rave.portal.repository.PageRepository;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Repository;
@@ -49,12 +48,12 @@ public class MongoDbPageRepository imple
private MongoPageOperations template;
@Override
- public List<Page> getAllPages(Long userId, PageType pageType) {
+ public List<Page> getAllPages(String userId, PageType pageType) {
return sort(template.find(query(where("pageType").is(getString(pageType)).andOperator(where("ownerId").is(userId)))), userId);
}
@Override
- public int deletePages(Long userId, PageType pageType) {
+ public int deletePages(String userId, PageType pageType) {
Query query = query(where("pageType").is(pageType).andOperator(where("ownerId").is(userId)));
int count = (int)template.count(query);
template.remove(query);
@@ -67,12 +66,12 @@ public class MongoDbPageRepository imple
}
@Override
- public boolean hasPersonPage(long userId) {
+ public boolean hasPersonPage(String userId) {
return template.count(query(where("pageType").is(PageType.PERSON_PROFILE).andOperator(where("ownerId").is(userId)))) > 0;
}
@Override
- public List<PageUser> getPagesForUser(Long userId, PageType pageType) {
+ public List<PageUser> getPagesForUser(String userId, PageType pageType) {
List<Page> pages = template.find(query(where("members").elemMatch(where("userId").is(userId)).andOperator(where("pageType").is(getString(pageType)))));
List<PageUser> userList = Lists.newArrayList();
for(Page page : pages) {
@@ -82,10 +81,10 @@ public class MongoDbPageRepository imple
}
@Override
- public PageUser getSingleRecord(Long userId, Long pageId) {
+ public PageUser getSingleRecord(String userId, String pageId) {
Page page = get(pageId);
for(PageUser user : page.getMembers()) {
- if(user.getUser().getId().equals(userId))
+ if(user.getUserId().equals(userId))
return user;
}
return null;
@@ -97,7 +96,7 @@ public class MongoDbPageRepository imple
}
@Override
- public Page get(long id) {
+ public Page get(String id) {
return template.get(id);
}
@@ -111,7 +110,7 @@ public class MongoDbPageRepository imple
template.remove(query(where("_id").is(item.getId())));
}
- private List<Page> sort(List<Page> pages, final Long userId) {
+ private List<Page> sort(List<Page> pages, final String userId) {
Collections.sort(pages, new Comparator<Page>() {
@Override
public int compare(Page page, Page page1) {
@@ -121,7 +120,7 @@ public class MongoDbPageRepository imple
return pages;
}
- private List<PageUser> sortUsers(List<PageUser> userList, Long userId) {
+ private List<PageUser> sortUsers(List<PageUser> userList, String userId) {
Collections.sort(userList, new Comparator<PageUser>() {
@Override
public int compare(PageUser pageUser, PageUser pageUser1) {
@@ -135,11 +134,10 @@ public class MongoDbPageRepository imple
return pageUser == null || pageUser.getRenderSequence() == null ? Integer.MAX_VALUE : pageUser.getRenderSequence().intValue();
}
- private int getRenderOrder(Page page, Long userId) {
+ private int getRenderOrder(Page page, String userId) {
for(PageUser user : page.getMembers()) {
- MongoDbPageUser mUser = (MongoDbPageUser)user;
- if(mUser.getUser().getId().equals(userId)) {
- return getRenderOrder(mUser);
+ if(user.getUserId().equals(userId)) {
+ return getRenderOrder(user);
}
}
return -1;
@@ -156,8 +154,8 @@ public class MongoDbPageRepository imple
Page p = new PageImpl();
p.setName(pt.getName());
p.setPageType(pt.getPageType());
- p.setOwner(user);
- PageUser pageUser = new PageUserImpl(user, p, pt.getRenderSequence());
+ p.setOwnerId(user.getId());
+ PageUser pageUser = new PageUserImpl(user.getId(), p, pt.getRenderSequence());
pageUser.setPageStatus(PageInvitationStatus.OWNER);
pageUser.setEditor(true);
List<PageUser> members = new ArrayList<PageUser>();
@@ -206,7 +204,7 @@ public class MongoDbPageRepository imple
regionWidget.setLocked(ptw.isLocked());
regionWidget.setHideChrome(ptw.isHideChrome());
regionWidget.setRenderOrder((int) ptw.getRenderSeq());
- regionWidget.setWidget(ptw.getWidget());
+ regionWidget.setWidgetId(ptw.getWidgetId());
widgets.add(regionWidget);
}
return widgets;
@@ -226,13 +224,13 @@ public class MongoDbPageRepository imple
Page lPage = new PageImpl();
lPage.setName(pt.getName());
lPage.setPageType(pt.getPageType());
- lPage.setOwner(page.getOwner());
+ lPage.setOwnerId(page.getOwnerId());
lPage.setPageLayout(pt.getPageLayout());
lPage.setParentPage(page);
lPage.setRegions(convertRegions(pt.getPageTemplateRegions(), lPage));
// create new pageUser tuple
- PageUser pageUser = new PageUserImpl(lPage.getOwner(), lPage, pt.getRenderSequence());
+ PageUser pageUser = new PageUserImpl(lPage.getOwnerId(), lPage, pt.getRenderSequence());
pageUser.setPageStatus(PageInvitationStatus.OWNER);
pageUser.setEditor(true);
List<PageUser> members = new ArrayList<PageUser>();
@@ -245,9 +243,9 @@ public class MongoDbPageRepository imple
return pages;
}
- private PageUser findPageUser(Long userId, Page page) {
+ private PageUser findPageUser(String userId, Page page) {
for(PageUser user : page.getMembers()) {
- if(user.getUser().getId().equals(userId)) {
+ if(user.getUserId().equals(userId)) {
return user;
}
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java Fri Dec 28 17:43:23 2012
@@ -21,6 +21,7 @@ package org.apache.rave.portal.repositor
import com.google.common.base.Function;
import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
import org.apache.commons.lang.NotImplementedException;
import org.apache.rave.portal.model.*;
import org.apache.rave.portal.repository.MongoPageOperations;
@@ -95,10 +96,10 @@ public class MongoDbPersonRepository imp
public List<Person> findFriendsWithFriend(String username, String friendUsername) {
MongoDbUser follower = (MongoDbUser) template.findOne(getUsernameQuery(username));
MongoDbUser followed = (MongoDbUser) template.findOne(getUsernameQuery(friendUsername));
- List<Long> commonFriends = getCommonFriends(follower, followed);
- return Lists.transform(commonFriends, new Function<Long, Person>() {
+ List<String> commonFriends = getCommonFriends(follower, followed);
+ return Lists.transform(commonFriends, new Function<String, Person>() {
@Override
- public Person apply(@Nullable Long id) {
+ public Person apply(@Nullable String id) {
return id == null ? null : template.get(id).toPerson();
}
});
@@ -178,12 +179,21 @@ public class MongoDbPersonRepository imp
}
@Override
+ public int removeAllFriendsAndRequests(String userid) {
+ MongoDbUser person = (MongoDbUser)template.get(userid);
+ int count = person.getFriends().size();
+ person.setFriends(Lists.<MongoDbPersonAssociation>newArrayList());
+ save(person);
+ return count;
+ }
+
+ @Override
public Class<? extends Person> getType() {
return Person.class;
}
@Override
- public Person get(long id) {
+ public Person get(String id) {
return template.get(id);
}
@@ -211,13 +221,13 @@ public class MongoDbPersonRepository imp
return Lists.transform(pages, new Function<Page, Person>() {
@Override
public Person apply(@Nullable Page input) {
- return input == null ? null : input.getOwner().toPerson();
+ return input == null ? null : template.get(input.getOwnerId()).toPerson();
}
});
}
- private List<Long> getFriendIds(List<MongoDbPersonAssociation> friends) {
- List<Long> ids = Lists.newArrayList();
+ private List<String> getFriendIds(List<MongoDbPersonAssociation> friends) {
+ List<String> ids = Lists.newArrayList();
for (MongoDbPersonAssociation friend : friends) {
if (friend.getRequestStatus().equals(FriendRequestStatus.ACCEPTED)) {
ids.add(friend.getPersonId());
@@ -257,9 +267,9 @@ public class MongoDbPersonRepository imp
}
}
- private List<Long> getCommonFriends(MongoDbUser follower, MongoDbUser followed) {
- List<Long> ids = Lists.newArrayList();
- Map<Long, MongoDbPersonAssociation> friendHash = new HashMap<Long, MongoDbPersonAssociation>();
+ private List<String> getCommonFriends(MongoDbUser follower, MongoDbUser followed) {
+ List<String> ids = Lists.newArrayList();
+ Map<String, MongoDbPersonAssociation> friendHash = Maps.newHashMap();
for (MongoDbPersonAssociation association : follower.getFriends()) {
friendHash.put(association.getPersonId(), association);
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java Fri Dec 28 17:43:23 2012
@@ -63,7 +63,7 @@ public class MongoDbPortalPreferenceRepo
}
@Override
- public PortalPreference get(long id) {
+ public PortalPreference get(String id) {
return template.findById(id, CLASS, PREFERENCE_COLLECTION);
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java Fri Dec 28 17:43:23 2012
@@ -47,7 +47,7 @@ public class MongoDbRegionRepository imp
}
@Override
- public Region get(long id) {
+ public Region get(String id) {
Page page = getPageByRegionId(id);
for(Region region : page.getRegions()) {
if(region.getId().equals(id)) {
@@ -119,7 +119,7 @@ public class MongoDbRegionRepository imp
}
}
- private Page getPageByRegionId(long id) {
+ private Page getPageByRegionId(String id) {
return template.findOne(new Query(Criteria.where("regions").elemMatch(Criteria.where("_id").is(id))));
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java Fri Dec 28 17:43:23 2012
@@ -19,10 +19,10 @@
package org.apache.rave.portal.repository.impl;
-import org.apache.rave.portal.model.MongoDbRegionWidget;
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.Region;
import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.portal.model.impl.RegionWidgetImpl;
import org.apache.rave.portal.repository.MongoPageOperations;
import org.apache.rave.portal.repository.RegionWidgetRepository;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,11 +41,11 @@ public class MongoDbRegionWidgetReposito
@Override
public Class<? extends RegionWidget> getType() {
- return MongoDbRegionWidget.class;
+ return RegionWidgetImpl.class;
}
@Override
- public RegionWidget get(long id) {
+ public RegionWidget get(String id) {
Page page = getPageByRegionWidgetId(id);
return getRegionWidgetById(page, id);
}
@@ -80,7 +80,7 @@ public class MongoDbRegionWidgetReposito
return getRegionById(parent.getId(), saved.getRegions()).getRegionWidgets().get(parent.getRegionWidgets().size() -1);
}
- private RegionWidget getRegionWidgetById(Page page, Long id) {
+ private RegionWidget getRegionWidgetById(Page page, String id) {
for(Region region : page.getRegions()) {
for(RegionWidget widget : region.getRegionWidgets()) {
if(widget.getId().equals(id)) {
@@ -107,7 +107,7 @@ public class MongoDbRegionWidgetReposito
throw new IllegalStateException("Widget does not exist in parent page regions");
}
- private Region getRegionById(Long id, List<Region> regions) {
+ private Region getRegionById(String id, List<Region> regions) {
for(Region region: regions) {
if(id.equals(region.getId())) {
return region;
@@ -125,7 +125,7 @@ public class MongoDbRegionWidgetReposito
}
}
- private Page getPageByRegionWidgetId(long id) {
+ private Page getPageByRegionWidgetId(String id) {
return template.findOne(new Query(where("regions").elemMatch(where("regionWidgets").elemMatch(where("_id").is(id)))));
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java Fri Dec 28 17:43:23 2012
@@ -61,9 +61,9 @@ public class MongoDbTagRepository implem
return new TagImpl(keyword);
}
- @Override
+ //@Override
@SuppressWarnings("unchecked")
- public List<Tag> getAvailableTagsByWidgetId(Long widgetId) {
+ public List<Tag> getAvailableTagsByWidgetId(String widgetId) {
List<Tag> all = getAll();
List<Tag> widgetTags = getTagsFromWidget(widgetTemplate.get(widgetId).getTags());
return ListUtils.subtract(all, widgetTags);
@@ -75,7 +75,7 @@ public class MongoDbTagRepository implem
}
@Override
- public Tag get(long id) {
+ public Tag get(String id) {
throw new NotSupportedException("Cannot access tags by Id");
}
@@ -93,7 +93,7 @@ public class MongoDbTagRepository implem
List<Tag> tags = Lists.newArrayList();
if (widgetTags != null) {
for (WidgetTag widgetTag : widgetTags) {
- tags.add(widgetTag.getTag());
+ tags.add(get(widgetTag.getTagId()));
}
}
return tags;
@@ -105,7 +105,7 @@ public class MongoDbTagRepository implem
if (widget.getTags() == null) return;
for (WidgetTag widgetTag : widget.getTags()) {
- Tag tag = widgetTag.getTag();
+ Tag tag = get(widgetTag.getTagId());
if (!tags.contains(tag)) {
tags.add(tag);
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java Fri Dec 28 17:43:23 2012
@@ -20,6 +20,7 @@
package org.apache.rave.portal.repository.impl;
import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
import org.apache.rave.portal.model.MongoDbUser;
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.User;
@@ -31,7 +32,9 @@ import org.springframework.data.mongodb.
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Repository;
+import java.util.Collection;
import java.util.List;
+import java.util.Set;
import java.util.regex.Pattern;
import static org.springframework.data.mongodb.core.query.Criteria.where;
@@ -86,16 +89,16 @@ public class MongoDbUserRepository imple
}
@Override
- public List<User> getAllByAddedWidget(long widgetId) {
+ public List<User> getAllByAddedWidget(String widgetId) {
Query q = query(where("regions").elemMatch(where("regionWidgets").elemMatch(where("widgetId").is(widgetId))));
List<Page> pages = pageTemplate.find(q);
- List<User> users = Lists.newArrayList();
+ Set<String> userIds = Sets.newHashSet();
for(Page p : pages) {
- if(!users.contains(p.getOwner())){
- users.add(p.getOwner());
+ if(!userIds.contains(p.getOwnerId())){
+ userIds.add(p.getOwnerId());
}
}
- return users;
+ return getUsersById(userIds);
}
@Override
@@ -109,7 +112,7 @@ public class MongoDbUserRepository imple
}
@Override
- public User get(long id) {
+ public User get(String id) {
return template.get(id);
}
@@ -123,6 +126,14 @@ public class MongoDbUserRepository imple
template.remove(query(where("_id").is(item.getId())));
}
+ private List<User> getUsersById(Collection<String> userIds) {
+ List<User> users = Lists.newArrayList();
+ for(String userId : userIds) {
+ users.add(template.get(userId));
+ }
+ return users;
+ }
+
private Query getSearchQuery(String searchTerm) {
Pattern p = Pattern.compile(".*" + searchTerm +".*", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
return query(new Criteria().orOperator(where("username").regex(p), where("email").regex(p)));
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=1426593&r1=1426592&r2=1426593&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 Fri Dec 28 17:43:23 2012
@@ -20,6 +20,7 @@
package org.apache.rave.portal.repository.impl;
import com.google.common.collect.Maps;
+import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.util.WidgetStatistics;
import org.apache.rave.portal.repository.MongoWidgetOperations;
@@ -31,6 +32,8 @@ import org.springframework.data.mongodb.
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Repository;
+import java.util.Date;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
@@ -116,20 +119,20 @@ public class MongoDbWidgetRepository imp
}
@Override
- public WidgetStatistics getWidgetStatistics(long widget_id, long user_id) {
+ public WidgetStatistics getWidgetStatistics(String widget_id, String user_id) {
return statsAggregator.getWidgetStatistics(widget_id, user_id);
}
@Override
- public Map<Long, WidgetStatistics> getAllWidgetStatistics(long userId) {
+ public Map<String, WidgetStatistics> getAllWidgetStatistics(String userId) {
return statsAggregator.getAllWidgetStatistics(userId);
}
@Override
- public Map<Long, WidgetRating> getUsersWidgetRatings(long userId) {
+ public Map<String , WidgetRating> getUsersWidgetRatings(String userId) {
Query q = query(where("ratings").elemMatch(where("userId").is(userId)));
List<Widget> widgets = template.find(q);
- Map<Long, WidgetRating> ratings = Maps.newHashMap();
+ Map<String , WidgetRating> ratings = Maps.newHashMap();
for (Widget widget : widgets) {
for (WidgetRating rating : widget.getRatings()) {
if (rating.getUserId().equals(userId)) {
@@ -152,7 +155,7 @@ public class MongoDbWidgetRepository imp
}
@Override
- public int unassignWidgetOwner(long userId) {
+ public int unassignWidgetOwner(String userId) {
Query query = query(where("ownerId").is(userId));
return template.update(query, update("ownerId", null));
}
@@ -163,7 +166,7 @@ public class MongoDbWidgetRepository imp
}
@Override
- public Widget get(long id) {
+ public Widget get(String id) {
return template.get(id);
}
@@ -177,6 +180,261 @@ public class MongoDbWidgetRepository imp
template.remove(new Query(where("_id").is(item.getId())));
}
+ /*
+ * Begin WidgetRatingRepository Methods
+ *
+ */
+ @Override
+ public WidgetRating getWidgetRatingsByWidgetIdAndUserId(String widgetId, String userId) {
+ Widget widget = template.get(widgetId);
+ return getRatingByUserId(widget, userId);
+ }
+
+ @Override
+ public int deleteAllWidgetRatings(String userId) {
+ int count = 0;
+ List<Widget> widgets = template.find(query(where("ratings").elemMatch(where("userId").is(userId))));
+ for (Widget widget : widgets) {
+ count += removeUserRatings(userId, widget);
+ }
+ return count;
+ }
+
+ @Override
+ public WidgetRating getRatingById(String widgetId, String id) {
+ Widget widget = template.get(widgetId);
+ return getWidgetRatingById(widget, id);
+ }
+
+ @Override
+ public WidgetRating createWidgetRating(String widgetId, WidgetRating rating) {
+ Widget widget = template.get(widgetId);
+ widget.getRatings().add(rating);
+ save(widget);
+ return rating;
+ }
+
+ @Override
+ public WidgetRating updateWidgetRating(String widgetId, WidgetRating rating) {
+ return null;
+ }
+
+ @Override
+ public void deleteWidgetRating(String widgetId, WidgetRating item) {
+ Widget widget = template.get(widgetId);
+ removeRating(item.getId(), widget);
+ template.save(widget);
+ }
+
+ private void removeRating(String ratingId, Widget widget) {
+ Iterator<WidgetRating> iterator = widget.getRatings().iterator();
+ while(iterator.hasNext()) {
+ WidgetRating comment = iterator.next();
+ if(comment.getId().equals(ratingId)) {
+ iterator.remove();
+ return;
+ }
+ }
+ }
+
+ private WidgetRating getWidgetRatingById(Widget widget, String id) {
+ for (WidgetRating rating : widget.getRatings()) {
+ if (rating.getId().equals(id)) {
+ return rating;
+ }
+ }
+ return null;
+ }
+
+ private int removeUserRatings(String userId, Widget widget) {
+ int count = 0;
+ Iterator<WidgetRating> iterator = widget.getRatings().iterator();
+ while (iterator.hasNext()) {
+ WidgetRating rating = iterator.next();
+ if (rating.getUserId().equals(userId)) {
+ iterator.remove();
+ count++;
+ }
+ }
+ if (count > 0) {
+ template.save(widget);
+ }
+ return count;
+ }
+
+ private WidgetRating getRatingByUserId(Widget widget, String userId) {
+ for (WidgetRating rating : widget.getRatings()) {
+ if (rating.getUserId().equals(userId)) {
+ return rating;
+ }
+ }
+ return null;
+ }
+
+ /*
+ * End WidgetRating Repository Methods
+ */
+
+ /*
+ * Begin WidgetTagRepository Methods
+ */
+ @Override
+ public WidgetTag getTagByWidgetIdAndKeyword(String widgetId, String keyword) {
+ Widget widget = template.get(widgetId);
+ return getTagByKeyword(keyword, widget);
+ }
+
+ @Override
+ public WidgetTag getTagById(String id) {
+ throw new NotSupportedException();
+ }
+
+ @Override
+ public WidgetTag saveWidgetTag(String widgetId, WidgetTag item) {
+ Widget widget = template.get(widgetId);
+ updateOrAddTag(widget, item);
+ Widget saved = template.save(widget);
+ //return getTagByKeyword(item.getTag().getKeyword(), saved);
+ //TODO: FIX
+ return null;
+ }
+
+ @Override
+ public void deleteWidgetTag(WidgetTag item) {/*
+ Widget widget = template.get(item.getWidgetId());
+ removeTag(item.getTag().getKeyword(), widget);*/
+ }
+
+ private void updateOrAddTag(Widget widget, WidgetTag item) {
+ //The current programming model expects there to be only one instance of a tag
+ //consider an update a NOOP unless it is a new tag.
+ /*WidgetTag tag = getTagByKeyword(item.getTag().getKeyword(), widget);
+ if(tag == null) {
+ widget.getTags().add(item);
+ }*/
+ }
+
+ private void removeTag(String keyword, Widget widget) {
+ /* Iterator<WidgetTag> iterator = widget.getTags().iterator();
+ while (iterator.hasNext()) {
+ WidgetTag comment = iterator.next();
+ if (comment.getTag().getKeyword().equals(keyword)) {
+ iterator.remove();
+ return;
+ }
+ }*/
+ }
+
+ private WidgetTag getTagByKeyword(String keyword, Widget widget) {
+ /*for(WidgetTag tag : widget.getTags()) {
+ if(tag.getTag().getKeyword().equals(keyword)) {
+ return tag;
+ }
+ }
+ return null;*/
+
+ //TODO: FIX
+ return null;
+ }
+
+ /*
+ * End WidgetTag Repository Methods
+ */
+
+ /*
+ * WidgetComment Repository
+ */
+ @Override
+ public WidgetComment getCommentById(String widgetId, String id) {
+ return getCommentById(template.get(widgetId), id);
+ }
+
+ @Override
+ public WidgetComment createWidgetComment(String widgetId, WidgetComment comment) {
+ Widget widget = template.get(widgetId);
+ widget.getComments().add(comment);
+ save(widget);
+ return comment;
+ }
+
+ @Override
+ public WidgetComment updateWidgetComment(String widgetId, WidgetComment comment) {
+ Widget widget = template.get(widgetId);
+ return updateComment(widget, comment);
+ }
+
+ @Override
+ public void deleteWidgetComment(String widgetId, WidgetComment comment) {
+ Widget widget = template.get(widgetId);
+ removeComment(comment.getId(), widget);
+ template.save(widget);
+ }
+
+ @Override
+ public int deleteAllWidgetComments(String userId) {
+ int count=0;
+ List<Widget> widgets = template.find(query(where("comments").elemMatch(where("userId").is(userId))));
+ for(Widget widget : widgets) {
+ count += updateWidget(userId, widget);
+ }
+ return count;
+ }
+
+ private void removeComment(String commentId, Widget widget) {
+ Iterator<WidgetComment> iterator = widget.getComments().iterator();
+ while(iterator.hasNext()) {
+ WidgetComment comment = iterator.next();
+ if(comment.getId().equals(commentId)) {
+ iterator.remove();
+ return;
+ }
+ }
+ }
+
+ private int updateWidget(String userId, Widget widget) {
+ int count = 0;
+
+ Iterator<WidgetComment> iterator = widget.getComments().iterator();
+ while(iterator.hasNext()) {
+ WidgetComment comment = iterator.next();
+ if(comment.getUserId().equals(userId)) {
+ iterator.remove();
+ count++;
+ }
+ }
+ if(count > 0) {
+ template.save(widget);
+ }
+ return count;
+ }
+
+ private WidgetComment getCommentById(Widget widget, String id) {
+ if(widget != null){
+ for(WidgetComment comment : widget.getComments()) {
+ if(comment.getId().equals(id)) {
+ return comment;
+ }
+ }
+ }
+ return null;
+ }
+
+ private WidgetComment updateComment(Widget widget, WidgetComment item) {
+ for(WidgetComment comment : widget.getComments()) {
+ if(comment.getId().equals(item.getId())) {
+ comment.setLastModifiedDate(new Date());
+ comment.setText(item.getText());
+ comment.setUserId(item.getUserId());
+ return comment;
+ }
+ }
+ return null;
+ }
+
+ /*
+ * End WidgetComment Repository
+ */
+
private Query getWidgetStatusFreeTextQuery(WidgetStatus widgetStatus, String type, String searchTerm) {
Criteria criteria = addFreeTextClause(searchTerm, new Criteria());
if (type != null && !type.isEmpty()) {
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoModelTemplate.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoModelTemplate.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoModelTemplate.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoModelTemplate.java Fri Dec 28 17:43:23 2012
@@ -62,7 +62,7 @@ public class MongoModelTemplate<T, E ext
}
@Override
- public T get(long id) {
+ public T get(String id) {
E fromDb = mongoTemplate.findById(id, dbType, collection);
if(fromDb == null) {
throw new IllegalStateException("Could not find requested page: " + id);
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbAuthorityTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbAuthorityTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbAuthorityTest.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbAuthorityTest.java Fri Dec 28 17:43:23 2012
@@ -21,8 +21,8 @@ package org.apache.rave.portal.model;
import org.junit.Test;
+import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
/**
@@ -34,8 +34,8 @@ public class MongoDbAuthorityTest {
@Test
public void testAuthority(){
Authority auth = new MongoDbAuthority();
- long id = 123;
+ String id = "123";
((MongoDbAuthority)auth).setId(id);
- assertThat(((MongoDbAuthority) auth).getId(), is(sameInstance((long)123)));
+ assertThat(((MongoDbAuthority) auth).getId(), is(equalTo(id)));
}
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbCategoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbCategoryTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbCategoryTest.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbCategoryTest.java Fri Dec 28 17:43:23 2012
@@ -19,7 +19,6 @@
package org.apache.rave.portal.model;
-import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.repository.MongoWidgetOperations;
import org.apache.rave.portal.repository.UserRepository;
import org.junit.Before;
@@ -28,13 +27,8 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.junit.Assert.assertNull;
+import static org.easymock.EasyMock.*;
+import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
@@ -45,6 +39,8 @@ import static org.springframework.data.m
* Time: 12:03 PM
*/
public class MongoDbCategoryTest {
+ public static final String ID_1 = "123";
+ public static final String ID_2 = "321";
private MongoDbCategory category;
private UserRepository userRepository;
private MongoWidgetOperations widgetOperations;
@@ -54,93 +50,23 @@ public class MongoDbCategoryTest {
category = new MongoDbCategory();
userRepository = createMock(UserRepository.class);
widgetOperations = createMock(MongoWidgetOperations.class);
- category.setUserRepository(userRepository);
category.setWidgetRepository(widgetOperations);
}
@Test
public void testCategory() {
- Long lastModifiedUserId = (long) 123;
- Long createdUserId = (long) 321;
+ String lastModifiedUserId = ID_1;
+ String createdUserId = ID_2;
category.setLastModifiedUserId(lastModifiedUserId);
category.setCreatedUserId(createdUserId);
- assertThat(category.getLastModifiedUserId(), is(equalTo((long) 123)));
- assertThat(category.getCreatedUserId(), is(equalTo((long) 321)));
- assertThat(category.getUserRepository(), is(sameInstance(userRepository)));
+ assertThat(category.getLastModifiedUserId(), is(equalTo(ID_1)));
+ assertThat(category.getCreatedUserId(), is(equalTo(ID_2)));
assertThat(category.getWidgetRepository(), is(sameInstance(widgetOperations)));
}
@Test
- public void getCreatedUser_Creator_Set() {
- User user = new UserImpl();
- category.setCreatedUser(user);
- assertThat(category.getCreatedUser(), is(sameInstance(user)));
- }
-
- @Test
- public void getCreatedUser_CreatedUserId_Null() {
- category.setCreatedUser(null);
- category.setCreatedUserId(null);
-
- assertNull(category.getCreatedUser());
- }
-
- @Test
- public void getCreatedUser_UserRepository_Null(){
- category.setCreatedUser(null);
- category.setCreatedUserId((long)123);
- category.setUserRepository(null);
-
- assertNull(category.getCreatedUser());
- }
-
- @Test
- public void getCreatedUser_All_True() {
- category.setCreatedUserId((long) 321);
- User user = new UserImpl();
- expect(userRepository.get((long) 321)).andReturn(user);
- replay(userRepository);
-
- assertThat(category.getCreatedUser(), is(sameInstance(user)));
- }
-
- @Test
- public void getLastModifiedUser_LastModifier_Set(){
- User user = new UserImpl();
- category.setLastModifiedUser(user);
-
- assertThat(category.getLastModifiedUser(), is(sameInstance(user)));
- }
-
- @Test
- public void getLastModifiedUser_LastModifiedUserId_Null(){
- category.setLastModifiedUser(null);
- category.setLastModifiedUserId(null);
- assertNull(category.getLastModifiedUser());
- }
-
- @Test
- public void getLastModifiedUser_UserRepository_Null(){
- category.setLastModifiedUser(null);
- category.setLastModifiedUserId((long)123);
- category.setUserRepository(null);
-
- assertNull(category.getLastModifiedUser());
- }
-
- @Test
- public void getLastModifiedUser_AllTrue() {
- category.setLastModifiedUserId((long) 321);
- User user = new UserImpl();
- expect(userRepository.get((long) 321)).andReturn(user);
- replay(userRepository);
-
- assertThat(category.getLastModifiedUser(), is(sameInstance(user)));
- }
-
- @Test
public void getWidgets_Widgets_Null() {
List<Widget> widgets = new ArrayList<Widget>();
expect(widgetOperations.find(query(where("categoryIds").is(category.getId())))).andReturn(widgets);
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPageLayoutTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPageLayoutTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPageLayoutTest.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPageLayoutTest.java Fri Dec 28 17:43:23 2012
@@ -30,13 +30,13 @@ import static org.junit.Assert.*;
* Time: 12:39 PM
*/
public class MongoDbPageLayoutTest {
- private MongoDbPageLayout pageLayout;
- private Long id;
+ private MongoDbPageLayout pageLayout;
+ private String id;
@Before
public void setup(){
pageLayout = new MongoDbPageLayout();
- id = (long)123;
+ id = "123";
pageLayout.setId(id);
}
@@ -62,7 +62,7 @@ public class MongoDbPageLayoutTest {
public void equals_Null_Id(){
MongoDbPageLayout p_1 = new MongoDbPageLayout();
MongoDbPageLayout p_2 = new MongoDbPageLayout();
- p_1.setId((long)321);
+ p_1.setId("321");
assertFalse(p_1.equals(p_2));
assertFalse(p_2.equals(p_1));
}
@@ -78,8 +78,8 @@ public class MongoDbPageLayoutTest {
public void equals_Same_Id(){
MongoDbPageLayout p_1 = new MongoDbPageLayout();
MongoDbPageLayout p_2 = new MongoDbPageLayout();
- p_1.setId((long)321);
- p_2.setId((long)321);
+ p_1.setId("321");
+ p_2.setId("321");
assertTrue(p_1.equals(p_2));
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPersonAssociationTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPersonAssociationTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPersonAssociationTest.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPersonAssociationTest.java Fri Dec 28 17:43:23 2012
@@ -37,10 +37,10 @@ public class MongoDbPersonAssociationTes
MongoDbPersonAssociation personAssociation = new MongoDbPersonAssociation();
personAssociation.setRequestStatus(FriendRequestStatus.ACCEPTED);
- personAssociation.setPersonId((long)46765);
+ personAssociation.setPersonId("46765");
assertThat(personAssociation.getRequestStatus(), is(equalTo(FriendRequestStatus.ACCEPTED)));
- assertThat(personAssociation.getPersonId(), is(equalTo((long)46765)));
+ assertThat(personAssociation.getPersonId(), is(equalTo("46765")));
}
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPortalPreferenceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPortalPreferenceTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPortalPreferenceTest.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPortalPreferenceTest.java Fri Dec 28 17:43:23 2012
@@ -34,8 +34,9 @@ public class MongoDbPortalPreferenceTest
@Test
public void testPortalPreference(){
MongoDbPortalPreference pp = new MongoDbPortalPreference();
- pp.setId((long)123);
+ String id = "123";
+ pp.setId(id);
- assertThat(pp.getId(), is(equalTo((long)123)));
+ assertThat(pp.getId(), is(equalTo(id)));
}
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbUserTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbUserTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbUserTest.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbUserTest.java Fri Dec 28 17:43:23 2012
@@ -86,7 +86,7 @@ public class MongoDbUserTest {
@Test
public void equals_Null_Id(){
- user.setId((long)123);
+ user.setId("123");
MongoDbUser r = new MongoDbUser();
assertFalse(user.equals(r));
assertFalse(r.equals(user));
@@ -95,9 +95,9 @@ public class MongoDbUserTest {
@Test
public void equals_Valid(){
- user.setId((long)123);
+ user.setId("123");
MongoDbUser r = new MongoDbUser();
- r.setId((long) 123);
+ r.setId("123");
assertTrue(user.equals(r));
}
@@ -110,7 +110,7 @@ public class MongoDbUserTest {
@Test
public void hashCode_Valid(){
- user.setId((long)123);
+ user.setId("123");
assertNotNull(user.hashCode());
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbWidgetTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbWidgetTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbWidgetTest.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbWidgetTest.java Fri Dec 28 17:43:23 2012
@@ -20,14 +20,10 @@
package org.apache.rave.portal.model;
import org.apache.rave.portal.model.impl.CategoryImpl;
-import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.repository.CategoryRepository;
-import org.apache.rave.portal.repository.UserRepository;
import org.junit.Before;
import org.junit.Test;
-import sun.security.acl.OwnerImpl;
-import java.security.acl.Owner;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -44,47 +40,24 @@ import static org.junit.Assert.*;
*/
public class MongoDbWidgetTest {
+ public static final String ID_1 = "123";
+ public static final String ID_2 = "321";
private MongoDbWidget widget;
private CategoryRepository categoryRepository;
- private UserRepository userRepository;
@Before
public void setup(){
widget = new MongoDbWidget();
categoryRepository = createMock(CategoryRepository.class);
- userRepository = createMock(UserRepository.class);
widget.setCategoryRepository(categoryRepository);
- widget.setUserRepository(userRepository);
- }
-
- @Test
- public void getOwner_Null(){
- widget.setOwnerId((long)123);
- User user = new UserImpl();
- expect(userRepository.get((long)123)).andReturn(user);
- replay(userRepository);
- assertThat(widget.getOwner(), is(sameInstance(user)));
- }
-
- @Test
- public void getOwner_Set(){
- User owner = new UserImpl();
- widget.setOwner(owner);
- assertThat(widget.getOwner(), is(sameInstance(owner)));
-
- }
-
- @Test
- public void getOwner_Both_Null(){
- assertNull(widget.getOwner());
}
@Test
public void getCategories_Valid(){
- List<Long> categoryIds = Arrays.asList((long)123, (long)321);
- expect(categoryRepository.get((long)123)).andReturn(null);
+ List<String> categoryIds = Arrays.asList(ID_1, ID_2);
+ expect(categoryRepository.get(ID_1)).andReturn(null);
Category category = new CategoryImpl();
- expect(categoryRepository.get((long)321)).andReturn(category);
+ expect(categoryRepository.get(ID_2)).andReturn(category);
replay(categoryRepository);
widget.setCategoryIds(categoryIds);
List<Category> result = widget.getCategories();
@@ -121,7 +94,7 @@ public class MongoDbWidgetTest {
@Test
public void equals_Null_Id(){
- widget.setId((long)123);
+ widget.setId(ID_1);
Widget r = new MongoDbWidget();
assertFalse(widget.equals(r));
assertFalse(r.equals(widget));
@@ -130,9 +103,9 @@ public class MongoDbWidgetTest {
@Test
public void equals_Valid(){
- widget.setId((long)123);
+ widget.setId(ID_1);
Widget r = new MongoDbWidget();
- ((MongoDbWidget)r).setId((long) 123);
+ ((MongoDbWidget)r).setId(ID_1);
assertTrue(widget.equals(r));
}
@@ -151,7 +124,7 @@ public class MongoDbWidgetTest {
@Test
public void hashCode_Null(){
- widget.setId((long)123);
+ widget.setId(ID_1);
assertNotNull(widget.hashCode());
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverterTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverterTest.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverterTest.java Fri Dec 28 17:43:23 2012
@@ -22,44 +22,35 @@ package org.apache.rave.portal.model.con
import com.google.common.collect.Lists;
import org.apache.rave.portal.model.Category;
import org.apache.rave.portal.model.MongoDbCategory;
-import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.model.impl.CategoryImpl;
-import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.repository.MongoWidgetOperations;
-import org.apache.rave.portal.repository.UserRepository;
import org.junit.Before;
import org.junit.Test;
import java.util.Date;
import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.not;
import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
/**
* This is a test class for MongoDb Category Converter
*/
public class MongoDbCategoryConverterTest {
- public static final long USER1ID = 1234L;
- public static final long USER2ID = 1333L;
+ public static final String USER1ID = "1234";
+ public static final String USER2ID = "1333";
public static final Date DATE1 = new Date();
public static final Date DATE2 = new Date();
private MongoDbCategoryConverter converter;
- private UserRepository userRepository;
private MongoWidgetOperations mongoWidgetOperations;
@Before
public void setup(){
converter = new MongoDbCategoryConverter();
- userRepository = createNiceMock(UserRepository.class);
mongoWidgetOperations = createNiceMock(MongoWidgetOperations.class);
- converter.setUserRepository(userRepository);
converter.setMongoWidgetOperations(mongoWidgetOperations);
}
@@ -70,7 +61,6 @@ public class MongoDbCategoryConverterTes
converter.hydrate(category);
- assertThat(category.getUserRepository(),is(sameInstance(userRepository)));
assertThat(category.getWidgetRepository(),is(sameInstance(mongoWidgetOperations)));
}
@@ -85,25 +75,20 @@ public class MongoDbCategoryConverterTes
@Test
public void convert_valid(){
Category c = new CategoryImpl();
- User user1 = new UserImpl(USER1ID);
- User user2 = new UserImpl(USER2ID);
c.setCreatedDate(DATE1);
- c.setCreatedUser(user1);
+ c.setCreatedUserId(USER1ID);
c.setId(USER1ID);
- c.setLastModifiedUser(user2);
+ c.setLastModifiedUserId(USER2ID);
c.setText("asdf");
c.setWidgets(Lists.<Widget>newArrayList());
c.setLastModifiedDate(DATE2);
MongoDbCategory mongoC = converter.convert(c);
assertThat(mongoC.getCreatedDate(), is(equalTo(DATE1)));
- assertThat(mongoC.getCreatedUser(), is(nullValue()));
assertThat(mongoC.getCreatedUserId(), is(equalTo(USER1ID)));
assertThat(mongoC.getId(), is(equalTo(USER1ID)));
assertThat(mongoC.getLastModifiedUserId(), is(equalTo(USER2ID)));
- assertThat(mongoC.getLastModifiedUser(), is(nullValue()));
assertThat(mongoC.getWidgetRepository(), is(nullValue()));
- assertThat(mongoC.getUserRepository(), is(nullValue()));
assertThat(mongoC.getText(), is("asdf"));
assertThat(c.getWidgets().size(), is(0));
@@ -117,6 +102,6 @@ public class MongoDbCategoryConverterTes
assertNull(converted.getLastModifiedUserId());
assertNull(converted.getCreatedUserId());
- assertNotNull(converted.getId());
+ assertNull(converted.getId());
}
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverterTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverterTest.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverterTest.java Fri Dec 28 17:43:23 2012
@@ -20,25 +20,17 @@
package org.apache.rave.portal.model.conversion.impl;
import com.google.common.collect.Lists;
-import org.apache.openjpa.persistence.meta.Members;
import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.repository.PageLayoutRepository;
-import org.apache.rave.portal.repository.UserRepository;
-import org.apache.rave.portal.repository.WidgetRepository;
-import org.apache.rave.portal.service.RegionService;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static org.easymock.EasyMock.*;
-
-import static org.easymock.EasyMock.createNiceMock;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
@@ -47,23 +39,17 @@ import static org.junit.Assert.*;
*/
public class MongoDbPageConverterTest {
- private UserRepository userRepository;
- private WidgetRepository widgetRepository;
private PageLayoutRepository pageLayoutRepository;
private MongoDbPageConverter converter;
- public static final long USER1ID = 1234L;
- public static final long USER2ID = 1222L;
- public static final long PAGEID = 1234L;
+ public static final String USER1ID = "1234";
+ public static final String USER2ID = "1222";
+ public static final String PAGEID = "1234";
@Before
public void setup() {
converter = new MongoDbPageConverter();
- userRepository = createNiceMock(UserRepository.class);
- widgetRepository = createNiceMock(WidgetRepository.class);
pageLayoutRepository = createNiceMock(PageLayoutRepository.class);
- converter.setWidgetRepository(widgetRepository);
- converter.setUserRepository(userRepository);
converter.setPageLayoutRepository(pageLayoutRepository);
}
@@ -73,9 +59,8 @@ public class MongoDbPageConverterTest {
MongoDbPage results;
PageUser pageUser = new PageUserImpl(USER1ID);
- User user = new UserImpl(USER2ID);
Page sourcePage = new PageImpl();
- pageUser.setUser(user);
+ pageUser.setUserId(USER2ID);
List<PageUser> pageMembers = Lists.newArrayList();
pageMembers.add(pageUser);
@@ -83,10 +68,9 @@ public class MongoDbPageConverterTest {
Region region = new RegionImpl();
region.setRegionWidgets(Lists.<RegionWidget>newLinkedList());
- RegionWidget rw = new RegionWidgetImpl();
- rw.setId(2222L);
- Widget widget = new WidgetImpl(3333L);
- rw.setWidget(widget);
+ RegionWidgetImpl rw = new RegionWidgetImpl();
+ rw.setId("2222");
+ rw.setWidgetId("3333");
rw.setPreferences(Lists.<RegionWidgetPreference>newLinkedList());
region.getRegionWidgets().add(rw);
@@ -98,7 +82,7 @@ public class MongoDbPageConverterTest {
pagelayout.setCode("asdf");
sourcePage.setId(PAGEID);
- sourcePage.setOwner(user);
+ sourcePage.setOwnerId(USER2ID);
sourcePage.setPageLayout(pagelayout);
sourcePage.setName("Carol");
sourcePage.setParentPage(parentPage);
@@ -113,9 +97,8 @@ public class MongoDbPageConverterTest {
assertNull(results.getRegions().get(0).getPage());
assertThat(results.getPageLayout(), is(nullValue(PageLayout.class)));
assertThat(results.getParentPage(), is(nullValue()));
- assertThat(results.getUserRepository(), is(nullValue()));
assertThat(results.getMembers().size(), is(1));
- assertThat(results.getRegions().get(0).getRegionWidgets().get(0), is(instanceOf(MongoDbRegionWidget.class)));
+ assertThat(results.getRegions().get(0).getRegionWidgets().get(0), is(instanceOf(RegionWidgetImpl.class)));
assertNotNull(results.getRegions().get(0).getRegionWidgets().get(0).getId());
assertNull(results.getRegions().get(0).getRegionWidgets().get(0).getRegion());
assertThat(results.getRegions().get(0).getRegionWidgets().get(0).getPreferences(), is(equalTo(sourcePage.getRegions().get(0).getRegionWidgets().get(0).getPreferences())));
@@ -125,19 +108,19 @@ public class MongoDbPageConverterTest {
@Test
public void convertPage_Id_Null(){
Page sourcePage = new MongoDbPage();
- Region region = new RegionImpl();
- region.setId((long)123);
- sourcePage.setRegions(Arrays.asList(region));
+ RegionImpl region = new RegionImpl();
+ region.setId("123");
+ sourcePage.setRegions(Arrays.<Region>asList(region));
sourcePage.setPageLayout(new PageLayoutImpl());
- sourcePage.setOwner(new UserImpl());
+ sourcePage.setOwnerId(USER1ID);
sourcePage.setMembers(new ArrayList<PageUser>());
Page subPage = new MongoDbPage();
List<Page> subPages = Arrays.asList(subPage);
subPage.setPageLayout(new PageLayoutImpl());
- subPage.setOwner(new UserImpl());
- subPage.setId((long)321);
+ subPage.setOwnerId(USER1ID);
+ subPage.setId("321");
subPage.setMembers(new ArrayList<PageUser>());
subPage.setRegions(new ArrayList<Region>());
sourcePage.setSubPages(subPages);
@@ -155,10 +138,9 @@ public class MongoDbPageConverterTest {
@Test
public void convertUser_valid() {
- MongoDbPageUser mongoUser;
+ PageUserImpl mongoUser;
PageUser sourceUser = new PageUserImpl(USER1ID);
- User user = new UserImpl(USER2ID);
- sourceUser.setUser(user);
+ sourceUser.setUserId(USER2ID);
sourceUser.setEditor(true);
sourceUser.setPageStatus(PageInvitationStatus.OWNER);
sourceUser.setRenderSequence(1234L);
@@ -170,36 +152,30 @@ public class MongoDbPageConverterTest {
assertThat(mongoUser.getPageStatus(), is(PageInvitationStatus.OWNER));
assertThat(mongoUser.getRenderSequence(), is(equalTo(1234L)));
assertThat(mongoUser.getPage(), is(nullValue()));
- assertNull(mongoUser.getUserRepository());
}//end convertUser_valid
@Test
public void convertUser_MongoInstance(){
- PageUser sourceUser = new MongoDbPageUser();
- sourceUser.setUser(new UserImpl());
-
- MongoDbPageUser converted = converter.convert(sourceUser);
+ PageUser sourceUser = new PageUserImpl();
+ sourceUser.setUserId("1234");
+ PageUserImpl converted = converter.convert(sourceUser);
assertNotNull(converted.getId());
- assertTrue(converted instanceof MongoDbPageUser);
}
//Convert Widget test
@Test
public void convertWidget_valid() {
- MongoDbRegionWidget rw = new MongoDbRegionWidget();
- MongoDbRegionWidget rwResults;
+ RegionWidgetImpl rw = new RegionWidgetImpl();
+ RegionWidgetImpl rwResults;
rw.setPreferences(Lists.<RegionWidgetPreference>newLinkedList());
RegionWidgetPreference preference = new RegionWidgetPreferenceImpl();
preference.setName("name");
preference.setValue("value");
- rw.setWidgetId(1234L);
- Widget widget = new WidgetImpl(3333L);
-
- rw.setWidget(widget);
+ rw.setWidgetId("1234L");
rw.getPreferences().add(preference);
rw.setLocked(false);
rw.setCollapsed(false);
@@ -209,7 +185,7 @@ public class MongoDbPageConverterTest {
rwResults = converter.convert(rw);
- assertThat(rwResults.getWidgetId(), is(equalTo(3333L)));
+ assertThat(rwResults.getWidgetId(), is(equalTo("1234L")));
assertNotNull(rwResults.getId());
assertThat(rwResults.getPreferences().get(0), is(equalTo(preference)));
assertThat(rwResults.isCollapsed(), is(false));
@@ -217,20 +193,16 @@ public class MongoDbPageConverterTest {
assertThat(rwResults.isLocked(), is(false));
assertThat(rwResults.getRenderPosition(), is(equalTo("test")));
assertThat(rwResults.getRenderOrder(), is(1));
- assertThat(rwResults.getWidgetRepository(), is(nullValue()));
assertThat(rwResults.getRegion(), is(nullValue()));
}//end convertRegion_valid
@Test
public void convertWidget_NullPreferences(){
- MongoDbRegionWidget rw = new MongoDbRegionWidget();
- MongoDbRegionWidget rwResults;
-
- rw.setWidgetId(1234L);
- Widget widget = new WidgetImpl(3333L);
+ RegionWidgetImpl rw = new RegionWidgetImpl();
+ RegionWidgetImpl rwResults;
- rw.setWidget(widget);
+ rw.setWidgetId("1234L");
rw.setLocked(false);
rw.setCollapsed(false);
rw.setHideChrome(false);
@@ -239,7 +211,7 @@ public class MongoDbPageConverterTest {
rwResults = converter.convert(rw);
- assertThat(rwResults.getWidgetId(), is(equalTo(3333L)));
+ assertThat(rwResults.getWidgetId(), is(equalTo("1234L")));
assertNotNull(rwResults.getId());
assertNotNull(rwResults.getPreferences());
assertThat(rwResults.isCollapsed(), is(false));
@@ -247,7 +219,6 @@ public class MongoDbPageConverterTest {
assertThat(rwResults.isLocked(), is(false));
assertThat(rwResults.getRenderPosition(), is(equalTo("test")));
assertThat(rwResults.getRenderOrder(), is(1));
- assertThat(rwResults.getWidgetRepository(), is(nullValue()));
assertThat(rwResults.getRegion(), is(nullValue()));
}
@@ -261,29 +232,29 @@ public class MongoDbPageConverterTest {
region1.setRegionWidgets(Lists.<RegionWidget>newLinkedList());
region2.setRegionWidgets(Lists.<RegionWidget>newLinkedList());
- RegionWidget rw1 = new MongoDbRegionWidget();
+ RegionWidget rw1 = new RegionWidgetImpl();
region1.getRegionWidgets().add(rw1);
- RegionWidget rw2 = new MongoDbRegionWidget();
+ RegionWidget rw2 = new RegionWidgetImpl();
region2.getRegionWidgets().add(rw2);
page.getRegions().add(region1);
page.getRegions().add(region2);
page.setMembers(Lists.<PageUser>newLinkedList());
- MongoDbPageUser member1 = new MongoDbPageUser();
+ PageUserImpl member1 = new PageUserImpl();
PageUser member2 = new PageUserImpl();
page.getMembers().add(member1);
page.getMembers().add(member2);
Region subRegion = new RegionImpl();
subRegion.setRegionWidgets(Lists.<RegionWidget>newLinkedList());
- RegionWidget subRegionWidget = new MongoDbRegionWidget();
+ RegionWidget subRegionWidget = new RegionWidgetImpl();
subRegion.getRegionWidgets().add(subRegionWidget);
page.setSubPages(Lists.<Page>newLinkedList());
MongoDbPage subPage1 = new MongoDbPage();
- MongoDbPageUser subMember = new MongoDbPageUser();
+ PageUserImpl subMember = new PageUserImpl();
subPage1.setMembers(Lists.<PageUser>newLinkedList());
subPage1.setRegions(Lists.<Region>newLinkedList());
subPage1.getMembers().add(subMember);
@@ -301,9 +272,8 @@ public class MongoDbPageConverterTest {
replay(pageLayoutRepository);
converter.hydrate(page);
- assertThat(page.getUserRepository(), is(sameInstance(userRepository)));
assertThat(page.getPageLayout(), is(sameInstance(pageLayout)));
- assertThat(page.getMembers().get(0), is(instanceOf(MongoDbPageUser.class)));
+ assertThat(page.getMembers().get(0), is(instanceOf(PageUserImpl.class)));
assertThat((MongoDbPage)region1.getPage(), is(sameInstance(page)));
assertThat((MongoDbPage)subPage1.getParentPage(), is(sameInstance(page)));
assertThat((MongoDbPage)subPage2.getParentPage(), is(sameInstance(page)));
@@ -314,13 +284,10 @@ public class MongoDbPageConverterTest {
@Test
public void hydrateWidgetRegion_valid() {
- MongoDbRegionWidget rw = new MongoDbRegionWidget();
- rw.setWidgetRepository(widgetRepository);
+ RegionWidgetImpl rw = new RegionWidgetImpl();
Region region = new RegionImpl();
converter.hydrate(rw, region);
-
- assertThat(rw.getWidgetRepository(), is(sameInstance(widgetRepository)));
assertThat(rw.getRegion(), is(sameInstance(region)));
}
@@ -333,11 +300,4 @@ public class MongoDbPageConverterTest {
assertThat(true, is(true));
}
- @Test
- public void hydrateUser_valid() {
- MongoDbPageUser user = new MongoDbPageUser();
- converter.hydrate(user);
- assertThat(user.getUserRepository(), is(sameInstance(userRepository)));
- }
-
}
Modified: rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverterTest.java?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverterTest.java (original)
+++ rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverterTest.java Fri Dec 28 17:43:23 2012
@@ -52,7 +52,6 @@ public class MongoDbPageTemplateConverte
widgetRepository = createMock(WidgetRepository.class);
pageTemplateConverter = new MongoDbPageTemplateConverter();
pageTemplateConverter.setPageLayoutRepository(pageLayoutRepository);
- pageTemplateConverter.setWidgetRepository(widgetRepository);
}
@Test
@@ -78,11 +77,11 @@ public class MongoDbPageTemplateConverte
ptRegion4
);
mongoDbPageTemplate.setPageTemplateRegions(pageTemplateRegions1);
- PageTemplateWidget widget1 = new MongoDbPageTemplateWidget();
- PageTemplateWidget widget2 = new MongoDbPageTemplateWidget();
- PageTemplateWidget widget3 = new MongoDbPageTemplateWidget();
- PageTemplateWidget widget4 = new MongoDbPageTemplateWidget();
- PageTemplateWidget widget5 = new MongoDbPageTemplateWidget();
+ PageTemplateWidget widget1 = new PageTemplateWidgetImpl();
+ PageTemplateWidget widget2 = new PageTemplateWidgetImpl();
+ PageTemplateWidget widget3 = new PageTemplateWidgetImpl();
+ PageTemplateWidget widget4 = new PageTemplateWidgetImpl();
+ PageTemplateWidget widget5 = new PageTemplateWidgetImpl();
PageTemplate template1 = new MongoDbPageTemplate();
PageTemplate template2 = new MongoDbPageTemplate();
@@ -117,11 +116,6 @@ public class MongoDbPageTemplateConverte
assertThat(mongoDbPageTemplate.getPageLayoutRepository(), is(sameInstance(pageLayoutRepository)));
assertThat((MongoDbPageTemplate) ptRegion1.getPageTemplate(), is(sameInstance(mongoDbPageTemplate)));
assertThat((MongoDbPageTemplate) ptRegion2.getPageTemplate(), is(sameInstance(mongoDbPageTemplate)));
- assertThat(((MongoDbPageTemplateWidget)widget1).getWidgetRepository(),is(sameInstance(widgetRepository)));
- assertThat(((MongoDbPageTemplateWidget)widget2).getWidgetRepository(),is(sameInstance(widgetRepository)));
- assertThat(((MongoDbPageTemplateWidget)widget3).getWidgetRepository(),is(sameInstance(widgetRepository)));
- assertThat(((MongoDbPageTemplateWidget)widget4).getWidgetRepository(),is(sameInstance(widgetRepository)));
- assertThat(((MongoDbPageTemplateWidget)widget5).getWidgetRepository(),is(sameInstance(widgetRepository)));
assertThat(widget1.getPageTemplateRegion(), is(sameInstance(ptRegion1)));
assertThat(widget2.getPageTemplateRegion(), is(sameInstance(ptRegion1)));
assertThat(widget3.getPageTemplateRegion(), is(sameInstance(ptRegion2)));
@@ -154,7 +148,7 @@ public class MongoDbPageTemplateConverte
MongoDbPageTemplate converted = pageTemplateConverter.convert(pageTemplate);
- assertNotNull(converted.getId());
+ assertNull(converted.getId());
assertNotNull(converted.getPageTemplateRegions());
assertNotNull(converted.getSubPageTemplates());
}
@@ -162,7 +156,7 @@ public class MongoDbPageTemplateConverte
private PageTemplateRegion createNewPageTemplateRegion() {
return new PageTemplateRegion() {
@Override
- public Long getId() {
+ public String getId() {
return null; //To change body of implemented methods use File | Settings | File Templates.
}
@@ -217,7 +211,7 @@ public class MongoDbPageTemplateConverte
MongoDbPageTemplate converted = pageTemplateConverter.convert(pageTemplate);
- assertNotNull(converted.getId());
+ assertNull(converted.getId());
}
@Test
@@ -230,45 +224,44 @@ public class MongoDbPageTemplateConverte
((MongoDbPageTemplate)mongoPageTemplate1).setPageLayoutRepository(tempPageLayoutRepository);
((MongoDbPageTemplate)mongoPageTemplate2).setPageLayoutRepository(tempPageLayoutRepository);
PageTemplateRegion pageTemplateRegion = new PageTemplateRegionImpl();
- PageTemplateWidget pageTemplateWidget = new MongoDbPageTemplateWidget();
- ((MongoDbPageTemplateWidget)pageTemplateWidget).setWidgetRepository(tempWidgetRepository);
+ PageTemplateWidget pageTemplateWidget = new PageTemplateWidgetImpl();
//the source PageTemplate tested in the first recursion
- ((MongoDbPageTemplate)mongoPageTemplate1).setId((long)1234);
+ ((MongoDbPageTemplate)mongoPageTemplate1).setId("1234");
mongoPageTemplate1.setName("Blah");
mongoPageTemplate1.setDescription("Blahty Blahty Blah");
mongoPageTemplate1.setPageType(PageType.get("user"));
MongoDbPageLayout mongoDbPageLayout1 = new MongoDbPageLayout();
- mongoDbPageLayout1.setId((long)7777);
+ mongoDbPageLayout1.setId("7777");
mongoDbPageLayout1.setCode("4321");
mongoPageTemplate1.setPageLayout(mongoDbPageLayout1);
- mongoPageTemplate1.setRenderSequence((long)9999);
+ mongoPageTemplate1.setRenderSequence(9999);
mongoPageTemplate1.setDefaultTemplate(true);
//the PageTemplate to be inserted into the subPageTemplates array, tested in the second recursion loop
- ((MongoDbPageTemplate)mongoPageTemplate2).setId((long)3232);
+ ((MongoDbPageTemplate)mongoPageTemplate2).setId("3232");
mongoPageTemplate2.setName("Yeah");
mongoPageTemplate2.setDescription("Yeah Yeah Ya");
mongoPageTemplate2.setPageType(PageType.get("user"));
MongoDbPageLayout mongoDbPageLayout2 = new MongoDbPageLayout();
- mongoDbPageLayout2.setId((long)8888);
+ mongoDbPageLayout2.setId("8888");
mongoDbPageLayout2.setCode("2345");
mongoPageTemplate2.setPageLayout(mongoDbPageLayout2);
- mongoPageTemplate2.setRenderSequence((long)8787);
+ mongoPageTemplate2.setRenderSequence(8787);
mongoPageTemplate2.setDefaultTemplate(true);
//the PageTemplateWidget to be add as a field to the pageTemplateWidgets array of the PageTemplateRegion
- ((MongoDbPageTemplateWidget)pageTemplateWidget).setId((long)3333);
+ ((PageTemplateWidgetImpl)pageTemplateWidget).setId("3333");
pageTemplateWidget.setHideChrome(true);
- pageTemplateWidget.setRenderSeq((long)3456);
+ pageTemplateWidget.setRenderSeq(3456);
Widget widget = new WidgetImpl();
- ((WidgetImpl)widget).setId((long)87623876);
- ((MongoDbPageTemplateWidget)pageTemplateWidget).setWidgetId((long)4444);
+ ((WidgetImpl)widget).setId("87623876");
+ ((PageTemplateWidgetImpl)pageTemplateWidget).setWidgetId("4444");
pageTemplateWidget.setLocked(true);
//the PageTemplateRegion to be converted
- ((PageTemplateRegionImpl)pageTemplateRegion).setId((long) 2929);
- pageTemplateRegion.setRenderSequence((long)56376);
+ ((PageTemplateRegionImpl)pageTemplateRegion).setId("2929");
+ pageTemplateRegion.setRenderSequence(56376);
pageTemplateRegion.setLocked(true);
//create and add subPageTemplate array to the first PageTemplate
@@ -291,7 +284,7 @@ public class MongoDbPageTemplateConverte
expect(tempPageLayoutRepository.getByPageLayoutCode("4321")).andReturn(mongoDbPageLayout1);
expect(tempPageLayoutRepository.getByPageLayoutCode("2345")).andReturn(mongoDbPageLayout2);
- expect(tempWidgetRepository.get(4444)).andReturn(widget);
+ expect(tempWidgetRepository.get("4444")).andReturn(widget);
replay(tempPageLayoutRepository, tempWidgetRepository);
MongoDbPageTemplate convertedTemplate = pageTemplateConverter.convert(mongoPageTemplate1);
@@ -341,7 +334,7 @@ public class MongoDbPageTemplateConverte
assertThat(widgetConverted.getId(), is(widgetSource.getId()));
assertThat(widgetConverted.isHideChrome(), is(widgetSource.isHideChrome()));
assertThat(widgetConverted.getRenderSeq(), is(widgetSource.getRenderSeq()));
- assertThat(((MongoDbPageTemplateWidget)widgetConverted).getWidgetId(), is(((MongoDbPageTemplateWidget)widgetSource).getWidgetId()));
+ assertThat(((PageTemplateWidgetImpl)widgetConverted).getWidgetId(), is(((PageTemplateWidgetImpl)widgetSource).getWidgetId()));
//assertNotNull(widgetConverted.getWidget());//This should test to make sure the WidgetId is set
assertThat(widgetConverted.isLocked(), is(widgetSource.isLocked()));
}
@@ -356,7 +349,6 @@ public class MongoDbPageTemplateConverte
PageTemplateWidget pageTemplateWidget = new PageTemplateWidgetImpl();
pageTemplateRegion.setPageTemplateWidgets(Arrays.asList(pageTemplateWidget));
source.setPageLayout(new PageLayoutImpl());
- pageTemplateWidget.setWidget(new WidgetImpl());
MongoDbPageTemplate converted = pageTemplateConverter.convert(source);
assertTrue(converted instanceof MongoDbPageTemplate);