You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by cg...@apache.org on 2012/10/29 05:00:05 UTC
svn commit: r1403166 [3/11] - in /rave/trunk: ./
rave-components/rave-commons/src/main/java/org/apache/rave/persistence/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache/rave/porta...
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java Mon Oct 29 03:59:56 2012
@@ -39,8 +39,8 @@ public class DefaultCategoryService impl
}
@Override
- public Category get(long entityId) {
- return categoryRepository.get(entityId);
+ public Category get(String id) {
+ return categoryRepository.get(id);
}
@@ -57,20 +57,20 @@ public class DefaultCategoryService impl
Date now = new Date();
category.setText(text);
category.setCreatedDate(now);
- category.setCreatedUser(createdUser);
+ category.setCreatedUserId(createdUser.getId());
category.setLastModifiedDate(now);
- category.setLastModifiedUser(createdUser);
+ category.setLastModifiedUserId(createdUser.getId());
categoryRepository.save(category);
return category;
}
@Override
@Transactional
- public Category update(long categoryId, String text, User lastModifiedUser) {
+ public Category update(String categoryId, String text, User lastModifiedUser) {
Category category = categoryRepository.get(categoryId);
category.setText(text);
category.setLastModifiedDate(new Date());
- category.setLastModifiedUser(lastModifiedUser);
+ category.setLastModifiedUserId(lastModifiedUser.getId());
categoryRepository.save(category);
return category;
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultOmdlService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultOmdlService.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultOmdlService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultOmdlService.java Mon Oct 29 03:59:56 2012
@@ -38,6 +38,7 @@ import org.apache.rave.portal.model.util
import org.apache.rave.portal.model.util.omdl.OmdlOutputAdapter;
import org.apache.rave.portal.service.OmdlService;
import org.apache.rave.portal.service.PageService;
+import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.service.WidgetService;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -67,19 +68,21 @@ public class DefaultOmdlService implemen
private PageService pageService;
private WidgetService widgetService;
+ private UserService userService;
public DefaultOmdlService(){}
@Autowired
- public DefaultOmdlService(PageService pageService, WidgetService widgetService){
+ public DefaultOmdlService(PageService pageService, WidgetService widgetService, UserService userService){
this.pageService = pageService;
this.widgetService = widgetService;
+ this.userService = userService;
}
@Override
- public OmdlOutputAdapter exportOmdl(long pageId, String omdlUrl) {
+ public OmdlOutputAdapter exportOmdl(String pageId, String omdlUrl) {
Page page = pageService.getPage(pageId);
- OmdlOutputAdapter omdl = new OmdlOutputAdapter();
+ OmdlOutputAdapter omdl = new OmdlOutputAdapter(widgetService, userService);
omdl.buildModel(page, omdlUrl, wookieUrl);
return omdl;
}
@@ -142,7 +145,7 @@ public class DefaultOmdlService implemen
return page;
}
- private void populateRegionWidgets(Page page, List<String> urlList, Long regionId ){
+ private void populateRegionWidgets(Page page, List<String> urlList, String regionId ){
Widget widget = null;
for (String widgetUrl : urlList){
widget = widgetService.getWidgetByUrl(widgetUrl);
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java Mon Oct 29 03:59:56 2012
@@ -54,7 +54,7 @@ public class DefaultPageService implemen
private final PageTemplateRepository pageTemplateRepository;
private final String defaultPageName;
- private final long MOVE_PAGE_DEFAULT_POSITION_INDEX = -1L;
+ private final String MOVE_PAGE_DEFAULT_POSITION_INDEX = "-1";
@Autowired
public DefaultPageService(PageRepository pageRepository,
@@ -76,18 +76,18 @@ public class DefaultPageService implemen
}
@Override
- public Page getPage(long pageId) {
+ public Page getPage(String pageId) {
return pageRepository.get(pageId);
}
@Override
- public List<Page> getAllUserPages(long userId) {
+ public List<Page> getAllUserPages(String userId) {
return pageRepository.getAllPages(userId, PageType.USER);
}
@Override
@Transactional
- public Page getPersonProfilePage(long userId) {
+ public Page getPersonProfilePage(String userId) {
List<Page> profilePages = pageRepository.getAllPages(userId, PageType.PERSON_PROFILE);
Page personPage = null;
if (profilePages.isEmpty()){
@@ -99,7 +99,7 @@ public class DefaultPageService implemen
}
@Override
- public Page getPageFromList(long pageId, List<Page> pages) {
+ public Page getPageFromList(String pageId, List<Page> pages) {
for(Page page: pages) {
if(page.getId().equals(pageId)){
return page;
@@ -122,7 +122,7 @@ public class DefaultPageService implemen
@Override
@Transactional
- public Page addNewDefaultUserPage(long userId) {
+ public Page addNewDefaultUserPage(String userId) {
User user = userService.getUserById(userId);
return addNewUserPage(user, defaultPageName, user.getDefaultPageLayout().getCode());
}
@@ -149,13 +149,13 @@ public class DefaultPageService implemen
long renderSequence = (parentPage.getSubPages() != null) ? parentPage.getSubPages().size() + 1 : 1;
Page page = new PageImpl();
page.setName(pageName);
- page.setOwner(user);
+ page.setOwnerId(user.getId());
page.setPageLayout(pageLayout);
page.setRegions(regions);
// set this as a "sub-page" page type
page.setPageType(PageType.SUB_PAGE);
- PageUser pageUser = new PageUserImpl(page.getOwner(), page, renderSequence);
+ PageUser pageUser = new PageUserImpl(page.getOwnerId(), page, renderSequence);
pageUser.setPageStatus(PageInvitationStatus.OWNER);
List<PageUser> members = new ArrayList<PageUser>();
members.add(pageUser);
@@ -180,7 +180,7 @@ public class DefaultPageService implemen
@Override
@Transactional
- public void deletePage(long pageId) {
+ public void deletePage(String pageId) {
User user = userService.getAuthenticatedUser();
// first delete the page
pageRepository.delete(pageRepository.get(pageId));
@@ -194,13 +194,13 @@ public class DefaultPageService implemen
@Override
@Transactional
- public int deletePages(long userId, PageType pageType) {
+ public int deletePages(String userId, PageType pageType) {
return pageRepository.deletePages(userId, pageType);
}
@Override
@Transactional
- public RegionWidget moveRegionWidget(long regionWidgetId, int newPosition, long toRegionId, long fromRegionId) {
+ public RegionWidget moveRegionWidget(String regionWidgetId, int newPosition, String toRegionId, String fromRegionId) {
Region target = getFromRepository(toRegionId, regionRepository);
// verify that the target Region and the RegionWidget are not locked and can be modified
RegionWidget regionWidget = regionWidgetRepository.get(regionWidgetId);
@@ -217,7 +217,7 @@ public class DefaultPageService implemen
@Override
@Transactional
- public RegionWidget moveRegionWidgetToPage(long regionWidgetId, long toPageId) {
+ public RegionWidget moveRegionWidgetToPage(String regionWidgetId, String toPageId) {
// Get the new page
Page toPage = getFromRepository(toPageId, pageRepository);
// Get the region widget
@@ -242,7 +242,7 @@ public class DefaultPageService implemen
@Override
@Transactional
- public Region removeWidgetFromPage(long regionWidgetId) {
+ public Region removeWidgetFromPage(String regionWidgetId) {
RegionWidget regionWidget = getFromRepository(regionWidgetId, regionWidgetRepository);
verifyRegionWidgetIsNotLocked(regionWidget);
regionWidgetRepository.delete(regionWidget);
@@ -251,7 +251,7 @@ public class DefaultPageService implemen
@Override
@Transactional
- public RegionWidget addWidgetToPage(long pageId, long widgetId) {
+ public RegionWidget addWidgetToPage(String pageId, String widgetId) {
Page page = getFromRepository(pageId, pageRepository);
Widget widget = getFromRepository(widgetId, widgetRepository);
Region region = page.getRegions().get(0);
@@ -261,7 +261,7 @@ public class DefaultPageService implemen
@Override
@Transactional
- public RegionWidget addWidgetToPageRegion(long pageId, long widgetId, long regionId) {
+ public RegionWidget addWidgetToPageRegion(String pageId, String widgetId, String regionId) {
Page page = getFromRepository(pageId, pageRepository);
Widget widget = getFromRepository(widgetId, widgetRepository);
for(Region region : page.getRegions()){
@@ -276,19 +276,19 @@ public class DefaultPageService implemen
@Override
@Transactional
- public Page movePage(long pageId, long moveAfterPageId) {
+ public Page movePage(String pageId, String moveAfterPageId) {
return doMovePage(pageId, moveAfterPageId);
}
@Override
@Transactional
- public Page movePageToDefault(long pageId) {
+ public Page movePageToDefault(String pageId) {
return doMovePage(pageId, MOVE_PAGE_DEFAULT_POSITION_INDEX);
}
@Override
@Transactional
- public Page updatePage(long pageId, String name, String pageLayoutCode) {
+ public Page updatePage(String pageId, String name, String pageLayoutCode) {
Page page = pageRepository.get(pageId);
PageLayout newLayout = pageLayoutRepository.getByPageLayoutCode(pageLayoutCode);
PageLayout curLayout = page.getPageLayout();
@@ -317,7 +317,7 @@ public class DefaultPageService implemen
}
@Transactional
- public Boolean clonePageForUser(long pageId, long userId, String pageName) {
+ public Boolean clonePageForUser(String pageId, String userId, String pageName) {
Widget widget = null;
Page page = getPage(pageId);
if(pageName == null || pageName.equals("null")){
@@ -328,7 +328,8 @@ public class DefaultPageService implemen
// populate all the widgets in cloned page from original
for(int i=0; i<page.getRegions().size(); i++){
for(int j=0; j<page.getRegions().get(i).getRegionWidgets().size(); j++){
- widget = page.getRegions().get(i).getRegionWidgets().get(j).getWidget();
+ String widgetId = page.getRegions().get(i).getRegionWidgets().get(j).getWidgetId();
+ widget = widgetRepository.get(widgetId);
addWidgetToPageRegion(clonedPage.getId(), widget.getId(), clonedPage.getRegions().get(i).getId());
}
}
@@ -344,10 +345,10 @@ public class DefaultPageService implemen
}
@Transactional
- public Boolean addMemberToPage(long pageId, long userId){
+ public Boolean addMemberToPage(String pageId, String userId){
Page page = getPage(pageId);
PageUser pageUser = new PageUserImpl();
- pageUser.setUser(userService.getUserById(userId));
+ pageUser.setUserId(userService.getUserById(userId).getId());
pageUser.setPage(page);
pageUser.setPageStatus(PageInvitationStatus.PENDING);
List<PageUser> thisUsersPages = pageRepository.getPagesForUser(userService.getUserById(userId).getId(), PageType.USER);
@@ -361,10 +362,10 @@ public class DefaultPageService implemen
}
@Transactional
- public Boolean removeMemberFromPage(long pageId, long userId){
+ public Boolean removeMemberFromPage(String pageId, String userId){
User user = userService.getAuthenticatedUser();
Page page = this.getPage(pageId);
- if(page.getOwner().equals(user)){
+ if(page.getOwnerId().equals(user.getId())){
// If I am the owner, this page has been cloned
// Declining a cloned page means there is no need to strip
// out this users pageUser object, instead remove the page itself
@@ -374,7 +375,7 @@ public class DefaultPageService implemen
}
PageUser pageUserToRemove = null;
for(PageUser pageUser : page.getMembers()){
- if(pageUser.getUser().getId().equals(userId)){
+ if(pageUser.getUserId().equals(userId)){
pageUserToRemove = pageUser;
break;
}
@@ -392,10 +393,10 @@ public class DefaultPageService implemen
@Override
@Transactional
- public Boolean updateSharedPageStatus(long pageId, String shareStatus) {
+ public Boolean updateSharedPageStatus(String pageId, String shareStatus) {
Page page = this.getPage(pageId);
for(PageUser pageUser : page.getMembers()){
- if(pageUser.getUser().equals(userService.getAuthenticatedUser())){
+ if(pageUser.getUserId().equals(userService.getAuthenticatedUser())){
pageUser.setPageStatus(PageInvitationStatus.get(shareStatus));
}
}
@@ -408,10 +409,10 @@ public class DefaultPageService implemen
@Override
@Transactional
- public Boolean updatePageEditingStatus(long pageId, long userId, boolean isEditor) {
+ public Boolean updatePageEditingStatus(String pageId, String userId, boolean isEditor) {
Page page = this.getPage(pageId);
for(PageUser pageUser : page.getMembers()){
- if(pageUser.getUser().equals(userService.getUserById(userId))){
+ if(pageUser.getUserId().equals(userService.getUserById(userId))){
pageUser.setEditor(isEditor);
}
}
@@ -498,7 +499,7 @@ public class DefaultPageService implemen
private RegionWidget createWidgetInstance(Widget widget, Region region, int position) {
RegionWidget regionWidget = new RegionWidgetImpl();
regionWidget.setRenderOrder(position);
- regionWidget.setWidget(widget);
+ regionWidget.setWidgetId(widget.getId());
// TODO: setLocked and setHideChrome are hard-coded to false for new widgets manually added by users
// which makes sense for most default cases. However should we change them to a customizable property
// to allow for more flexibility?
@@ -510,12 +511,12 @@ public class DefaultPageService implemen
return persistedRegion.getRegionWidgets().get(position);
}
- private void moveWithinRegion(long regionWidgetId, int newPosition, Region target) {
+ private void moveWithinRegion(String regionWidgetId, int newPosition, Region target) {
replaceRegionWidget(regionWidgetId, newPosition, target, target);
updateRenderSequences(target.getRegionWidgets());
}
- private void moveBetweenRegions(long regionWidgetId, int newPosition, long fromRegion, Region target) {
+ private void moveBetweenRegions(String regionWidgetId, int newPosition, String fromRegion, Region target) {
Region source = getFromRepository(fromRegion, regionRepository);
replaceRegionWidget(regionWidgetId, newPosition, target, source);
updateRenderSequences(source.getRegionWidgets());
@@ -523,7 +524,7 @@ public class DefaultPageService implemen
regionRepository.save(source);
}
- private void replaceRegionWidget(long regionWidgetId, int newPosition, Region target, Region source) {
+ private void replaceRegionWidget(String regionWidgetId, int newPosition, Region target, Region source) {
RegionWidget widget = findRegionWidgetById(regionWidgetId, source.getRegionWidgets());
source.getRegionWidgets().remove(widget);
target.getRegionWidgets().add(newPosition, widget);
@@ -561,9 +562,9 @@ public class DefaultPageService implemen
long renderSequence = defaultUserPage.size() + 1;
page = new PageImpl();
page.setName(pageName);
- page.setOwner(user);
+ page.setOwnerId(user.getId());
page.setPageLayout(pageLayout);
- PageUser pageUser = new PageUserImpl(page.getOwner(), page, renderSequence);
+ PageUser pageUser = new PageUserImpl(page.getOwnerId(), page, renderSequence);
pageUser.setPageStatus(PageInvitationStatus.OWNER);
pageUser.setEditor(true);
@@ -590,7 +591,7 @@ public class DefaultPageService implemen
}
}
- private Page doMovePage(long pageId, long moveAfterPageId) {
+ private Page doMovePage(String pageId, String moveAfterPageId) {
// get the logged in user
User user = userService.getAuthenticatedUser();
// get the page to move and the page to move after
@@ -620,7 +621,7 @@ public class DefaultPageService implemen
return movingPageUser.getPage();
}
- private static <T> T getFromRepository(long id, Repository<T> repo) {
+ private static <T> T getFromRepository(String id, Repository<T> repo) {
T object = repo.get(id);
if (object == null) {
throw new IllegalArgumentException("Could not find object of given id in " + repo.getClass().getSimpleName());
@@ -636,7 +637,7 @@ public class DefaultPageService implemen
}
}
- private static RegionWidget findRegionWidgetById(Long id, List<RegionWidget> regionWidgets) {
+ private static RegionWidget findRegionWidgetById(String id, List<RegionWidget> regionWidgets) {
for (RegionWidget widget : regionWidgets) {
if (widget.getId().equals(id)) {
return widget;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java Mon Oct 29 03:59:56 2012
@@ -44,7 +44,7 @@ public class DefaultRegionWidgetService
}
@Override
- public RegionWidget getRegionWidget(long regionWidgetId) {
+ public RegionWidget getRegionWidget(String regionWidgetId) {
return regionWidgetRepository.get(regionWidgetId);
}
@@ -57,7 +57,7 @@ public class DefaultRegionWidgetService
@Override
@Synchronized(discriminator = "'RegionWidget'", id = "#regionWidgetId")
@Transactional
- public List<RegionWidgetPreference> saveRegionWidgetPreferences(long regionWidgetId,
+ public List<RegionWidgetPreference> saveRegionWidgetPreferences(String regionWidgetId,
List<RegionWidgetPreference> preferences) {
RegionWidget regionWidget = this.getValidRegionWidget(regionWidgetId);
ModelUtils.normalizeRegionWidgetPreferences(regionWidgetId, preferences);
@@ -68,7 +68,7 @@ public class DefaultRegionWidgetService
@Override
@Synchronized(discriminator = "'RegionWidget'", id = "#regionWidgetId")
@Transactional
- public RegionWidgetPreference saveRegionWidgetPreference(long regionWidgetId, RegionWidgetPreference preference) {
+ public RegionWidgetPreference saveRegionWidgetPreference(String regionWidgetId, RegionWidgetPreference preference) {
RegionWidget regionWidget = this.getValidRegionWidget(regionWidgetId);
ModelUtils.normalizeRegionWidgetPreference(regionWidgetId, preference);
reconcileRegionWidgetPreferences(regionWidget.getPreferences(), Arrays.asList(preference), false);
@@ -86,13 +86,13 @@ public class DefaultRegionWidgetService
@Override
@Transactional
- public RegionWidget saveRegionWidgetCollapsedState(long regionWidgetId, boolean collapsed) {
+ public RegionWidget saveRegionWidgetCollapsedState(String regionWidgetId, boolean collapsed) {
RegionWidget regionWidget = getValidRegionWidget(regionWidgetId);
regionWidget.setCollapsed(collapsed);
return saveRegionWidget(regionWidget);
}
- private RegionWidget getValidRegionWidget(long regionWidgetId) {
+ private RegionWidget getValidRegionWidget(String regionWidgetId) {
RegionWidget regionWidget = this.getRegionWidget(regionWidgetId);
if (regionWidget == null) {
throw new IllegalArgumentException("Invalid RegionWidget ID");
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java Mon Oct 29 03:59:56 2012
@@ -24,6 +24,7 @@ import org.apache.rave.portal.repository
import org.apache.rave.portal.service.TagService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -39,7 +40,7 @@ public class DefaultTagService implement
}
@Override
- public Tag getTagById(long entityId) {
+ public Tag getTagById(String entityId) {
return repository.get(entityId);
}
@@ -56,11 +57,17 @@ public class DefaultTagService implement
}
@Override
- public List<Tag> getAvailableTagsByWidgetId(Long widgetId) {
-
- return repository.getAvailableTagsByWidgetId(widgetId);
-
+ @Transactional
+ public Tag save(Tag tag) {
+ return repository.save(tag);
}
+// @Override
+// public List<Tag> getAvailableTagsByWidgetId(String widgetId) {
+//
+// return repository.getAvailableTagsByWidgetId(widgetId);
+//
+// }
+
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java Mon Oct 29 03:59:56 2012
@@ -20,26 +20,12 @@
package org.apache.rave.portal.service.impl;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.commons.lang.StringUtils;
import org.apache.rave.portal.model.PageType;
import org.apache.rave.portal.model.Person;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.util.SearchResult;
-import org.apache.rave.portal.repository.CategoryRepository;
-import org.apache.rave.portal.repository.PageRepository;
-import org.apache.rave.portal.repository.PageTemplateRepository;
-import org.apache.rave.portal.repository.PersonRepository;
-import org.apache.rave.portal.repository.UserRepository;
-import org.apache.rave.portal.repository.WidgetCommentRepository;
-import org.apache.rave.portal.repository.WidgetRatingRepository;
-import org.apache.rave.portal.repository.WidgetRepository;
+import org.apache.rave.portal.repository.*;
import org.apache.rave.portal.service.EmailService;
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
@@ -60,6 +46,8 @@ import org.springframework.security.open
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.*;
+
/**
*
*/
@@ -70,8 +58,6 @@ public class DefaultUserService implemen
private final UserRepository userRepository;
private final PageRepository pageRepository;
private final PageTemplateRepository pageTemplateRepository;
- private final WidgetRatingRepository widgetRatingRepository;
- private final WidgetCommentRepository widgetCommentRepository;
private final WidgetRepository widgetRepository;
private final CategoryRepository categoryRepository;
private final PersonRepository personRepository;
@@ -115,16 +101,12 @@ public class DefaultUserService implemen
@Autowired
public DefaultUserService(PageRepository pageRepository,
UserRepository userRepository,
- WidgetRatingRepository widgetRatingRepository,
- WidgetCommentRepository widgetCommentRepository,
WidgetRepository widgetRepository,
PageTemplateRepository pageTemplateRepository,
CategoryRepository categoryRepository,
PersonRepository personRepository) {
this.userRepository = userRepository;
this.pageRepository = pageRepository;
- this.widgetRatingRepository = widgetRatingRepository;
- this.widgetCommentRepository = widgetCommentRepository;
this.widgetRepository = widgetRepository;
this.pageTemplateRepository = pageTemplateRepository;
this.categoryRepository = categoryRepository;
@@ -153,7 +135,7 @@ public class DefaultUserService implemen
}
@Override
- public void setAuthenticatedUser(long userId) {
+ public void setAuthenticatedUser(String userId) {
final User user = userRepository.get(userId);
if (user == null) {
throw new UsernameNotFoundException("User with id '" + userId + "' was not found!");
@@ -207,7 +189,7 @@ public class DefaultUserService implemen
}
@Override
- public User getUserById(Long id) {
+ public User getUserById(String id) {
return userRepository.get(id);
}
@@ -255,7 +237,7 @@ public class DefaultUserService implemen
@Override
@Transactional
// TODO RAVE-300: add security check that is is called by admin or the user itself
- public void deleteUser(Long userId) {
+ public void deleteUser(String userId) {
log.info("about to delete userId: " + userId);
User user = userRepository.get(userId);
if (user == null) {
@@ -270,9 +252,9 @@ public class DefaultUserService implemen
// delete all person pages
int numDeletedPersonPages = pageRepository.deletePages(userId, PageType.PERSON_PROFILE);
// delete all the widget comments
- int numWidgetComments = widgetCommentRepository.deleteAll(userId);
+ int numWidgetComments = widgetRepository.deleteAllWidgetComments(userId);
// delete all the widget ratings
- int numWidgetRatings = widgetRatingRepository.deleteAll(userId);
+ int numWidgetRatings = widgetRepository.deleteAllWidgetRatings(userId);
// unassign the user from any widgets where they were the owner
int numWidgetsOwned = widgetRepository.unassignWidgetOwner(userId);
// unassign the user from any category records they created or modified
@@ -286,7 +268,7 @@ public class DefaultUserService implemen
}
@Override
- public List<Person> getAllByAddedWidget(long widgetId) {
+ public List<Person> getAllByAddedWidget(String widgetId) {
List<Person> persons = new ArrayList<Person>();
List<User> users = userRepository.getAllByAddedWidget(widgetId);
for (User u : users) {
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java Mon Oct 29 03:59:56 2012
@@ -1,4 +1,5 @@
/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -217,7 +218,7 @@ public class DefaultWidgetMarketplaceSer
public Widget addWidget(Widget widget) throws Exception{
PortalPreference status = portalPreferenceService.getPreference(PortalPreferenceKeys.INITIAL_WIDGET_STATUS);
User user = userService.getAuthenticatedUser();
- widget.setOwner(user);
+ widget.setOwnerId(user.getId());
if (status != null && status.getValue().equals("PUBLISHED")){
widget.setWidgetStatus(WidgetStatus.PUBLISHED);
} else {
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java Mon Oct 29 03:59:56 2012
@@ -21,10 +21,7 @@ package org.apache.rave.portal.service.i
import org.apache.commons.lang.StringUtils;
import org.apache.rave.exception.DuplicateItemException;
-import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.model.Widget;
-import org.apache.rave.portal.model.WidgetStatus;
+import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.model.util.WidgetStatistics;
import org.apache.rave.portal.repository.CategoryRepository;
@@ -35,6 +32,7 @@ import org.springframework.beans.factory
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -87,7 +85,7 @@ public class DefaultWidgetService implem
}
@Override
- public Widget getWidget(long id) {
+ public Widget getWidget(String id) {
return widgetRepository.get(id);
}
@@ -123,7 +121,7 @@ public class DefaultWidgetService implem
}
@Override
- public SearchResult<Widget> getWidgetsByOwner(Long ownerId, int offset, int pageSize) {
+ public SearchResult<Widget> getWidgetsByOwner(String ownerId, int offset, int pageSize) {
final User user = userRepository.get(ownerId);
final int count = widgetRepository.getCountByOwner(user, offset, pageSize);
final List<Widget> widgets = widgetRepository.getByOwner(user, offset, pageSize);
@@ -153,12 +151,12 @@ public class DefaultWidgetService implem
}
@Override
- public WidgetStatistics getWidgetStatistics(long widgetId, long userId) {
+ public WidgetStatistics getWidgetStatistics(String widgetId, String userId) {
return widgetRepository.getWidgetStatistics(widgetId, userId);
}
@Override
- public Map<Long, WidgetStatistics> getAllWidgetStatistics(long userId) {
+ public Map<String, WidgetStatistics> getAllWidgetStatistics(String userId) {
return widgetRepository.getAllWidgetStatistics(userId);
}
@@ -180,11 +178,105 @@ public class DefaultWidgetService implem
}
@Override
- public SearchResult<Widget> getWidgetsByCategory(long categoryId, int offset, int pageSize) {
- List<Widget> widgets = categoryRepository.get(categoryId).getWidgets();
+ public SearchResult<Widget> getWidgetsByCategory(String categoryId, int offset, int pageSize) {
+ Category category = categoryRepository.get(categoryId);
+ if (category == null) {
+ return new SearchResult<Widget>(new ArrayList<Widget>(), 0);
+ }
+
+ List<Widget> widgets = category.getWidgets();
SearchResult<Widget> searchResult = new SearchResult<Widget>(widgets, widgets.size());
searchResult.setOffset(offset);
searchResult.setPageSize(pageSize);
return searchResult;
}
+
+ @Override
+ public WidgetTag getWidgetTag(String id) {
+ return widgetRepository.getTagById(id);
+ }
+
+
+ @Override
+ @Transactional
+ public WidgetTag createWidgetTag(String widgetId, WidgetTag widgetTag) {
+ return widgetRepository.saveWidgetTag(widgetId, widgetTag);
+ }
+
+ @Override
+ public WidgetTag getWidgetTagByWidgetIdAndKeyword(String widgetId, String keyword) {
+ return widgetRepository.getTagByWidgetIdAndKeyword(widgetId, keyword);
+ }
+
+ // ***************************************************************************************************************
+ // Widget Comment Methods
+ // ***************************************************************************************************************
+
+ @Override
+ public WidgetComment getWidgetComment(String widgetId, String commentId) {
+ return widgetRepository.getCommentById(widgetId, commentId);
+ }
+
+ @Override
+ @Transactional
+ public void createWidgetComment(String widgetId, WidgetComment widgetComment) {
+ widgetRepository.createWidgetComment(widgetId, widgetComment);
+ }
+
+ @Override
+ @Transactional
+ public void updateWidgetComment(String widgetId, WidgetComment widgetComment) {
+ widgetRepository.updateWidgetComment(widgetId, widgetComment);
+ }
+
+ @Override
+ @Transactional
+ public void removeWidgetComment(String widgetId, String commentId) {
+ widgetRepository.deleteWidgetComment(widgetId, getWidgetComment(widgetId, commentId));
+ }
+
+ @Override
+ @Transactional
+ public int deleteAllWidgetComments(String userId) {
+ return widgetRepository.deleteAllWidgetComments(userId);
+ }
+
+ @Override
+ public WidgetRating getWidgetRatingByWidgetIdAndUserId(String widgetId, String userId) {
+ return widgetRepository.getWidgetRatingsByWidgetIdAndUserId(widgetId, userId);
+ }
+
+ @Override
+ @Transactional
+ public void updateWidgetRatingScore(String widgetId, WidgetRating widgetRating, Integer score) {
+ widgetRating.setScore(score);
+ widgetRepository.updateWidgetRating(widgetId, widgetRating);
+ }
+
+ @Override
+ @Transactional
+ public void saveWidgetRating(String widgetId, WidgetRating rating) {
+ WidgetRating existingRating = getWidgetRatingByWidgetIdAndUserId(widgetId, rating.getUserId());
+ if (existingRating == null) {
+ widgetRepository.createWidgetRating(widgetId, rating);
+ } else {
+ updateWidgetRatingScore(widgetId, existingRating, rating.getScore());
+ }
+ }
+
+ @Override
+ @Transactional
+ public void removeWidgetRating(String widgetId, String userId) {
+ WidgetRating widgetRating = widgetRepository.getWidgetRatingsByWidgetIdAndUserId(widgetId, userId);
+ if (widgetRating == null) {
+ return;
+ }
+ widgetRepository.deleteWidgetRating(widgetId, widgetRating);
+ }
+
+ @Override
+ @Transactional
+ public int removeAllWidgetRatings(String userId) {
+ return widgetRepository.deleteAllWidgetRatings(userId);
+ }
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/impl/DefaultRenderService.java Mon Oct 29 03:59:56 2012
@@ -21,6 +21,8 @@ package org.apache.rave.portal.web.rende
import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.portal.model.RegionWidget;
+import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.repository.WidgetRepository;
import org.apache.rave.portal.web.renderer.model.RenderContext;
import org.apache.rave.portal.web.renderer.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,10 +41,13 @@ public class DefaultRenderService implem
private final Map<String, RegionWidgetRenderer> supportedWidgets;
+ private final WidgetRepository widgetRepository;
+
@Autowired
- public DefaultRenderService(List<RegionWidgetRenderer> widgetRenderers) {
+ public DefaultRenderService(List<RegionWidgetRenderer> widgetRenderers, WidgetRepository widgetRepository) {
this.supportedWidgets = new HashMap<String, RegionWidgetRenderer>();
mapRenderersByType(this.supportedWidgets, widgetRenderers);
+ this.widgetRepository = widgetRepository;
}
@Override
@@ -51,21 +56,22 @@ public class DefaultRenderService implem
}
/**
- * Renders the given widget iff there is a {@link org.apache.rave.portal.web.renderer.RegionWidgetRenderer } for the
- * widget type
+ * Renders the given rw iff there is a {@link org.apache.rave.portal.web.renderer.RegionWidgetRenderer } for the
+ * rw type
*
- * @param widget widget to renderer
+ * @param rw RegionWidget to renderer
* @param context
* @return the String representation of the rendered RegionWidget
* @throws {@link org.apache.rave.exception.NotSupportedException}
*/
@Override
- public String render(RegionWidget widget, RenderContext context) {
- RegionWidgetRenderer renderer = supportedWidgets.get(widget.getWidget().getType());
+ public String render(RegionWidget rw, RenderContext context) {
+ Widget widget = widgetRepository.get(rw.getWidgetId());
+ RegionWidgetRenderer renderer = supportedWidgets.get(widget.getType());
if(renderer == null) {
- throw new NotSupportedException(widget.getWidget().getType() + " is not supported");
+ throw new NotSupportedException(widget.getType() + " is not supported");
}
- return renderer.render(widget, context);
+ return renderer.render(rw, context);
}
private static <T extends Renderer> void mapRenderersByType(Map<String, T> map, List<T> renderers) {
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java Mon Oct 29 03:59:56 2012
@@ -29,7 +29,7 @@ import java.util.List;
import static org.junit.Assert.assertTrue;
public class ModelUtilsTest {
- long VALID_REGION_WIDGET_ID = 1L;
+ String VALID_REGION_WIDGET_ID = "1";
@Test
public void normalizeRegionWidgetPreference() {
@@ -50,7 +50,7 @@ public class ModelUtilsTest {
public List<RegionWidgetPreference> getTestRegionWidgetPreferences() {
return Arrays.asList((RegionWidgetPreference)new RegionWidgetPreferenceImpl( null, "camelCaseName", "FOO"),
- (RegionWidgetPreference)new RegionWidgetPreferenceImpl(20L, "lowercasename", "FOO"),
- (RegionWidgetPreference)new RegionWidgetPreferenceImpl( -100L, "UPPERCASENAME", "FOO"));
+ (RegionWidgetPreference)new RegionWidgetPreferenceImpl("20", "lowercasename", "FOO"),
+ (RegionWidgetPreference)new RegionWidgetPreferenceImpl( "-100", "UPPERCASENAME", "FOO"));
}
}
\ No newline at end of file
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java Mon Oct 29 03:59:56 2012
@@ -49,8 +49,8 @@ public class DefaultCategoryPermissionEv
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthorities;
- private final Long VALID_WIDGET_CATEGORY_ID = 22L;
- private final Long VALID_USER_ID = 99L;
+ private final String VALID_WIDGET_CATEGORY_ID = "22";
+ private final String VALID_USER_ID = "99";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
@@ -68,7 +68,7 @@ public class DefaultCategoryPermissionEv
category = new CategoryImpl();
category.setId(VALID_WIDGET_CATEGORY_ID);
- category.setCreatedUser(user);
+ category.setCreatedUserId(VALID_USER_ID);
grantedAuthorities = new ArrayList<GrantedAuthority>();
grantedAuthorities.add(new SimpleGrantedAuthority("ROLE_USER"));
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java Mon Oct 29 03:59:56 2012
@@ -53,45 +53,47 @@ public class DefaultPagePermissionEvalua
private UserImpl user, user2;
private List<GrantedAuthority> grantedAuthoritiesList;
- private final Long VALID_USER_ID = 99L;
+ private final String VALID_USER_ID = "99";
+ private final String VALID_USER_ID2 = "66";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
- private final Long VALID_PAGE_ID = 3L;
- private final Long VALID_PAGE_ID2 = 77L;
- private final Long VALID_PAGE_ID3 = 177L;
- private final Long VALID_PAGE_ID4 = 665L;
+ private final String VALID_PAGE_ID = "3";
+ private final String VALID_PAGE_ID2 = "77";
+ private final String VALID_PAGE_ID3 = "177";
+ private final String VALID_PAGE_ID4 = "665";
@Before
public void setUp() {
mockPageRepository = createMock(PageRepository.class);
mockAuthentication = createMock(Authentication.class);
- defaultPagePermissionEvaluator = new DefaultPagePermissionEvaluator(mockPageRepository);
+ defaultPagePermissionEvaluator = new DefaultPagePermissionEvaluator(mockPageRepository, null);
user = new UserImpl();
user.setUsername(VALID_USERNAME);
user.setId(VALID_USER_ID);
user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
+ user2.setId(VALID_USER_ID2);
page = new PageImpl();
page.setId(VALID_PAGE_ID);
- page.setOwner(user);
+ page.setOwnerId(user.getId());
page.setPageType(PageType.USER);
pageSubPage = new PageImpl();
pageSubPage.setId(VALID_PAGE_ID4);
- pageSubPage.setOwner(user);
+ pageSubPage.setOwnerId(user.getId());
pageSubPage.setPageType(PageType.SUB_PAGE);
pageSubPage.setParentPage(page);
personProfilePage = new PageImpl();
personProfilePage.setId(VALID_PAGE_ID2);
- personProfilePage.setOwner(user);
+ personProfilePage.setOwnerId(user.getId());
personProfilePage.setPageType(PageType.PERSON_PROFILE);
personProfileSubPage = new PageImpl();
personProfileSubPage.setId(VALID_PAGE_ID3);
- personProfileSubPage.setOwner(user);
+ personProfileSubPage.setOwnerId(user.getId());
personProfileSubPage.setPageType(PageType.PERSON_PROFILE);
personProfileSubPage.setParentPage(personProfilePage);
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java Mon Oct 29 03:59:56 2012
@@ -50,16 +50,17 @@ public class DefaultRegionPermissionEval
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthoritiesList;
- private final Long VALID_REGION_ID = 1L;
- private final Long VALID_PAGE_ID = 3L;
- private final Long VALID_USER_ID = 99L;
+ private final String VALID_REGION_ID = "1";
+ private final String VALID_PAGE_ID = "3";
+ private final String VALID_USER_ID = "99";
+ private final String VALID_USER_ID2 = "66";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
@Before
public void setUp() {
mockRegionRepository = createMock(RegionRepository.class);
- defaultRegionPermissionEvaluator = new DefaultRegionPermissionEvaluator(mockRegionRepository);
+ defaultRegionPermissionEvaluator = new DefaultRegionPermissionEvaluator(mockRegionRepository, null);
mockAuthentication = createMock(Authentication.class);
user = new UserImpl();
@@ -67,11 +68,11 @@ public class DefaultRegionPermissionEval
user.setId(VALID_USER_ID);
user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
+ user2.setId(VALID_USER_ID2);
page = new PageImpl();
page.setId(VALID_PAGE_ID);
- page.setOwner(user);
- region = new RegionImpl();
- region.setId(VALID_REGION_ID);
+ page.setOwnerId(user.getId());
+ region = new RegionImpl(VALID_REGION_ID);
region.setPage(page);
grantedAuthoritiesList = new ArrayList<GrantedAuthority>();
grantedAuthoritiesList.add(new SimpleGrantedAuthority("ROLE_USER"));
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java Mon Oct 29 03:59:56 2012
@@ -53,17 +53,18 @@ public class DefaultRegionWidgetPermissi
private UserImpl user, user2;
private List<GrantedAuthority> grantedAuthoritiesList;
- private final Long VALID_REGION_ID = 1L;
- private final Long VALID_REGION_WIDGET_ID = 1L;
- private final Long VALID_PAGE_ID = 3L;
- private final Long VALID_USER_ID = 99L;
+ private final String VALID_REGION_ID = "1";
+ private final String VALID_REGION_WIDGET_ID = "1";
+ private final String VALID_PAGE_ID = "3";
+ private final String VALID_USER_ID = "99";
+ private final String VALID_USER_ID2 = "66";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
@Before
public void setUp() {
mockRegionWidgetRepository = createMock(RegionWidgetRepository.class);
- defaultRegionWidgetPermissionEvaluator = new DefaultRegionWidgetPermissionEvaluator(mockRegionWidgetRepository);
+ defaultRegionWidgetPermissionEvaluator = new DefaultRegionWidgetPermissionEvaluator(mockRegionWidgetRepository, null);
mockAuthentication = createMock(Authentication.class);
user = new UserImpl();
@@ -71,14 +72,13 @@ public class DefaultRegionWidgetPermissi
user.setId(VALID_USER_ID);
user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
+ user2.setId(VALID_USER_ID2);
page = new PageImpl();
page.setId(VALID_PAGE_ID);
- page.setOwner(user);
- region = new RegionImpl();
- region.setId(VALID_REGION_ID);
+ page.setOwnerId(user.getId());
+ region = new RegionImpl(VALID_REGION_ID);
region.setPage(page);
- regionWidget = new RegionWidgetImpl();
- regionWidget.setId(VALID_REGION_WIDGET_ID);
+ regionWidget = new RegionWidgetImpl(VALID_REGION_WIDGET_ID);
regionWidget.setRegion(region);
grantedAuthoritiesList = new ArrayList<GrantedAuthority>();
grantedAuthoritiesList.add(new SimpleGrantedAuthority("ROLE_USER"));
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java Mon Oct 29 03:59:56 2012
@@ -18,7 +18,7 @@ package org.apache.rave.portal.security.
import org.apache.rave.portal.model.WidgetComment;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.impl.WidgetCommentImpl;
-import org.apache.rave.portal.repository.WidgetCommentRepository;
+import org.apache.rave.portal.repository.WidgetRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator.Permission;
import org.apache.rave.portal.security.util.AuthenticationUtils;
import org.easymock.EasyMock;
@@ -42,23 +42,23 @@ import static org.junit.Assert.assertTha
public class DefaultWidgetCommentPermissionEvaluatorTest {
private DefaultWidgetCommentPermissionEvaluator defaultWidgetCommentPermissionEvaluator;
- private WidgetCommentRepository mockWidgetCommentRepository;
+ private WidgetRepository widgetRepository;
private Authentication mockAuthentication;
private WidgetComment widgetComment;
private UserImpl user, user2;
private List<GrantedAuthority> grantedAuthoritiesList;
- private final Long VALID_COMMENT_ID = 3L;
- private final Long VALID_USER_ID = 99L;
- private final Long INVALID_USER_ID = VALID_USER_ID + 1;
+ private final String VALID_COMMENT_ID = "3";
+ private final String VALID_USER_ID = "99";
+ private final String INVALID_USER_ID = VALID_USER_ID + 1;
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
@Before
public void setUp() {
- mockWidgetCommentRepository = createMock(WidgetCommentRepository.class);
+ widgetRepository = createMock(WidgetRepository.class);
mockAuthentication = createMock(Authentication.class);
- defaultWidgetCommentPermissionEvaluator = new DefaultWidgetCommentPermissionEvaluator(mockWidgetCommentRepository);
+ defaultWidgetCommentPermissionEvaluator = new DefaultWidgetCommentPermissionEvaluator(widgetRepository);
user = new UserImpl();
user.setUsername(VALID_USERNAME);
@@ -66,9 +66,8 @@ public class DefaultWidgetCommentPermiss
user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
user2.setId(INVALID_USER_ID);
- widgetComment = new WidgetCommentImpl();
- widgetComment.setId(VALID_COMMENT_ID);
- widgetComment.setUser(user);
+ widgetComment = new WidgetCommentImpl(VALID_COMMENT_ID);
+ widgetComment.setUserId(VALID_USER_ID);
grantedAuthoritiesList = new ArrayList<GrantedAuthority>();
grantedAuthoritiesList.add(new SimpleGrantedAuthority("ROLE_USER"));
}
@@ -108,8 +107,8 @@ public class DefaultWidgetCommentPermiss
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList).anyTimes();
expect(mockAuthentication.getPrincipal()).andReturn(user).anyTimes();
replay(mockAuthentication);
- expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
- replay(mockWidgetCommentRepository);
+ expect(widgetRepository.getCommentById(null, VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
+ replay(widgetRepository);
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.ADMINISTER), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.CREATE), is(true));
@@ -118,7 +117,7 @@ public class DefaultWidgetCommentPermiss
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.UPDATE), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.CREATE_OR_UPDATE), is(true));
verify(mockAuthentication);
- verify(mockWidgetCommentRepository);
+ verify(widgetRepository);
}
@Test
@@ -126,18 +125,18 @@ public class DefaultWidgetCommentPermiss
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList).anyTimes();
expect(mockAuthentication.getPrincipal()).andReturn(user2).anyTimes();
replay(mockAuthentication);
- expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
- replay(mockWidgetCommentRepository);
+ expect(widgetRepository.getCommentById(null, VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
+ replay(widgetRepository);
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.ADMINISTER), is(false));
- assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.CREATE), is(false));
+ assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.CREATE), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.READ), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.DELETE), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.UPDATE), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, widgetComment, Permission.CREATE_OR_UPDATE), is(false));
verify(mockAuthentication);
- verify(mockWidgetCommentRepository);
+ verify(widgetRepository);
}
@Test
@@ -145,8 +144,8 @@ public class DefaultWidgetCommentPermiss
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList).anyTimes();
expect(mockAuthentication.getPrincipal()).andReturn(user).anyTimes();
replay(mockAuthentication);
- expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
- replay(mockWidgetCommentRepository);
+ expect(widgetRepository.getCommentById(null, VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
+ replay(widgetRepository);
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.ADMINISTER), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE), is(true));
@@ -155,7 +154,7 @@ public class DefaultWidgetCommentPermiss
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.UPDATE), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE_OR_UPDATE), is(true));
verify(mockAuthentication);
- verify(mockWidgetCommentRepository);
+ verify(widgetRepository);
}
@Test
@@ -163,18 +162,18 @@ public class DefaultWidgetCommentPermiss
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList).anyTimes();
expect(mockAuthentication.getPrincipal()).andReturn(user2).anyTimes();
replay(mockAuthentication);
- expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
- replay(mockWidgetCommentRepository);
+ expect(widgetRepository.getCommentById(null, VALID_COMMENT_ID)).andReturn(widgetComment).anyTimes();
+ replay(widgetRepository);
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.ADMINISTER), is(false));
- assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE), is(false));
+ assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.READ), is(true));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.DELETE), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.UPDATE), is(false));
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, VALID_COMMENT_ID, WidgetComment.class.getName(), Permission.CREATE_OR_UPDATE), is(false));
verify(mockAuthentication);
- verify(mockWidgetCommentRepository);
+ verify(widgetRepository);
}
@Test
@@ -221,13 +220,13 @@ public class DefaultWidgetCommentPermiss
WidgetComment localWidgetComment = new WidgetCommentImpl();
UserImpl localUser = new UserImpl();
localUser.setId(VALID_USER_ID);
- localWidgetComment.setUser(localUser);
- expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(localWidgetComment).anyTimes();
- replay(mockWidgetCommentRepository);
+ localWidgetComment.setUserId(VALID_USER_ID);
+ expect(widgetRepository.getCommentById(null, VALID_COMMENT_ID)).andReturn(localWidgetComment).anyTimes();
+ replay(widgetRepository);
assertThat(defaultWidgetCommentPermissionEvaluator.hasPermission(mockAuthentication, localWidgetComment, Permission.CREATE), is(true));
verify(mockAuthentication);
- verify(mockWidgetCommentRepository);
+ verify(widgetRepository);
}
}
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java Mon Oct 29 03:59:56 2012
@@ -24,6 +24,7 @@ import org.apache.rave.portal.model.Widg
import org.apache.rave.portal.model.impl.PageImpl;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.impl.WidgetImpl;
+import org.apache.rave.portal.repository.TagRepository;
import org.apache.rave.portal.repository.WidgetRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator;
import org.apache.rave.portal.security.util.AuthenticationUtils;
@@ -45,22 +46,25 @@ import static org.junit.Assert.assertTha
public class DefaultWidgetPermissionEvaluatorTest {
private DefaultWidgetPermissionEvaluator defaultWidgetPermissionEvaluator;
private WidgetRepository mockWidgetRepository;
+ private TagRepository mockTagRepository;
private Page page;
private Widget widget, widget2;
private UserImpl user, user2;
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthoritiesList;
- private final Long VALID_WIDGET_ID = 1L;
- private final Long VALID_PAGE_ID = 3L;
- private final Long VALID_USER_ID = 99L;
+ private final String VALID_WIDGET_ID = "1";
+ private final String VALID_PAGE_ID = "3";
+ private final String VALID_USER_ID = "99";
+ private final String VALID_USER_ID2 = "66";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
@Before
public void setUp() {
mockWidgetRepository = createMock(WidgetRepository.class);
- defaultWidgetPermissionEvaluator = new DefaultWidgetPermissionEvaluator(mockWidgetRepository);
+ mockTagRepository = createMock(TagRepository.class);
+ defaultWidgetPermissionEvaluator = new DefaultWidgetPermissionEvaluator(mockWidgetRepository, mockTagRepository);
mockAuthentication = createMock(Authentication.class);
user = new UserImpl();
@@ -68,11 +72,12 @@ public class DefaultWidgetPermissionEval
user.setId(VALID_USER_ID);
user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
+ user2.setId(VALID_USER_ID2);
page = new PageImpl();
page.setId(VALID_PAGE_ID);
- page.setOwner(user);
+ page.setOwnerId(user.getId());
widget = new WidgetImpl(VALID_WIDGET_ID);
- widget.setOwner(user);
+ widget.setOwnerId(VALID_USER_ID);
widget.setWidgetStatus(WidgetStatus.PUBLISHED);
grantedAuthoritiesList = new ArrayList<GrantedAuthority>();
grantedAuthoritiesList.add(new SimpleGrantedAuthority("ROLE_USER"));
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java Mon Oct 29 03:59:56 2012
@@ -21,7 +21,7 @@ package org.apache.rave.portal.security.
import org.apache.rave.portal.model.WidgetRating;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.impl.WidgetRatingImpl;
-import org.apache.rave.portal.repository.WidgetRatingRepository;
+import org.apache.rave.portal.repository.WidgetRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator;
import org.apache.rave.portal.security.util.AuthenticationUtils;
import org.easymock.EasyMock;
@@ -42,28 +42,26 @@ import static org.junit.Assert.assertTha
public class DefaultWidgetRatingPermissionEvaluatorTest {
private DefaultWidgetRatingPermissionEvaluator defaultWidgetRatingPermissionEvaluator;
- private WidgetRatingRepository mockWidgetRatingRepository;
+ private WidgetRepository mockWidgetRatingRepository;
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthoritiesList;
private WidgetRating widgetRating;
private UserImpl user, user2;
- private final Long VALID_USER_ID = 99L;
- private final Long VALID_USER_ID2 = 100L;
+ private final String VALID_USER_ID = "99";
+ private final String VALID_USER_ID2 = "100";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
- private final Long VALID_WIDGET_ID = 1L;
- private final Long VALID_WIDGET_RATING_ID = 1L;
+ private final String VALID_WIDGET_ID = "1";
+ private final String VALID_WIDGET_RATING_ID = "1";
@Before
public void setUp() {
- mockWidgetRatingRepository = createMock(WidgetRatingRepository.class);
+ mockWidgetRatingRepository = createMock(WidgetRepository.class);
defaultWidgetRatingPermissionEvaluator = new DefaultWidgetRatingPermissionEvaluator(mockWidgetRatingRepository);
- widgetRating = new WidgetRatingImpl();
+ widgetRating = new WidgetRatingImpl(VALID_WIDGET_ID);
widgetRating.setUserId(VALID_USER_ID);
- widgetRating.setWidgetId(VALID_WIDGET_ID);
- widgetRating.setId(VALID_WIDGET_ID);
user = new UserImpl();
user.setUsername(VALID_USERNAME);
@@ -123,7 +121,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_3args_delete_isWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, widgetRating, ModelPermissionEvaluator.Permission.DELETE), is(true));
@@ -135,7 +133,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_3args_delete_isNotWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user2);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, widgetRating, ModelPermissionEvaluator.Permission.DELETE), is(false));
@@ -147,7 +145,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_3args_update_isWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, widgetRating, ModelPermissionEvaluator.Permission.UPDATE), is(true));
@@ -159,7 +157,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_3args_update_isNotWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user2);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, widgetRating, ModelPermissionEvaluator.Permission.UPDATE), is(false));
@@ -171,7 +169,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_3args_read_isWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, widgetRating, ModelPermissionEvaluator.Permission.READ), is(true));
@@ -183,7 +181,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_3args_read_isNotWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user2);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, widgetRating, ModelPermissionEvaluator.Permission.READ), is(false));
@@ -203,7 +201,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_create_isWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(true));
@@ -215,7 +213,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_create_isNotWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user2);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(false));
@@ -227,7 +225,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_delete_isWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.DELETE), is(true));
@@ -239,7 +237,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_delete_isNotWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user2);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.DELETE), is(false));
@@ -251,7 +249,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_read_isWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.READ), is(true));
@@ -263,7 +261,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_read_isNotWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user2);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.READ), is(false));
@@ -275,7 +273,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_update_isWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.UPDATE), is(true));
@@ -287,7 +285,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_update_isNotWidgetRatingOwner() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
expect(mockAuthentication.getPrincipal()).andReturn(user2);
- expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
+ expect(mockWidgetRatingRepository.getRatingById(null, VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.UPDATE), is(false));
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java Mon Oct 29 03:59:56 2012
@@ -52,9 +52,9 @@ public class DefaultAuthorityServiceTest
public void getAuthorityById() {
Authority authority = createAuthority();
- expect(repository.get(123L)).andReturn(authority);
+ expect(repository.get("123")).andReturn(authority);
replay(repository);
- Authority sAuthority = service.getAuthorityById(123L);
+ Authority sAuthority = service.getAuthorityById("123");
assertEquals(sAuthority, authority);
verify(repository);
@@ -84,7 +84,7 @@ public class DefaultAuthorityServiceTest
public void getAuthorityById_NotFound() {
AuthorityImpl authority = new AuthorityImpl();
authority.setAuthority("BAR");
- final long entityId = 456L;
+ final String entityId = "456";
expect(repository.get(entityId)).andReturn(null);
replay(repository);
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java?rev=1403166&r1=1403165&r2=1403166&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java Mon Oct 29 03:59:56 2012
@@ -43,17 +43,17 @@ public class DefaultCategoryServiceTest
private CategoryService service;
private CategoryRepository repository;
- private final Long VALID_ID = 4L;
+ private final String VALID_ID = "4";
private final String VALID_TEXT = "category1";
private final Date VALID_CREATED_DATE = new Date(66666666);
private final Date VALID_LAST_MODIFIED_DATE = new Date(77777777);
- private final Long VALID_CREATED_USER_ID = 77L;
- private final Long VALID_LAST_MODIFIED_USER_ID = 88L;
+ private final String VALID_CREATED_USER_ID = "77";
+ private final String VALID_LAST_MODIFIED_USER_ID = "88";
private User validCreatedUser;
private User validLastModifiedUser;
private Category validCategory;
- private final Long INVALID_ID = -999L;
+ private final String INVALID_ID = "-999";
@Before
public void setup() {
@@ -66,9 +66,9 @@ public class DefaultCategoryServiceTest
validCategory = new CategoryImpl();
validCategory.setId(VALID_ID);
validCategory.setText(VALID_TEXT);
- validCategory.setCreatedUser(validCreatedUser);
+ validCategory.setCreatedUserId(VALID_CREATED_USER_ID);
validCategory.setCreatedDate(VALID_CREATED_DATE);
- validCategory.setLastModifiedUser(validLastModifiedUser);
+ validCategory.setLastModifiedUserId(VALID_LAST_MODIFIED_USER_ID);
validCategory.setLastModifiedDate(VALID_LAST_MODIFIED_DATE);
}
@@ -114,8 +114,8 @@ public class DefaultCategoryServiceTest
assertThat(wc.getText(), is(NEW_CATEGORY_TEXT));
assertThat(wc.getCreatedDate(), is(notNullValue(Date.class)));
assertThat(wc.getCreatedDate(), is(wc.getLastModifiedDate()));
- assertThat(wc.getCreatedUser(), is(validCreatedUser));
- assertThat(wc.getLastModifiedUser(), is(validCreatedUser));
+ assertThat(wc.getCreatedUserId(), is(VALID_CREATED_USER_ID));
+ assertThat(wc.getLastModifiedUserId(), is(VALID_CREATED_USER_ID));
verify(repository);
}
@@ -127,8 +127,8 @@ public class DefaultCategoryServiceTest
Category expectedSaveCategory = new CategoryImpl();
expectedSaveCategory.setId(VALID_ID);
expectedSaveCategory.setText(UPDATED_TEXT);
- expectedSaveCategory.setCreatedUser(validCreatedUser);
- expectedSaveCategory.setLastModifiedUser(validLastModifiedUser);
+ expectedSaveCategory.setCreatedUserId(VALID_CREATED_USER_ID);
+ expectedSaveCategory.setLastModifiedUserId(VALID_LAST_MODIFIED_USER_ID);
expectedSaveCategory.setCreatedDate(VALID_CREATED_DATE);
expectedSaveCategory.setLastModifiedDate(VALID_LAST_MODIFIED_DATE);
@@ -139,8 +139,8 @@ public class DefaultCategoryServiceTest
Category updatedCategory = service.update(VALID_ID, UPDATED_TEXT, validLastModifiedUser);
assertThat(updatedCategory.getId(), is(VALID_ID));
assertThat(updatedCategory.getText(), is(UPDATED_TEXT));
- assertThat(updatedCategory.getCreatedUser(), is(validCreatedUser));
- assertThat(updatedCategory.getLastModifiedUser(), is(validLastModifiedUser));
+ assertThat(updatedCategory.getCreatedUserId(), is(VALID_CREATED_USER_ID));
+ assertThat(updatedCategory.getLastModifiedUserId(), is(VALID_LAST_MODIFIED_USER_ID));
assertThat(updatedCategory.getLastModifiedDate().after(updatedCategory.getCreatedDate()), is(true));
verify(repository);