You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by er...@apache.org on 2013/07/30 17:30:34 UTC
svn commit: r1508490 - in /rave/trunk/rave-components:
rave-core-api/src/main/java/org/apache/rave/repository/
rave-core/src/main/java/org/apache/rave/portal/repository/
rave-jpa/src/main/java/org/apache/rave/portal/model/
rave-jpa/src/main/java/org/ap...
Author: erinnp
Date: Tue Jul 30 15:30:33 2013
New Revision: 1508490
URL: http://svn.apache.org/r1508490
Log:
RAVE - 998: Applying patch from Dan Gornstein to merge ResourceRepository into Repository interface
Removed:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/ResourceRepository.java
Modified:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/GroupRepository.java
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/Repository.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ActivityStreamsRepository.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java
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/repository/PersonRepository.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionRepository.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPerson.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaGroupRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbActivityStreamsRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbTagRepositoryTest.java
Modified: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/GroupRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/GroupRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/GroupRepository.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/GroupRepository.java Tue Jul 30 15:30:33 2013
@@ -25,6 +25,4 @@ import java.util.List;
public interface GroupRepository extends Repository<Group> {
Group findByTitle(String title);
-
- List<Group> getAll();
}
Modified: rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/Repository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/Repository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/Repository.java (original)
+++ rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/repository/Repository.java Tue Jul 30 15:30:33 2013
@@ -19,6 +19,8 @@
package org.apache.rave.repository;
+import java.util.List;
+
/**
* Defines generic operations for a repository
*/
@@ -50,4 +52,25 @@ public interface Repository<T> {
* @param item the item to delete
*/
void delete(T item);
+
+ /**
+ * Retrieve all objects from the persistence context.
+ *
+ * @return a list of all objects
+ */
+ List<T> getAll();
+
+ /**
+ * Retrieve a limited list of objects as a SearchResult
+ * @param offset the integer offset from 0 index
+ * @param limit the size limit of the result set
+ * @return
+ */
+ List<T> getLimitedList(int offset, int limit);
+
+ /**
+ * Retrieves the count of all records
+ * @return
+ */
+ int getCountAll();
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ActivityStreamsRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ActivityStreamsRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ActivityStreamsRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ActivityStreamsRepository.java Tue Jul 30 15:30:33 2013
@@ -27,12 +27,6 @@ import java.util.List;
public interface ActivityStreamsRepository extends Repository<ActivityStreamsEntry> {
/**
- * Retrieves all ActivityStreamsEntry instances from the persistence layer
- * @return a list of {@link org.apache.rave.model.ActivityStreamsEntry}
- */
- List<ActivityStreamsEntry> getAll();
-
- /**
* Retrieves the ActivityStreamsEntry instances for a given user from the persistence layer
* @return a list of {@link ActivityStreamsEntry}
*/
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java Tue Jul 30 15:30:33 2013
@@ -38,17 +38,7 @@ public interface AuthorityRepository ext
Authority getByAuthority(String authorityName);
/**
- * @return a List of all {@link org.apache.rave.model.Authority}'s.
- */
- List<Authority> getAll();
-
- /**
* @return a List of all default {@link org.apache.rave.model.Authority}'s.
*/
List<Authority> getAllDefault();
-
- /**
- * @return the total number of authorities in the repository
- */
- int getCountAll();
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java Tue Jul 30 15:30:33 2013
@@ -17,11 +17,11 @@ package org.apache.rave.portal.repositor
import org.apache.rave.repository.Repository;
import org.apache.rave.model.Category;
-import org.apache.rave.repository.ResourceRepository;
+
import java.util.List;
-public interface CategoryRepository extends Repository<Category>, ResourceRepository<Category> {
+public interface CategoryRepository extends Repository<Category>{
/**
* Removes a user from the createdBy or modifiedBy fields for any Category they are associated with and assigns
* the values to null
@@ -30,4 +30,4 @@ public interface CategoryRepository exte
* @return the number of Categories modified
*/
int removeFromCreatedOrModifiedFields(String userId);
-}
\ No newline at end of file
+}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java Tue Jul 30 15:30:33 2013
@@ -25,6 +25,5 @@ import java.util.List;
public interface PageLayoutRepository extends Repository<PageLayout> {
PageLayout getByPageLayoutCode(String codename);
- List<PageLayout> getAll();
List<PageLayout> getAllUserSelectable();
}
\ No newline at end of file
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=1508490&r1=1508489&r2=1508490&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 15:30:33 2013
@@ -20,14 +20,14 @@ package org.apache.rave.portal.repositor
import org.apache.rave.repository.Repository;
import org.apache.rave.model.*;
-import org.apache.rave.repository.ResourceRepository;
+
import java.util.List;
/**
* Provides persistence operations for the {@link org.apache.rave.model.Page} class
*/
-public interface PageRepository extends Repository<Page>, ResourceRepository<Page> {
+public interface PageRepository extends Repository<Page>{
/**
* Returns all pages of a given PageType owned by the user
*
@@ -78,4 +78,4 @@ public interface PageRepository extends
* @return a single pageUser
*/
public PageUser getSingleRecord(String userId, String pageId);
-}
\ No newline at end of file
+}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PersonRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PersonRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PersonRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PersonRepository.java Tue Jul 30 15:30:33 2013
@@ -24,10 +24,10 @@ import java.util.List;
import org.apache.rave.repository.Repository;
import org.apache.rave.model.Person;
-import org.apache.rave.repository.ResourceRepository;
-public interface PersonRepository extends Repository<Person>, ResourceRepository<Person> {
+
+public interface PersonRepository extends Repository<Person> {
/**
* Gets a user by their username
*
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java Tue Jul 30 15:30:33 2013
@@ -21,14 +21,14 @@ package org.apache.rave.portal.repositor
import org.apache.rave.repository.Repository;
import org.apache.rave.model.PortalPreference;
-import org.apache.rave.repository.ResourceRepository;
+
import java.util.List;
/**
* Provides persistence operations for the {@link org.apache.rave.model.PortalPreference}
*/
-public interface PortalPreferenceRepository extends Repository<PortalPreference>, ResourceRepository<PortalPreference> {
+public interface PortalPreferenceRepository extends Repository<PortalPreference> {
PortalPreference getByKey(String key);
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionRepository.java Tue Jul 30 15:30:33 2013
@@ -21,9 +21,9 @@ package org.apache.rave.portal.repositor
import org.apache.rave.repository.Repository;
import org.apache.rave.model.Region;
-import org.apache.rave.repository.ResourceRepository;
+
/**
* Provides persistence operations for the {@link Region} class
*/
-public interface RegionRepository extends Repository<Region>, ResourceRepository<Region> { }
\ No newline at end of file
+public interface RegionRepository extends Repository<Region> { }
\ No newline at end of file
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java Tue Jul 30 15:30:33 2013
@@ -20,6 +20,6 @@ package org.apache.rave.portal.repositor
import org.apache.rave.repository.Repository;
import org.apache.rave.model.RegionWidget;
-import org.apache.rave.repository.ResourceRepository;
-public interface RegionWidgetRepository extends Repository<RegionWidget>, ResourceRepository<RegionWidget> { }
\ No newline at end of file
+
+public interface RegionWidgetRepository extends Repository<RegionWidget>{ }
\ No newline at end of file
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java Tue Jul 30 15:30:33 2013
@@ -22,25 +22,11 @@ package org.apache.rave.portal.repositor
import org.apache.rave.repository.Repository;
import org.apache.rave.model.Tag;
-import java.util.List;
-
/**
* Repository interface for {@link org.apache.rave.model.Tag}
*/
public interface TagRepository extends Repository<Tag> {
/**
- * @return a List of all {@link org.apache.rave.model.Tag}'s.
- */
-
- List<Tag> getAll();
-
-
- /**
- * @return the total number of tags in the repository
- */
- int getCountAll();
-
- /**
* @return the tag matching the keyword
*/
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java Tue Jul 30 15:30:33 2013
@@ -20,11 +20,11 @@ package org.apache.rave.portal.repositor
import org.apache.rave.repository.Repository;
import org.apache.rave.model.User;
-import org.apache.rave.repository.ResourceRepository;
+
import java.util.List;
-public interface UserRepository extends Repository<User>, ResourceRepository<User> {
+public interface UserRepository extends Repository<User> {
/**
* Gets a {@link org.apache.rave.model.User} by its username
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java Tue Jul 30 15:30:33 2013
@@ -21,13 +21,13 @@ package org.apache.rave.portal.repositor
import org.apache.rave.repository.Repository;
import org.apache.rave.model.*;
import org.apache.rave.portal.model.util.WidgetStatistics;
-import org.apache.rave.repository.ResourceRepository;
+
import java.util.List;
import java.util.Map;
-public interface WidgetRepository extends Repository<Widget>, ResourceRepository<Widget> {
+public interface WidgetRepository extends Repository<Widget> {
/**
* Gets a List of {@link Widget}'s by performing a free text search
*
@@ -225,4 +225,4 @@ public interface WidgetRepository extend
* @return count of ratings deleted
*/
int deleteAllWidgetRatings(String userId);
-}
\ No newline at end of file
+}
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPerson.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPerson.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPerson.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPerson.java Tue Jul 30 15:30:33 2013
@@ -38,7 +38,7 @@ import java.util.List;
@Access(AccessType.FIELD)
@NamedQueries(value = {
@NamedQuery(name = JpaPerson.GET_ALL, query = "select p from JpaPerson p"),
- @NamedQuery(name = JpaPerson.GET_COUNT, query = "select count(p) from JpaPerson p where p.username like :username"),
+ @NamedQuery(name = JpaPerson.GET_COUNT, query = "select count(p) from JpaPerson p"),
@NamedQuery(name = JpaPerson.FIND_BY_USERNAME, query = "select p from JpaPerson p where p.username like :username"),
@NamedQuery(name = JpaPerson.FIND_FRIENDS_BY_USERNAME, query = "select a.followedby from JpaPersonAssociation a where a.follower.username = :username and a.status = :status")
})
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java Tue Jul 30 15:30:33 2013
@@ -19,6 +19,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.persistence.jpa.util.JpaUtil;
import org.apache.rave.model.ActivityStreamsEntry;
import org.apache.rave.portal.model.JpaActivityStreamsEntry;
@@ -64,7 +65,17 @@ public class JpaActivityStreamsRepositor
return CollectionUtils.<ActivityStreamsEntry>toBaseTypedList(query.getResultList());
}
- public ActivityStreamsEntry get(String id) {
+ @Override
+ public List<ActivityStreamsEntry> getLimitedList(int offset, int limit) {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public int getCountAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ public ActivityStreamsEntry get(String id) {
TypedQuery<JpaActivityStreamsEntry> query = manager.createNamedQuery(JpaActivityStreamsEntry.FIND_BY_ID, JpaActivityStreamsEntry.class);
query.setParameter("id", id);
return CollectionUtils.getSingleValue(query.getResultList());
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java Tue Jul 30 15:30:33 2013
@@ -18,6 +18,7 @@
*/
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.exception.NotSupportedException;
import org.apache.commons.lang3.StringUtils;
import org.apache.rave.exception.DataSerializationException;
import org.apache.rave.model.ApplicationData;
@@ -84,6 +85,21 @@ public class JpaApplicationDataRepositor
}
@Override
+ public List<ApplicationData> getAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public List<ApplicationData> getLimitedList(int offset, int limit) {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public int getCountAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
public List<ApplicationData> getApplicationData(List<String> userIds, String appId) {
//if the call is only looking for data for a single user use the more efficient single user variant transparently
if (userIds.size() == 1) {
@@ -170,4 +186,4 @@ public class JpaApplicationDataRepositor
}
}
}
-}
\ No newline at end of file
+}
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java Tue Jul 30 15:30:33 2013
@@ -19,6 +19,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.model.Authority;
import org.apache.rave.portal.model.JpaAuthority;
import org.apache.rave.portal.model.conversion.JpaAuthorityConverter;
@@ -61,7 +62,12 @@ public class JpaAuthorityRepository impl
TypedQuery<JpaAuthority> query = manager.createNamedQuery(JpaAuthority.GET_ALL, JpaAuthority.class);
return CollectionUtils.<Authority>toBaseTypedList(query.getResultList());
}
-
+
+ @Override
+ public List<Authority> getLimitedList(int offset, int limit) {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
@Override
public List<Authority> getAllDefault() {
TypedQuery<JpaAuthority> query = manager.createNamedQuery(JpaAuthority.GET_ALL_DEFAULT, JpaAuthority.class);
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaGroupRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaGroupRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaGroupRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaGroupRepository.java Tue Jul 30 15:30:33 2013
@@ -18,6 +18,7 @@
*/
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.model.Group;
import org.apache.rave.portal.model.JpaGroup;
import org.apache.rave.portal.model.conversion.JpaGroupConverter;
@@ -62,6 +63,16 @@ public class JpaGroupRepository implemen
}
@Override
+ public List<Group> getLimitedList(int offset, int limit) {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public int getCountAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
public Group save(Group item) {
JpaGroup converted = converter.convert(item);
return saveOrUpdate(converted.getEntityId(), manager, converted);
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java Tue Jul 30 15:30:33 2013
@@ -19,6 +19,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.portal.model.JpaOAuthConsumerStore;
import org.apache.rave.model.OAuthConsumerStore;
import org.apache.rave.portal.model.conversion.JpaOAuthConsumerStoreConverter;
@@ -30,6 +31,8 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
+import java.util.List;
+
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
import static org.apache.rave.persistence.jpa.util.JpaUtil.saveOrUpdate;
@@ -65,6 +68,22 @@ public class JpaOAuthConsumerStoreReposi
public void delete(OAuthConsumerStore item) {
manager.remove(converter.convert(item));
}
+
+ @Override
+ public List<OAuthConsumerStore> getAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public List<OAuthConsumerStore> getLimitedList(int offset, int limit) {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public int getCountAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
/**
* {@inheritDoc}
*/
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java Tue Jul 30 15:30:33 2013
@@ -19,6 +19,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.portal.model.JpaOAuthTokenInfo;
import org.apache.rave.model.OAuthTokenInfo;
import org.apache.rave.portal.model.conversion.JpaOAuthTokenInfoConverter;
@@ -30,6 +31,8 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
+import java.util.List;
+
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
import static org.apache.rave.persistence.jpa.util.JpaUtil.saveOrUpdate;
@@ -66,6 +69,21 @@ public class JpaOAuthTokenInfoRepository
manager.remove(converter.convert(item));
}
+ @Override
+ public List<OAuthTokenInfo> getAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public List<OAuthTokenInfo> getLimitedList(int offset, int limit) {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public int getCountAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
/**
* {@inheritDoc}
*/
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java Tue Jul 30 15:30:33 2013
@@ -19,6 +19,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.portal.model.JpaPageLayout;
import org.apache.rave.model.PageLayout;
import org.apache.rave.portal.model.conversion.JpaPageLayoutConverter;
@@ -60,6 +61,16 @@ public class JpaPageLayoutRepository imp
}
@Override
+ public List<PageLayout> getLimitedList(int offset, int limit) {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public int getCountAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
public List<PageLayout> getAllUserSelectable() {
return CollectionUtils.<PageLayout>toBaseTypedList(manager.createNamedQuery(JpaPageLayout.PAGELAYOUT_GET_ALL_USER_SELECTABLE, JpaPageLayout.class).getResultList());
}
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java Tue Jul 30 15:30:33 2013
@@ -23,7 +23,7 @@ import org.apache.rave.portal.model.JpaR
import org.apache.rave.model.Region;
import org.apache.rave.portal.model.conversion.JpaRegionConverter;
import org.apache.rave.portal.repository.RegionRepository;
-import org.apache.rave.repository.ResourceRepository;
+
import org.apache.rave.util.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java Tue Jul 30 15:30:33 2013
@@ -33,6 +33,7 @@ import javax.persistence.Query;
import javax.persistence.TypedQuery;
import java.util.List;
+import static org.apache.rave.persistence.jpa.util.JpaUtil.getPagedResultList;
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
import static org.apache.rave.persistence.jpa.util.JpaUtil.saveOrUpdate;
@@ -56,6 +57,12 @@ public class JpaTagRepository implements
}
@Override
+ public List<Tag> getLimitedList(int offset, int limit) {
+ TypedQuery<JpaTag> query = manager.createNamedQuery(JpaTag.GET_ALL, JpaTag.class);
+ return CollectionUtils.<Tag>toBaseTypedList(getPagedResultList(query, offset, limit));
+ }
+
+ @Override
public Class<? extends Tag> getType(){
return JpaTag.class;
}
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java Tue Jul 30 15:30:33 2013
@@ -24,6 +24,7 @@ import org.apache.rave.portal.model.JpaP
import org.apache.rave.model.Person;
import org.apache.rave.portal.model.impl.PersonImpl;
import org.apache.rave.portal.repository.PersonRepository;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,7 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import java.util.List;
+import static junit.framework.Assert.assertNotNull;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
@@ -43,6 +45,7 @@ import static org.hamcrest.CoreMatchers.
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations={"classpath:test-applicationContext.xml",
@@ -79,6 +82,28 @@ public class JpaPersonRepositoryTest {
}
@Test
+ public void getAll(){
+ List<Person> people = repository.getAll();
+ assertNotNull(people);
+ assertThat(people.size(), is(13));
+ }
+
+ @Test
+ public void getLimitedList() {
+ final int offset = 5;
+ final int pageSize = 5;
+ List<Person> people = repository.getLimitedList(offset, pageSize);
+ Assert.assertNotNull(people);
+ assertThat(people.size(), is(5));
+ }
+
+ @Test
+ public void countAll() {
+ int count = repository.getCountAll();
+ assertThat(count, is(13));
+ }
+
+ @Test
public void findByUsername_valid() {
Person person = repository.findByUsername(VALID_USER);
assertThat(person, is(not(nullValue())));
Modified: rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbActivityStreamsRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbActivityStreamsRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbActivityStreamsRepository.java (original)
+++ rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbActivityStreamsRepository.java Tue Jul 30 15:30:33 2013
@@ -27,6 +27,7 @@ import org.apache.rave.portal.repository
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.stereotype.Repository;
+import org.apache.rave.exception.NotSupportedException;
import java.util.List;
@@ -57,6 +58,16 @@ public class MongoDbActivityStreamsRepos
}
@Override
+ public List<ActivityStreamsEntry> getLimitedList(int offset, int limit) {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public int getCountAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
public List<ActivityStreamsEntry> getByUserId(String id) {
return toBaseTypedList(template.find(query(where("actor._id").is(id)),CLASS, ACTIVITIES));
}
Modified: rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java (original)
+++ rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java Tue Jul 30 15:30:33 2013
@@ -20,6 +20,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.model.ApplicationData;
import org.apache.rave.portal.model.impl.ApplicationDataImpl;
import org.apache.rave.portal.repository.ApplicationDataRepository;
@@ -72,6 +73,21 @@ public class MongoDbApplicationDataRepos
template.remove(item, APP_DATA_COLLECTION);
}
+ @Override
+ public List<ApplicationData> getAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public List<ApplicationData> getLimitedList(int offset, int limit) {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public int getCountAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
public void setTemplate(MongoOperations template) {
this.template = template;
}
Modified: rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java (original)
+++ rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java Tue Jul 30 15:30:33 2013
@@ -59,6 +59,11 @@ public class MongoDbAuthorityRepository
}
@Override
+ public List<Authority> getLimitedList(int offset, int limit) {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
public List<Authority> getAllDefault() {
return CollectionUtils.<Authority>toBaseTypedList(template.find(query(where("defaultForNewUser").is(true)), CLASS, AUTHORITY_COLLECTION));
}
Modified: rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepository.java (original)
+++ rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepository.java Tue Jul 30 15:30:33 2013
@@ -19,6 +19,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.model.Group;
import org.apache.rave.portal.model.MongoDbGroup;
import org.apache.rave.portal.repository.MongoGroupOperations;
@@ -59,6 +60,16 @@ public class MongoDbGroupRepository impl
}
@Override
+ public List<Group> getLimitedList(int offset, int limit) {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public int getCountAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
public Group save(Group item) {
return template.save(item);
}
Modified: rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java (original)
+++ rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java Tue Jul 30 15:30:33 2013
@@ -19,6 +19,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.model.OAuthTokenInfo;
import org.apache.rave.portal.model.impl.OAuthTokenInfoImpl;
import org.apache.rave.portal.repository.OAuthTokenInfoRepository;
@@ -26,6 +27,8 @@ import org.springframework.beans.factory
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
import static org.apache.rave.portal.repository.util.CollectionNames.OAUTH_TOKEN_COLLECTION;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
@@ -70,6 +73,21 @@ public class MongoDbOAuthTokenInfoReposi
template.remove(get(item.getId()));
}
+ @Override
+ public List<OAuthTokenInfo> getAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public List<OAuthTokenInfo> getLimitedList(int offset, int limit) {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public int getCountAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
public void setTemplate(MongoOperations template) {
this.template = template;
}
Modified: rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java (original)
+++ rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java Tue Jul 30 15:30:33 2013
@@ -19,6 +19,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.model.OAuthConsumerStore;
import org.apache.rave.portal.model.impl.OAuthConsumerStoreImpl;
import org.apache.rave.portal.repository.OAuthConsumerStoreRepository;
@@ -26,6 +27,8 @@ import org.springframework.beans.factory
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
import static org.apache.rave.portal.repository.util.CollectionNames.OAUTH_CONSUMER_COLLECTION;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
@@ -63,6 +66,21 @@ public class MongoDbOauthConsumerStoreRe
template.remove(get(item.getId()));
}
+ @Override
+ public List<OAuthConsumerStore> getAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public List<OAuthConsumerStore> getLimitedList(int offset, int limit) {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public int getCountAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
public void setTemplate(MongoOperations template) {
this.template = template;
}
Modified: rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java (original)
+++ rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java Tue Jul 30 15:30:33 2013
@@ -19,6 +19,7 @@
package org.apache.rave.portal.repository.impl;
+import org.apache.rave.exception.NotSupportedException;
import org.apache.rave.model.PageLayout;
import org.apache.rave.portal.model.MongoDbPageLayout;
import org.apache.rave.portal.repository.PageLayoutRepository;
@@ -51,6 +52,16 @@ public class MongoDbPageLayoutRepository
}
@Override
+ public List<PageLayout> getLimitedList(int offset, int limit) {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
+ public int getCountAll() {
+ throw new NotSupportedException("This function is not yet implemented for this class.");
+ }
+
+ @Override
public List<PageLayout> getAllUserSelectable() {
List<MongoDbPageLayout> userSelectable = template.find(new Query(where("userSelectable").is(true)), CLASS, PAGE_LAYOUT_COLLECTION);
return CollectionUtils.<PageLayout>toBaseTypedList(userSelectable);
Modified: rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java (original)
+++ rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java Tue Jul 30 15:30:33 2013
@@ -46,6 +46,12 @@ public class MongoDbTagRepository implem
}
@Override
+ public List<Tag> getLimitedList(int offset, int pageSize){
+ Query query = new Query().skip(offset).limit(pageSize);
+ return template.find(query);
+ }
+
+ @Override
public int getCountAll() {
return (int)template.count(new Query());
}
Modified: rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java Tue Jul 30 15:30:33 2013
@@ -22,18 +22,21 @@ package org.apache.rave.portal.repositor
import org.apache.rave.model.Category;
import org.apache.rave.portal.model.MongoDbCategory;
import org.apache.rave.portal.model.conversion.HydratingConverterFactory;
+import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.repository.util.CollectionNames;
import org.apache.rave.util.CollectionUtils;
import org.junit.Before;
import org.junit.Test;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.isA;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
@@ -161,4 +164,33 @@ public class MongoDbCategoryRepositoryTe
verify(converter, template);
}
+
+ @Test
+ public void getAll(){
+ List<MongoDbCategory> categories = new ArrayList<MongoDbCategory>();
+ expect(template.findAll(categoryRepository.CLASS, CollectionNames.CATEGORY_COLLECTION)).andReturn(categories);
+ replay(template);
+
+ assertThat(CollectionUtils.<Category>toBaseTypedList(categories), is(sameInstance(categoryRepository.getAll())));
+ }
+
+ @Test
+ public void getLimitedList(){
+ int offset = 234;
+ int pageSize = 123;
+ List<MongoDbCategory> found = new ArrayList<MongoDbCategory>();
+ Query q = new Query().skip(offset).limit(pageSize);
+ expect(template.find(q, categoryRepository.CLASS)).andReturn(found);
+ replay(template);
+ assertThat(CollectionUtils.<Category>toBaseTypedList(found), is(sameInstance(categoryRepository.getLimitedList(offset, pageSize))));
+ }
+
+ @Test
+ public void getCountAll_Valid(){
+ long doubleOseven = 007;
+ expect(template.count(new Query(), categoryRepository.CLASS)).andReturn(doubleOseven);
+ replay(template);
+ assertThat((int)doubleOseven, is(sameInstance(categoryRepository.getCountAll())));
+ }
+
}
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=1508490&r1=1508489&r2=1508490&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 15:30:33 2013
@@ -28,6 +28,7 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.data.mongodb.core.query.Query;
+import java.util.ArrayList;
import java.util.List;
import static org.easymock.EasyMock.*;
@@ -339,4 +340,31 @@ public class MongoDbPageRepositoryTest {
assertNull(result);
}
+ @Test
+ public void getAll(){
+ List<Page> pages = new ArrayList<Page>();
+ expect(template.find(isA(Query.class))).andReturn(pages);
+ replay(template);
+
+ assertThat(pages, is(sameInstance(repo.getAll())));
+ }
+
+ @Test
+ public void getLimitedList(){
+ int offset = 234;
+ int pageSize = 123;
+ List<Page> found = new ArrayList<Page>();
+ expect(template.find(isA(Query.class))).andReturn(found);
+ replay(template);
+ assertThat(found, is(sameInstance(repo.getLimitedList(offset, pageSize))));
+ }
+
+ @Test
+ public void getCountAll_Valid(){
+ long doubleOseven = 007;
+ expect(template.count(new Query())).andReturn(doubleOseven);
+ replay(template);
+ assertThat((int)doubleOseven, is(sameInstance(repo.getCountAll())));
+ }
+
}
Modified: rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepositoryTest.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepositoryTest.java Tue Jul 30 15:30:33 2013
@@ -30,12 +30,14 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.data.mongodb.core.query.Query;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import static org.easymock.EasyMock.*;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.*;
import static org.springframework.data.mongodb.core.query.Criteria.where;
import static org.springframework.data.mongodb.core.query.Query.query;
@@ -243,6 +245,33 @@ public class MongoDbPersonRepositoryTest
boolean result = repo.acceptFriendRequest(friendUsername, username);
assertTrue(result);
+ }
+
+ @Test
+ public void getAll(){
+ List<Person> people = new ArrayList<Person>();
+ List<User> users = new ArrayList<User>();
+ expect(template.find(isA(Query.class))).andReturn(users);
+ replay(template);
+ assertThat(people, is(repo.getAll()));
+ }
+ @Test
+ public void getLimitedList_Valid(){
+ int offset = 234;
+ int pageSize = 123;
+ List<User> users = new ArrayList<User>();
+ List<Person> people = new ArrayList<Person>();
+ expect(template.find(isA(Query.class))).andReturn(users);
+ replay(template);
+ assertThat(people, is(repo.getLimitedList(offset, pageSize)));
+ }
+
+ @Test
+ public void getCountAll_Valid(){
+ long doubleOseven = 007;
+ expect(template.count(new Query())).andReturn(doubleOseven);
+ replay(template);
+ assertThat((int)doubleOseven, is(sameInstance(repo.getCountAll())));
}
}
Modified: rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbTagRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbTagRepositoryTest.java?rev=1508490&r1=1508489&r2=1508490&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbTagRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbTagRepositoryTest.java Tue Jul 30 15:30:33 2013
@@ -66,6 +66,18 @@ public class MongoDbTagRepositoryTest {
}
@Test
+ public void getLimitedList(){
+ List<Tag> tags = Arrays.<Tag>asList(new TagImpl(), new TagImpl());
+
+ expect(tagTemplate.find(new Query())).andReturn(tags);
+ replay(tagTemplate);
+
+ List<Tag> result = repo.getAll();
+ assertNotNull(result);
+ assertThat(result.size(), is(equalTo(tags.size())));
+ }
+
+ @Test
public void countAll(){
expect(tagTemplate.count(new Query())).andReturn(2L);