svn commit: r1508607 - in /rave/trunk/rave-components/rave-core/src: main/java/org/apache/rave/portal/service/ main/java/org/apache/rave/portal/service/impl/ test/java/org/apache/rave/portal/service/impl/

[erinnp]

Author: erinnp
Date: Tue Jul 30 20:22:56 2013
New Revision: 1508607

URL: http://svn.apache.org/r1508607
Log:
Update to have consistent naming in case we choose to create a shared interface 
for services in support of rest apis

Modified:
    
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/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java

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=1508607&r1=1508606&r2=1508607&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 20:22:56 2013
@@ -38,7 +38,7 @@ public interface PageService {
      *
      * @return search results
      */
-    SearchResult<Page> getAllPages();
+    SearchResult<Page> getAll();
 
     /**
      * Gets a limited list of pages
@@ -47,7 +47,7 @@ public interface PageService {
      * @param limit  number of results to return
      * @return search results
      */
-    SearchResult<Page> getLimitedPages(int offset, int limit);
+    SearchResult<Page> getLimited(int offset, int limit);
 
     /**
      * Gets a page based on the id

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=1508607&r1=1508606&r2=1508607&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 20:22:56 2013
@@ -75,14 +75,14 @@ public class DefaultPageService implemen
     }
 
     @Override
-    public SearchResult<Page> getAllPages() {
+    public SearchResult<Page> getAll() {
         List<Page> pages = pageRepository.getAll();
         int count = pageRepository.getCountAll();
         return new SearchResult<Page>(pages, count);
     }
 
     @Override
-    public SearchResult<Page> getLimitedPages(int offset, int limit) {
+    public SearchResult<Page> getLimited(int offset, int limit) {
         List<Page> pages = pageRepository.getLimitedList(offset, limit);
         int count = pageRepository.getCountAll();
         SearchResult<Page> result = new SearchResult<Page>(pages, count);

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=1508607&r1=1508606&r2=1508607&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 20:22:56 2013
@@ -170,7 +170,7 @@ public class DefaultPageServiceTest {
         expect(pageRepository.getCountAll()).andReturn(0);
         replay(pageRepository);
 
-        SearchResult<Page> result = pageService.getAllPages();
+        SearchResult<Page> result = pageService.getAll();
 
         assertThat(result.getResultSet(), sameInstance(VALID_PAGES));
         assertEquals(result.getTotalResults(), 0);
@@ -185,7 +185,7 @@ public class DefaultPageServiceTest {
         expect(pageRepository.getCountAll()).andReturn(20);
         replay(pageRepository);
 
-        SearchResult<Page> result = pageService.getLimitedPages(1, 5);
+        SearchResult<Page> result = pageService.getLimited(1, 5);
 
         assertThat(result.getResultSet(), sameInstance(VALID_PAGES));
         assertEquals(result.getTotalResults(), 20);