Author: erinnp
Date: Tue Jul 30 19:31:43 2013
New Revision: 1508584
URL: http://svn.apache.org/r1508584
Log:
RAVE-1011: Update page service to support get all / get limited
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java?rev=1508584&r1=1508583&r2=1508584&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java
Tue Jul 30 19:31:43 2013
@@ -35,7 +35,7 @@ public interface PageRepository extends
* @param pageType the pageType to search by
* @return a list of all the Page objects owned by userId of type pageType
*/
- List<Page> getAllPages(String userId, PageType pageType);
+ List<Page> getAllPagesForUserType(String userId, PageType pageType);
/**
* Delete all pages for a userId of the supplied pageType
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java?rev=1508584&r1=1508583&r2=1508584&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
Tue Jul 30 19:31:43 2013
@@ -22,6 +22,7 @@ import org.apache.rave.model.Page;
import org.apache.rave.model.PageType;
import org.apache.rave.model.Region;
import org.apache.rave.model.RegionWidget;
+import org.apache.rave.portal.model.util.SearchResult;
import org.springframework.security.access.prepost.PostAuthorize;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -31,24 +32,41 @@ import java.util.List;
* @author carlucci
*/
public interface PageService {
+
+ /**
+ * Gets a list of all pages
+ *
+ * @return search results
+ */
+ SearchResult<Page> getAllPages();
+
+ /**
+ * Gets a limited list of pages
+ *
+ * @param offset integer offset from 0
+ * @param limit number of results to return
+ * @return search results
+ */
+ SearchResult<Page> getLimitedPages(int offset, int limit);
+
/**
* Gets a page based on the id
- *
+ *
* @param pageId to lookup
- * @return the Page object
+ * @return the Page object
*/
@PostAuthorize("hasPermission(returnObject, 'read')")
Page getPage(String pageId);
-
+
/**
* Gets all user pages for the given user.
*
* @param userId The user to retrieve pages for.
* @return A non null possible empty list of pages for the given user.
- */
+ */
@PreAuthorize("hasPermission(new
org.apache.rave.portal.security.impl.RaveSecurityContext(#userId,
'org.apache.rave.model.User'), 'org.apache.rave.model.Page', 'read')")
List<Page> getAllUserPages(String userId);
-
+
/**
* Gets the profile page for the given user.
*
@@ -62,46 +80,46 @@ public interface PageService {
* Return the page object from a list of pages given the pageId
*
* @param pageId the pageId to look for
- * @param pages a list of pages to search in
+ * @param pages a list of pages to search in
* @return the Page object representing the pageId, or null if not found
*/
Page getPageFromList(String pageId, List<Page> pages);
-
+
/**
* Given a List of Page objects, return the default one
- *
+ *
* @param pages the List of Page objects
* @return the default Page in the list
*/
Page getDefaultPageFromList(List<Page> pages);
-
+
/**
* Creates a new user page with the supplied pageName and pageLayoutCode
- *
- * @param pageName the name of the new page
+ *
+ * @param pageName the name of the new page
* @param pageLayoutCode the page layout code
* @return the new Page object
*/
- @PostAuthorize("hasPermission(returnObject, 'create')")
+ @PostAuthorize("hasPermission(returnObject, 'create')")
Page addNewUserPage(String pageName, String pageLayoutCode);
-
+
/**
* Creates a new default user page for the supplied user, and uses the
* defaultPageLayout attribute of the User to determine the layout of the
* new page.
- *
+ *
* @param userId the entityId of the user to create a default page for
* @return the new default Page object for the user
- */
+ */
@PreAuthorize("hasPermission(new
org.apache.rave.portal.security.impl.RaveSecurityContext(#userId,
'org.apache.rave.model.User'), 'org.apache.rave.model.Page', 'create')")
Page addNewDefaultUserPage(String userId);
/**
* Creates a new sub page with the supplied pageName and pageLayoutCode
for the parentPage
*
- * @param pageName the name of the new page
+ * @param pageName the name of the new page
* @param pageLayoutCode the page layout code
- * @param parentPage the parent of the subpage
+ * @param parentPage the parent of the subpage
* @return the new Page object
*/
@PostAuthorize("hasPermission(returnObject, 'create')")
@@ -109,14 +127,14 @@ public interface PageService {
/**
* Get the default page name used by Rave
- *
+ *
* @return the name of the default page used by Rave
*/
String getDefaultPageName();
-
+
/**
* Deletes the page with the supplied pageId
- *
+ *
* @param pageId the pageId to delete
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page',
'delete')")
@@ -130,50 +148,52 @@ public interface PageService {
*/
@PreAuthorize("hasPermission(new
org.apache.rave.portal.security.impl.RaveSecurityContext(#userId,
'org.apache.rave.model.User'), 'org.apache.rave.model.Page', 'delete')")
int deletePages(String userId, PageType pageType);
-
+
/**
* Moves a Region widget's position in a region or across regions
*
* @param regionWidgetId the id of the moved RegionWidget
- * @param newPosition the new index of the RegionWidget within the target
region (0 based index)
- * @param toRegionId the id of the Region to move the RegionWidget to
- * @param fromRegionId the id of the Region where the RegionWidget
currently resides
+ * @param newPosition the new index of the RegionWidget within the
target region (0 based index)
+ * @param toRegionId the id of the Region to move the RegionWidget to
+ * @param fromRegionId the id of the Region where the RegionWidget
currently resides
* @return the updated RegionWidget
*/
@PreAuthorize("hasPermission(#regionWidgetId,
'org.apache.rave.model.RegionWidget', 'update') and " +
- "hasPermission(#toRegionId, 'org.apache.rave.model.Region',
'update') and " +
- "hasPermission(#fromRegionId,
'org.apache.rave.model.Region', 'update')")
+ "hasPermission(#toRegionId, 'org.apache.rave.model.Region',
'update') and " +
+ "hasPermission(#fromRegionId, 'org.apache.rave.model.Region',
'update')")
RegionWidget moveRegionWidget(String regionWidgetId, int newPosition,
String toRegionId, String fromRegionId);
/**
* Moves a RegionWidget from one page to another
- *
- * @param regionWidgetId the RegionWidget to move
- * @param toPageId the new page to move the regionWidgetTo
+ *
+ * @param regionWidgetId the RegionWidget to move
+ * @param toPageId the new page to move the regionWidgetTo
* @return the updated RegionWidget object
*/
@PreAuthorize("hasPermission(#regionWidgetId,
'org.apache.rave.model.RegionWidget', 'update') and " +
- "hasPermission(#toPageId, 'org.apache.rave.model.Page',
'update')")
+ "hasPermission(#toPageId, 'org.apache.rave.model.Page', 'update')")
RegionWidget moveRegionWidgetToPage(String regionWidgetId, String
toPageId);
-
+
/**
* Creates a new instance of a widget and adds it to the first position of
the first region on the page
- * @param pageId the id of the page to add the widget to
+ *
+ * @param pageId the id of the page to add the widget to
* @param widgetId the {@link org.apache.rave.model.Widget} id to add
* @return a valid widget instance
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page',
'update') and " +
- "hasPermission(#widgetId, 'org.apache.rave.model.Widget',
'read')")
+ "hasPermission(#widgetId, 'org.apache.rave.model.Widget', 'read')")
RegionWidget addWidgetToPage(String pageId, String widgetId);
-
+
/**
* Creates a new instance of a widget and adds it to the first position of
the identified region on the page
- * @param pageId the id of the page to add the widget to
+ *
+ * @param pageId the id of the page to add the widget to
* @param widgetId the {@link org.apache.rave.model.Widget} id to add
* @return a valid widget instance
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page',
'update') and " +
- "hasPermission(#widgetId, 'org.apache.rave.model.Widget',
'read')")
+ "hasPermission(#widgetId, 'org.apache.rave.model.Widget', 'read')")
RegionWidget addWidgetToPageRegion(String pageId, String widgetId, String
regionId);
/**
@@ -188,28 +208,28 @@ public interface PageService {
/**
* Updates the page properties.
*
- * @param pageId the id of the page to update
- * @param name the new name for the page
+ * @param pageId the id of the page to update
+ * @param name the new name for the page
* @param pageLayoutCode the new layout for the page
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page',
'update')")
Page updatePage(String pageId, String name, String pageLayoutCode);
-
+
/**
* Moves a page to be rendered after another page in order for a user
- *
- * @param pageId the pageId of the page to move
- * @param moveAfterPageId the pageId of the page you want to move after or
+ *
+ * @param pageId the pageId of the page to move
+ * @param moveAfterPageId the pageId of the page you want to move after or
* -1 if you want this to be the first page
* @return the updated Page object containing its new render sequence
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page',
'read') and " +
- "hasPermission(#moveAfterPageId,
'org.apache.rave.model.Page', 'read')")
+ "hasPermission(#moveAfterPageId, 'org.apache.rave.model.Page',
'read')")
Page movePage(String pageId, String moveAfterPageId);
-
+
/**
* Moves a page to be rendered as the first page for a user
- *
+ *
* @param pageId the pageId of the page to move to the default position
* @return the updated Page object containing its new render sequence
*/
@@ -218,8 +238,9 @@ public interface PageService {
/**
* Clone the page and then share it with another user (Page is detached
from original)
- * @param pageId - the id of the page in question
- * @param userId - the userid to add
+ *
+ * @param pageId - the id of the page in question
+ * @param userId - the userid to add
* @param pageName = name of the page
* @return true or false whether the user was added
*/
@@ -228,6 +249,7 @@ public interface PageService {
/**
* Add another user to share this page with
+ *
* @param pageId - the id of the page in question
* @param userId - the userid to add
* @return true or false whether the user was added
@@ -237,18 +259,20 @@ public interface PageService {
/**
* Remove an existing user from the page share
+ *
* @param pageId - the id of the page in question
* @param userId - the userid to add
* @return - whether the user was successfully removed or not
- * Note: this is read access because a page shared to a non page owner
means they have 'read' access
- * unless they are set as an 'editor' of the page, which means 'update'
access.
+ * Note: this is read access because a page shared to a non page
owner means they have 'read' access
+ * unless they are set as an 'editor' of the page, which means
'update' access.
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page',
'read')")
Boolean removeMemberFromPage(String pageId, String userId);
/**
* Allows a user to accept or decline a page share
- * @param pageId - the id of the page in question
+ *
+ * @param pageId - the id of the page in question
* @param shareStatus - a string value defined in PageStatus
* @return
*/
@@ -258,8 +282,9 @@ public interface PageService {
/**
* Update a user who has shared access to a given page, so that they can
edit the page (true)
* or can only view it (false)
- * @param pageId - the id of the page in question
- * @param userId - the userId of the user to assign the permission to
+ *
+ * @param pageId - the id of the page in question
+ * @param userId - the userId of the user to assign the permission to
* @param isEditor - value to denote if the user can edit or not
* @return
*/
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=1508584&r1=1508583&r2=1508584&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
Tue Jul 30 19:31:43 2013
@@ -19,6 +19,7 @@
package org.apache.rave.portal.service.impl;
+import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.repository.Repository;
import org.apache.rave.model.*;
import org.apache.rave.portal.model.impl.PageImpl;
@@ -74,19 +75,36 @@ public class DefaultPageService implemen
}
@Override
+ public SearchResult<Page> getAllPages() {
+ List<Page> pages = pageRepository.getAll();
+ int count = pageRepository.getCountAll();
+ return new SearchResult<Page>(pages, count);
+ }
+
+ @Override
+ public SearchResult<Page> getLimitedPages(int offset, int limit) {
+ List<Page> pages = pageRepository.getLimitedList(offset, limit);
+ int count = pageRepository.getCountAll();
+ SearchResult<Page> result = new SearchResult<Page>(pages, count);
+ result.setOffset(offset);
+ result.setPageSize(limit);
+ return result;
+ }
+
+ @Override
public Page getPage(String pageId) {
return pageRepository.get(pageId);
}
@Override
public List<Page> getAllUserPages(String userId) {
- return pageRepository.getAllPages(userId, PageType.USER);
+ return pageRepository.getAllPagesForUserType(userId, PageType.USER);
}
@Override
@Transactional
public Page getPersonProfilePage(String userId) {
- List<Page> profilePages = pageRepository.getAllPages(userId,
PageType.PERSON_PROFILE);
+ List<Page> profilePages =
pageRepository.getAllPagesForUserType(userId, PageType.PERSON_PROFILE);
Page personPage = null;
if (profilePages.isEmpty()){
personPage =
pageRepository.createPageForUser(userService.getUserById(userId),
pageTemplateRepository.getDefaultPage(PageType.PERSON_PROFILE));
@@ -546,7 +564,7 @@ public class DefaultPageService implemen
}
// Get all User Pages
Page page = null;
- List<Page> defaultUserPage = pageRepository.getAllPages(user.getId(),
PageType.USER);
+ List<Page> defaultUserPage =
pageRepository.getAllPagesForUserType(user.getId(), PageType.USER);
// Is there a default page for this user
if (defaultUserPage.isEmpty()) {
return pageRepository.createPageForUser(user,
pageTemplateRepository.getDefaultPage(PageType.USER));
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java?rev=1508584&r1=1508583&r2=1508584&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageResource.java
Tue Jul 30 19:31:43 2013
@@ -36,11 +36,13 @@ public class DefaultPageResource impleme
@Override
public Response getPages() {
+ //pageService.getAllPagesForUserType();
return null; //To change body of implemented methods use File |
Settings | File Templates.
}
@Override
public Response createPage(Page page) {
+ //pageService.createPage(page)
return null; //To change body of implemented methods use File |
Settings | File Templates.
}
Modified:
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java?rev=1508584&r1=1508583&r2=1508584&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
(original)
+++
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
Tue Jul 30 19:31:43 2013
@@ -36,6 +36,7 @@ import org.apache.rave.portal.model.impl
import org.apache.rave.portal.model.impl.RegionWidgetImpl;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.impl.WidgetImpl;
+import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.repository.PageLayoutRepository;
import org.apache.rave.portal.repository.PageRepository;
import org.apache.rave.portal.repository.PageTemplateRepository;
@@ -52,17 +53,12 @@ import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.createStrictMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.isA;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
+import static org.easymock.EasyMock.*;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -168,10 +164,44 @@ public class DefaultPageServiceTest {
}
@Test
+ public void getAllPages() {
+ final List<Page> VALID_PAGES = new ArrayList<Page>();
+ expect(pageRepository.getAll()).andReturn(VALID_PAGES);
+ expect(pageRepository.getCountAll()).andReturn(0);
+ replay(pageRepository);
+
+ SearchResult<Page> result = pageService.getAllPages();
+
+ assertThat(result.getResultSet(), sameInstance(VALID_PAGES));
+ assertEquals(result.getTotalResults(), 0);
+
+ verify(pageRepository);
+ }
+
+ @Test
+ public void getLimitedPages() {
+ final List<Page> VALID_PAGES = new ArrayList<Page>();
+ expect(pageRepository.getLimitedList(1, 5)).andReturn(VALID_PAGES);
+ expect(pageRepository.getCountAll()).andReturn(20);
+ replay(pageRepository);
+
+ SearchResult<Page> result = pageService.getLimitedPages(1, 5);
+
+ assertThat(result.getResultSet(), sameInstance(VALID_PAGES));
+ assertEquals(result.getTotalResults(), 20);
+ assertEquals(result.getOffset(), 1);
+ assertEquals(result.getPageSize(), 5);
+ assertEquals(result.getCurrentPage(), 1);
+ assertEquals(result.getNumberOfPages(), 4);
+
+ verify(pageRepository);
+ }
+
+ @Test
public void getAllUserPages() {
final List<Page> VALID_PAGES = new ArrayList<Page>();
- expect(pageRepository.getAllPages(VALID_USER_ID,
PageType.USER)).andReturn(VALID_PAGES);
+ expect(pageRepository.getAllPagesForUserType(VALID_USER_ID,
PageType.USER)).andReturn(VALID_PAGES);
replay(pageRepository);
assertThat(pageService.getAllUserPages(VALID_USER_ID),
sameInstance(VALID_PAGES));
@@ -186,7 +216,7 @@ public class DefaultPageServiceTest {
Page personPage = new PageImpl();
VALID_PAGES.add(personPage);
- expect(pageRepository.getAllPages(VALID_USER_ID,
PageType.PERSON_PROFILE)).andReturn(VALID_PAGES);
+ expect(pageRepository.getAllPagesForUserType(VALID_USER_ID,
PageType.PERSON_PROFILE)).andReturn(VALID_PAGES);
replay(pageRepository,userService,pageTemplateRepository);
assertThat(pageService.getPersonProfilePage(VALID_USER_ID),
sameInstance(personPage));
@@ -201,7 +231,7 @@ public class DefaultPageServiceTest {
PageTemplate pageTemplate = new PageTemplateImpl();
UserImpl user = new UserImpl();
- expect(pageRepository.getAllPages(VALID_USER_ID,
PageType.PERSON_PROFILE)).andReturn(VALID_PAGES);
+ expect(pageRepository.getAllPagesForUserType(VALID_USER_ID,
PageType.PERSON_PROFILE)).andReturn(VALID_PAGES);
expect(userService.getUserById(isA(String.class))).andReturn(user).once();
expect(pageTemplateRepository.getDefaultPage(PageType.PERSON_PROFILE)).andReturn(pageTemplate).once();
expect(pageRepository.createPageForUser(user,
pageTemplate)).andReturn(personPage);
@@ -232,7 +262,7 @@ public class DefaultPageServiceTest {
expect(pageLayoutRepository.getByPageLayoutCode(PAGE_LAYOUT_CODE)).andReturn(pageLayout);
expect(pageTemplateRepository.getDefaultPage(PageType.USER)).andReturn(pageTemplate);
expect(pageRepository.createPageForUser(user,
pageTemplate)).andReturn(expectedPage);
- expect(pageRepository.getAllPages(user.getId(),
PageType.USER)).andReturn(new ArrayList<Page>());
+ expect(pageRepository.getAllPagesForUserType(user.getId(),
PageType.USER)).andReturn(new ArrayList<Page>());
replay(userService, pageLayoutRepository, pageRepository,
pageTemplateRepository);
@@ -267,7 +297,7 @@ public class DefaultPageServiceTest {
expect(userService.getAuthenticatedUser()).andReturn(user);
expect(pageLayoutRepository.getByPageLayoutCode(PAGE_LAYOUT_CODE)).andReturn(pageLayout);
- expect(pageRepository.getAllPages(user.getId(),
PageType.USER)).andReturn(new ArrayList<Page>());
+ expect(pageRepository.getAllPagesForUserType(user.getId(),
PageType.USER)).andReturn(new ArrayList<Page>());
expect(pageRepository.createPageForUser(user,
pageTemplate)).andReturn(userPage);
expect(pageTemplateRepository.getDefaultPage(PageType.USER)).andReturn(pageTemplate);
replay(userService, pageLayoutRepository, pageRepository,
pageTemplateRepository);
@@ -307,7 +337,7 @@ public class DefaultPageServiceTest {
return (Page)EasyMock.getCurrentArguments()[0];
}
});
- expect(pageRepository.getAllPages(user.getId(),
PageType.USER)).andReturn(existingPages);
+ expect(pageRepository.getAllPagesForUserType(user.getId(),
PageType.USER)).andReturn(existingPages);
replay(userService, pageLayoutRepository, pageRepository);
Page newPage = pageService.addNewUserPage(PAGE_NAME, PAGE_LAYOUT_CODE);
@@ -415,7 +445,7 @@ public class DefaultPageServiceTest {
expect(pageLayoutRepository.getByPageLayoutCode(PAGE_LAYOUT_CODE)).andReturn(pageLayout);
expect(pageTemplateRepository.getDefaultPage(PageType.USER)).andReturn(pageTemplate);
expect(pageRepository.createPageForUser(user,
pageTemplate)).andReturn(expectedPage);
- expect(pageRepository.getAllPages(user.getId(),
PageType.USER)).andReturn(new ArrayList<Page>());
+ expect(pageRepository.getAllPagesForUserType(user.getId(),
PageType.USER)).andReturn(new ArrayList<Page>());
replay(userService, pageLayoutRepository, pageRepository,
pageTemplateRepository);
Page newPage = pageService.addNewDefaultUserPage(user.getId());
@@ -871,7 +901,7 @@ public class DefaultPageServiceTest {
expect(pageRepository.get(INVALID_PAGE_ID)).andReturn(null);
expect(pageRepository.get(page2.getId())).andReturn(page2);
- expect(pageRepository.getAllPages(user.getId(),
PageType.USER)).andReturn(pageList);
+ expect(pageRepository.getAllPagesForUserType(user.getId(),
PageType.USER)).andReturn(pageList);
replay(userService);
replay(pageRepository);
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java?rev=1508584&r1=1508583&r2=1508584&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
Tue Jul 30 19:31:43 2013
@@ -76,7 +76,7 @@ public class JpaPageRepository implement
}
@Override
- public List<Page> getAllPages(String userId, PageType pageType) {
+ public List<Page> getAllPagesForUserType(String userId, PageType pageType)
{
TypedQuery<JpaPage> query =
manager.createNamedQuery(JpaPageUser.GET_BY_USER_ID_AND_PAGE_TYPE,
JpaPage.class);
query.setParameter("userId", userId);
query.setParameter("pageType", pageType);
@@ -85,7 +85,7 @@ public class JpaPageRepository implement
@Override
public int deletePages(String userId, PageType pageType) {
- List<Page> pages = getAllPages(userId, pageType);
+ List<Page> pages = getAllPagesForUserType(userId, pageType);
int pageCount = pages.size();
for(Page page : pages) {
if(page.getOwnerId().equals(userId)){
Modified:
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java?rev=1508584&r1=1508583&r2=1508584&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java
Tue Jul 30 19:31:43 2013
@@ -84,7 +84,7 @@ public class JpaPageRepositoryTest {
@Test
public void getAllPages_validUser_validUserPageSet() {
- List<Page> pages = repository.getAllPages(USER_ID, PageType.USER);
+ List<Page> pages = repository.getAllPagesForUserType(USER_ID,
PageType.USER);
assertThat(pages, is(notNullValue()));
assertThat(pages.size(), equalTo(2));
assertThat(pages.get(0).getRegions().size(), equalTo(2));
@@ -105,7 +105,7 @@ public class JpaPageRepositoryTest {
@Test
public void getAllPages_validUser_validPersonProfilePageSet() {
- List<Page> pages = repository.getAllPages(USER_ID,
PageType.PERSON_PROFILE);
+ List<Page> pages = repository.getAllPagesForUserType(USER_ID,
PageType.PERSON_PROFILE);
assertThat(pages, is(notNullValue()));
assertThat(pages.size(), is(1));
assertThat(pages.get(0).getRegions().size(), is(1));
@@ -122,7 +122,7 @@ public class JpaPageRepositoryTest {
@Test
public void getAllPages_validUser_validSubPagePageSet() {
- List<Page> pages = repository.getAllPages(USER_ID, PageType.SUB_PAGE);
+ List<Page> pages = repository.getAllPagesForUserType(USER_ID,
PageType.SUB_PAGE);
assertThat(pages, is(notNullValue()));
assertThat(pages.size(), is(2));
assertThat(pages.get(0).getRegions().size(), is(1));
@@ -140,19 +140,19 @@ public class JpaPageRepositoryTest {
@Test
public void getAllPages_invalidUser_emptySet() {
- List<Page> pages = repository.getAllPages(INVALID_USER, PageType.USER);
+ List<Page> pages = repository.getAllPagesForUserType(INVALID_USER,
PageType.USER);
assertThat(pages.isEmpty(), is(true));
}
@Test
public void getAllPages_person_profile_invalidUser_emptySet() {
- List<Page> pages = repository.getAllPages(INVALID_USER,
PageType.PERSON_PROFILE);
+ List<Page> pages = repository.getAllPagesForUserType(INVALID_USER,
PageType.PERSON_PROFILE);
assertThat(pages.isEmpty(), is(true));
}
@Test
public void getAllPages_nullUser_emptySet() {
- List<Page> pages = repository.getAllPages(null, PageType.USER);
+ List<Page> pages = repository.getAllPagesForUserType(null,
PageType.USER);
assertThat(pages.isEmpty(), is(true));
}
@@ -206,12 +206,12 @@ public class JpaPageRepositoryTest {
@Transactional(readOnly=false)
@Rollback(true)
public void deletePages_userPageType() {
- int numPages = repository.getAllPages(USER_ID, PageType.USER).size();
+ int numPages = repository.getAllPagesForUserType(USER_ID,
PageType.USER).size();
assertThat(numPages > 0, is(true));
int deletedPages = repository.deletePages(USER_ID, PageType.USER);
assertThat(deletedPages, is(numPages));
// ensure pages are deleted
- assertThat(repository.getAllPages(USER_ID, PageType.USER).isEmpty(),
is(true));
+ assertThat(repository.getAllPagesForUserType(USER_ID,
PageType.USER).isEmpty(), is(true));
}
@Test
Modified:
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java?rev=1508584&r1=1508583&r2=1508584&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
(original)
+++
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
Tue Jul 30 19:31:43 2013
@@ -49,7 +49,7 @@ public class MongoDbPageRepository imple
private MongoPageOperations template;
@Override
- public List<Page> getAllPages(String userId, PageType pageType) {
+ public List<Page> getAllPagesForUserType(String userId, PageType pageType)
{
return
sort(template.find(query(where("pageType").is(getString(pageType)).andOperator(where("members").elemMatch(where("userId").is(userId))))),
userId);
}
Modified:
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java?rev=1508584&r1=1508583&r2=1508584&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
(original)
+++
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
Tue Jul 30 19:31:43 2013
@@ -21,7 +21,6 @@ package org.apache.rave.portal.repositor
import com.google.common.collect.Lists;
import org.apache.rave.model.*;
-import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.impl.*;
import org.apache.rave.portal.repository.*;
import org.junit.Before;
@@ -77,7 +76,7 @@ public class MongoDbPageRepositoryTest {
expect(template.find(isA(Query.class))).andReturn(pages);
replay(template);
- List<Page> result = repo.getAllPages(userId, pageType);
+ List<Page> result = repo.getAllPagesForUserType(userId, pageType);
assertNotNull(result);
}
