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/08/12 22:26:52 UTC
svn commit: r1513246 [3/4] - in /rave/branches/angular: ./
rave-components/rave-core-api/src/main/java/org/apache/rave/repository/
rave-components/rave-core-api/src/main/java/org/apache/rave/rest/
rave-components/rave-core-api/src/main/java/org/apache/...
Modified: rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java Mon Aug 12 20:26:49 2013
@@ -41,15 +41,22 @@ import java.util.List;
@Entity
@Table(name="region")
@Access(AccessType.FIELD)
-@NamedQueries(
- @NamedQuery(name = JpaRegion.FIND_BY_ENTITY_ID, query="select r from JpaRegion r where r.entityId = :entity_id")
-)
+@NamedQueries({
+ @NamedQuery(name = JpaRegion.FIND_BY_ENTITY_ID, query="select r from JpaRegion r where r.entityId = :entity_id"),
+ @NamedQuery(name = JpaRegion.REGION_GET_ALL, query = JpaRegion.SELECT_R_FROM_REGION_R),
+ @NamedQuery(name = JpaRegion.REGION_COUNT_ALL, query = JpaRegion.SELECT_COUNT_R_FROM_REGION_R)
+})
public class JpaRegion implements BasicEntity, Serializable, Region {
private static final long serialVersionUID = 1L;
public static final String FIND_BY_ENTITY_ID = "Region.findByEntityId";
+ public static final String REGION_GET_ALL = "Region.getAll";
+ public static final String REGION_COUNT_ALL = "Region.countAll";
public static final String ENTITY_ID_PARAM = "entity_id";
+ static final String SELECT_R_FROM_REGION_R = "SELECT r FROM JpaRegion r order by r.entityId";
+ static final String SELECT_COUNT_R_FROM_REGION_R = "SELECT count(r) FROM JpaRegion r ";
+
@Id @Column(name="entity_id")
@GeneratedValue(strategy = GenerationType.TABLE, generator = "regionIdGenerator")
@TableGenerator(name = "regionIdGenerator", table = "RAVE_PORTAL_SEQUENCES", pkColumnName = "SEQ_NAME",
Modified: rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java Mon Aug 12 20:26:49 2013
@@ -42,7 +42,9 @@ import java.util.List;
@NamedQuery(name = JpaRegionWidget.REGION_WIDGET_GET_DISTINCT_USER_COUNT_SINGLE_WIDGET,
query = "select count(distinct rw.region.page.ownerId) from JpaRegionWidget rw where rw.widgetId = :widgetId"),
@NamedQuery(name = JpaRegionWidget.FIND_BY_ID,
- query = "select rw from JpaRegionWidget rw where rw.entityId = :widgetId")
+ query = "select rw from JpaRegionWidget rw where rw.entityId = :widgetId"),
+ @NamedQuery(name = JpaRegionWidget.REGION_WIDGET_GET_ALL, query = JpaRegionWidget.SELECT_R_FROM_REGION_WIDGET_R),
+ @NamedQuery(name = JpaRegionWidget.REGION_WIDGET_COUNT_ALL, query = JpaRegionWidget.SELECT_COUNT_R_FROM_REGION_WIDGET_R)
})
public class JpaRegionWidget implements BasicEntity, Serializable, RegionWidget {
private static final long serialVersionUID = 1L;
@@ -50,9 +52,15 @@ public class JpaRegionWidget implements
public static final String FIND_BY_ID = "RegionWidget.findById";
public static final String REGION_WIDGET_GET_DISTINCT_USER_COUNT_ALL_WIDGETS = "JpaRegionWidget.getDistinctUserCountForAllWidgets";
public static final String REGION_WIDGET_GET_DISTINCT_USER_COUNT_SINGLE_WIDGET = "JpaRegionWidget.getDistinctUserCount";
+ public static final String REGION_WIDGET_GET_ALL = "JpaRegionWidget.getAll";
+ public static final String REGION_WIDGET_COUNT_ALL = "JpaRegionWidget.countAll";
+
public static final String PARAM_WIDGET_ID = "widgetId";
+ static final String SELECT_R_FROM_REGION_WIDGET_R = "SELECT r FROM JpaRegionWidget r order by r.entityId";
+ static final String SELECT_COUNT_R_FROM_REGION_WIDGET_R = "SELECT count(r) FROM JpaRegionWidget r ";
+
@Id
@Column(name = "entity_id")
@GeneratedValue(strategy = GenerationType.TABLE, generator = "regionWidgetIdGenerator")
@@ -296,4 +304,4 @@ public class JpaRegionWidget implements
sb.append("}");
return sb.toString();
}
-}
\ No newline at end of file
+}
Modified: rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java Mon Aug 12 20:26:49 2013
@@ -59,8 +59,8 @@ import java.util.List;
@Access(AccessType.FIELD)
@Table(name = "widget")
@NamedQueries({
- @NamedQuery(name = JpaWidget.WIDGET_GET_ALL, query = JpaWidget.SELECT_W_FROM_WIDGET_W + JpaWidget.ORDER_BY_TITLE_ASC),
- @NamedQuery(name = JpaWidget.WIDGET_COUNT_ALL, query = JpaWidget.SELECT_COUNT_W_FROM_WIDGET_W),
+ @NamedQuery(name = JpaWidget.GET_ALL, query = JpaWidget.SELECT_W_FROM_WIDGET_W + JpaWidget.ORDER_BY_TITLE_ASC),
+ @NamedQuery(name = JpaWidget.GET_COUNT, query = JpaWidget.SELECT_COUNT_W_FROM_WIDGET_W),
@NamedQuery(name = JpaWidget.WIDGET_GET_BY_OWNER,
query = JpaWidget.SELECT_W_FROM_WIDGET_W + JpaWidget.WHERE_CLAUSE_OWNER + JpaWidget.ORDER_BY_TITLE_ASC),
@@ -92,8 +92,8 @@ public class JpaWidget implements BasicE
public static final String PARAM_OWNER = "owner";
public static final String PARAM_TAG_ID = "tagId";
- public static final String WIDGET_GET_ALL = "Widget.getAll";
- public static final String WIDGET_COUNT_ALL = "Widget.countAll";
+ public static final String GET_ALL = "Widget.getAll";
+ public static final String GET_COUNT = "Widget.countAll";
public static final String WIDGET_GET_BY_OWNER = "Widget.getByOwner";
public static final String WIDGET_COUNT_BY_OWNER = "Widget.countByOwner";
public static final String WIDGET_GET_BY_FREE_TEXT = "Widget.getByFreeText";
Modified: rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java Mon Aug 12 20:26:49 2013
@@ -21,6 +21,7 @@ package org.apache.rave.portal.repositor
import org.apache.rave.model.Category;
import org.apache.rave.portal.model.JpaCategory;
+import org.apache.rave.portal.model.JpaWidget;
import org.apache.rave.portal.model.conversion.JpaCategoryConverter;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.util.CollectionUtils;
@@ -29,8 +30,11 @@ import org.springframework.stereotype.Re
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+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.saveOrUpdate;
/**
@@ -71,7 +75,20 @@ public class JpaCategoryRepository imple
List<JpaCategory> resultList = manager.createNamedQuery(JpaCategory.GET_ALL, JpaCategory.class).getResultList();
return CollectionUtils.<Category>toBaseTypedList(resultList);
}
-
+
+ @Override
+ public List<Category> getLimitedList(int offset, int limit) {
+ TypedQuery<JpaCategory> query = manager.createNamedQuery(JpaCategory.GET_ALL, JpaCategory.class);
+ return CollectionUtils.<Category>toBaseTypedList(getPagedResultList(query, offset, limit));
+ }
+
+ @Override
+ public int getCountAll() {
+ Query query = manager.createNamedQuery(JpaCategory.GET_COUNT);
+ Number countResult = (Number) query.getSingleResult();
+ return countResult.intValue();
+ }
+
@Override
public int removeFromCreatedOrModifiedFields(String userId) {
List<Category> categories = getAll();
Modified: rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaGroupRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaGroupRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaGroupRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaGroupRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java Mon Aug 12 20:26:49 2013
@@ -29,10 +29,12 @@ import org.springframework.stereotype.Re
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
import javax.persistence.TypedQuery;
import java.util.ArrayList;
import java.util.List;
+import static org.apache.rave.persistence.jpa.util.JpaUtil.getPagedResultList;
import static org.apache.rave.persistence.jpa.util.JpaUtil.saveOrUpdate;
@Repository
@@ -74,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);
@@ -83,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)){
@@ -253,4 +255,22 @@ public class JpaPageRepository implement
return pages;
}
+ @Override
+ public List<Page> getAll() {
+ TypedQuery<Page> query = manager.createNamedQuery(JpaPage.GET_ALL, Page.class);
+ return CollectionUtils.<Page>toBaseTypedList(query.getResultList());
+ }
+
+ @Override
+ public List<Page> getLimitedList(int offset, int limit) {
+ TypedQuery<Page> query = manager.createNamedQuery(JpaPage.GET_ALL, Page.class);
+ return CollectionUtils.<Page>toBaseTypedList(getPagedResultList(query, offset, limit));
+ }
+
+ @Override
+ public int getCountAll() {
+ Query query = manager.createNamedQuery(JpaPage.GET_COUNT);
+ Number countResult = (Number) query.getSingleResult();
+ return countResult.intValue();
+ }
}
\ No newline at end of file
Modified: rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java Mon Aug 12 20:26:49 2013
@@ -34,11 +34,13 @@ import org.springframework.stereotype.Re
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
import javax.persistence.TypedQuery;
import java.util.ArrayList;
import java.util.HashMap;
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;
@@ -70,7 +72,7 @@ public class JpaPersonRepository impleme
connections.addAll(findFriends(username));
TypedQuery<JpaGroup> members = manager.createQuery("SELECT g from JpaGroup g where :userId member of g.members", JpaGroup.class);
members.setParameter("userId", personId);
- for(JpaGroup groups : members.getResultList()) {
+ for (JpaGroup groups : members.getResultList()) {
addPeopleByIds(groups, connections);
}
}
@@ -248,7 +250,7 @@ public class JpaPersonRepository impleme
return receiverItem.getEntityId() != null && senderItem.getEntityId() != null;
}
-
+
@Override
public int removeAllFriendsAndRequests(String userid) {
TypedQuery<JpaPersonAssociation> query = manager.createNamedQuery(JpaPersonAssociation.DELETE_ASSOCIATION_ITEMS_BY_USERID, JpaPersonAssociation.class);
@@ -272,4 +274,23 @@ public class JpaPersonRepository impleme
}
}
}
+
+ @Override
+ public List<Person> getAll() {
+ TypedQuery<Person> query = manager.createNamedQuery(JpaPerson.GET_ALL, Person.class);
+ return CollectionUtils.<Person>toBaseTypedList(query.getResultList());
+ }
+
+ @Override
+ public List<Person> getLimitedList(int offset, int limit) {
+ TypedQuery<Person> query = manager.createNamedQuery(JpaPerson.GET_ALL, Person.class);
+ return CollectionUtils.<Person>toBaseTypedList(getPagedResultList(query, offset, limit));
+ }
+
+ @Override
+ public int getCountAll() {
+ Query query = manager.createNamedQuery(JpaPerson.GET_COUNT);
+ Number countResult = (Number) query.getSingleResult();
+ return countResult.intValue();
+ }
}
Modified: rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java Mon Aug 12 20:26:49 2013
@@ -29,9 +29,11 @@ import org.springframework.stereotype.Re
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+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 +58,20 @@ public class JpaPortalPreferenceReposito
}
@Override
+ public List<PortalPreference> getLimitedList(int offset, int pageSize) {
+ final TypedQuery<JpaPortalPreference> query =
+ manager.createNamedQuery(JpaPortalPreference.GET_ALL, JpaPortalPreference.class);
+ return CollectionUtils.<PortalPreference>toBaseTypedList(getPagedResultList(query, offset, pageSize));
+ }
+
+ @Override
+ public int getCountAll() {
+ Query query = manager.createNamedQuery(JpaPortalPreference.COUNT_ALL);
+ Number countResult = (Number) query.getSingleResult();
+ return countResult.intValue();
+ }
+
+ @Override
public PortalPreference getByKey(String key) {
final TypedQuery<JpaPortalPreference> query =
manager.createNamedQuery(JpaPortalPreference.GET_BY_KEY, JpaPortalPreference.class);
Modified: rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java Mon Aug 12 20:26:49 2013
@@ -23,17 +23,28 @@ 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.util.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+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.saveOrUpdate;
@Repository
public class JpaRegionRepository implements RegionRepository {
+ private final Logger log = LoggerFactory.getLogger(JpaRegionRepository.class);
+
@PersistenceContext
private EntityManager manager;
@@ -60,4 +71,24 @@ public class JpaRegionRepository impleme
public void delete(Region item) {
manager.remove(item instanceof JpaRegion ? item : get(item.getId()));
}
+
+ @Override
+ public List<Region> getAll() {
+ log.warn("Requesting potentially large resultset of Region. No pagesize set.");
+ TypedQuery<JpaRegion> query = manager.createNamedQuery(JpaRegion.REGION_GET_ALL, JpaRegion.class);
+ return CollectionUtils.<Region>toBaseTypedList(query.getResultList());
+ }
+
+ @Override
+ public List<Region> getLimitedList(int offset, int pageSize) {
+ TypedQuery<JpaRegion> query = manager.createNamedQuery(JpaRegion.REGION_GET_ALL, JpaRegion.class);
+ return CollectionUtils.<Region>toBaseTypedList(getPagedResultList(query, offset, pageSize));
+ }
+
+ @Override
+ public int getCountAll() {
+ Query query = manager.createNamedQuery(JpaRegion.REGION_COUNT_ALL);
+ Number countResult = (Number) query.getSingleResult();
+ return countResult.intValue();
+ }
}
Modified: rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java Mon Aug 12 20:26:49 2013
@@ -23,17 +23,26 @@ import org.apache.rave.portal.model.JpaR
import org.apache.rave.model.RegionWidget;
import org.apache.rave.portal.model.conversion.JpaRegionWidgetConverter;
import org.apache.rave.portal.repository.RegionWidgetRepository;
+import org.apache.rave.util.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+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.saveOrUpdate;
@Repository
public class JpaRegionWidgetRepository implements RegionWidgetRepository {
+ private final Logger log = LoggerFactory.getLogger(JpaRegionWidgetRepository.class);
@PersistenceContext
private EntityManager manager;
@@ -61,4 +70,24 @@ public class JpaRegionWidgetRepository i
public void delete(RegionWidget item) {
manager.remove(item instanceof JpaRegionWidget ? item : get(item.getId()));
}
+
+ @Override
+ public List<RegionWidget> getAll() {
+ log.warn("Requesting potentially large resultset of RegionWidget. No pagesize set.");
+ TypedQuery<JpaRegionWidget> query = manager.createNamedQuery(JpaRegionWidget.REGION_WIDGET_GET_ALL, JpaRegionWidget.class);
+ return CollectionUtils.<RegionWidget>toBaseTypedList(query.getResultList());
+ }
+
+ @Override
+ public List<RegionWidget> getLimitedList(int offset, int pageSize) {
+ TypedQuery<JpaRegionWidget> query = manager.createNamedQuery(JpaRegionWidget.REGION_WIDGET_GET_ALL, JpaRegionWidget.class);
+ return CollectionUtils.<RegionWidget>toBaseTypedList(getPagedResultList(query, offset, pageSize));
+ }
+
+ @Override
+ public int getCountAll() {
+ Query query = manager.createNamedQuery(JpaRegionWidget.REGION_WIDGET_COUNT_ALL);
+ Number countResult = (Number) query.getSingleResult();
+ return countResult.intValue();
+ }
}
\ No newline at end of file
Modified: rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java Mon Aug 12 20:26:49 2013
@@ -24,6 +24,8 @@ import org.apache.rave.model.User;
import org.apache.rave.portal.model.conversion.JpaUserConverter;
import org.apache.rave.portal.repository.UserRepository;
import org.apache.rave.util.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
@@ -40,6 +42,8 @@ import static org.apache.rave.persistenc
@Repository
public class JpaUserRepository implements UserRepository {
+ private final Logger log = LoggerFactory.getLogger(JpaUserRepository.class);
+
@Autowired
private JpaUserConverter converter;
@@ -68,6 +72,14 @@ public class JpaUserRepository implement
}
@Override
+ public List<User> getAll() {
+ log.warn("Requesting potentially large resultset of Users. No pagesize set.");
+ TypedQuery<JpaUser> query = manager.createNamedQuery(JpaUser.USER_GET_ALL, JpaUser.class);
+ return CollectionUtils.<User>toBaseTypedList(query.getResultList());
+
+ }
+
+ @Override
public List<User> getLimitedList(int offset, int pageSize) {
TypedQuery<JpaUser> query = manager.createNamedQuery(JpaUser.USER_GET_ALL, JpaUser.class);
return CollectionUtils.<User>toBaseTypedList(getPagedResultList(query, offset, pageSize));
Modified: rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java Mon Aug 12 20:26:49 2013
@@ -92,19 +92,19 @@ public class JpaWidgetRepository impleme
@Override
public List<Widget> getAll() {
log.warn("Requesting potentially large resultset of Widget. No pagesize set.");
- TypedQuery<JpaWidget> query = manager.createNamedQuery(JpaWidget.WIDGET_GET_ALL, JpaWidget.class);
+ TypedQuery<JpaWidget> query = manager.createNamedQuery(JpaWidget.GET_ALL, JpaWidget.class);
return CollectionUtils.<Widget>toBaseTypedList(query.getResultList());
}
@Override
public List<Widget> getLimitedList(int offset, int pageSize) {
- TypedQuery<JpaWidget> query = manager.createNamedQuery(JpaWidget.WIDGET_GET_ALL, JpaWidget.class);
+ TypedQuery<JpaWidget> query = manager.createNamedQuery(JpaWidget.GET_ALL, JpaWidget.class);
return CollectionUtils.<Widget>toBaseTypedList(getPagedResultList(query, offset, pageSize));
}
@Override
public int getCountAll() {
- Query query = manager.createNamedQuery(JpaWidget.WIDGET_COUNT_ALL);
+ Query query = manager.createNamedQuery(JpaWidget.GET_COUNT);
Number countResult = (Number) query.getSingleResult();
return countResult.intValue();
}
Modified: rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java Mon Aug 12 20:26:49 2013
@@ -138,6 +138,19 @@ public class JpaCategoryRepositoryTest {
lastText = currentText;
}
}
+ @Test
+ public void getLimitedList() {
+ List<Category> list = repository.getLimitedList(1, 2);
+ assertThat(list.size(), is(2));
+ assertThat(list.get(0).getText(), is("Cat99"));
+ assertThat(list.get(1).getText(), is("News Category"));
+ }
+
+ @Test
+ public void getCountAll(){
+ int count = repository.getCountAll();
+ assertThat(count, is(6));
+ }
/**
* Verify that a unique constraint exception is thrown if a duplicate text value is attempted to be added
Modified: rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java Mon Aug 12 20:26:49 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
@@ -298,4 +298,27 @@ public class JpaPageRepositoryTest {
public void getType() {
assertEquals(repository.getType(), JpaPage.class);
}
+
+ @Test
+ public void getAll(){
+ List<Page> pages = repository.getAll();
+ assertThat(pages.size(), is(17));
+ }
+
+ @Test
+ public void getLimitedList(){
+ List<Page> pages = repository.getLimitedList(2, 5);
+ assertThat(pages.size(), is(5));
+ assertThat(pages.get(0).getId(), is("3"));
+ assertThat(pages.get(1).getId(), is("4"));
+ assertThat(pages.get(2).getId(), is("5"));
+ assertThat(pages.get(3).getId(), is("6"));
+ assertThat(pages.get(4).getId(), is("7"));
+ }
+
+ @Test
+ public void getCountAll(){
+ int count = repository.getCountAll();
+ assertThat(count, is(17));
+ }
}
\ No newline at end of file
Modified: rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java Mon Aug 12 20:26:49 2013
@@ -74,6 +74,18 @@ public class JpaPortalPreferenceReposito
}
@Test
+ public void testGetLimitedList(){
+ final List<PortalPreference> preferences = repository.getLimitedList(1, 1);
+ assertTrue(preferences.size() == 1);
+ }
+
+ @Test
+ public void testCountAll(){
+ int count = repository.getCountAll();
+ assertTrue(count == 2);
+ }
+
+ @Test
public void testGetByKey() {
PortalPreference preference = repository.getByKey("color");
assertNotNull(preference);
Modified: rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java Mon Aug 12 20:26:49 2013
@@ -36,6 +36,7 @@ import org.springframework.transaction.a
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import java.util.ArrayList;
+import java.util.List;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertEquals;
@@ -70,6 +71,27 @@ public class JpaRegionRepositoryTest {
}
@Test
+ public void getAll(){
+ List<Region> regions = repository.getAll();
+ assertThat(regions, is(notNullValue()));
+ assertThat(regions.size(), is(equalTo(34)));
+ assertThat(regions.get(0).getId(), is(equalTo("1")));
+ }
+
+ @Test
+ public void getLimitedSet(){
+ List<Region> regions = repository.getLimitedList(0, 10);
+ assertThat(regions.size(), is(equalTo(10)));
+ }
+
+ @Test
+ public void getCount(){
+ int count = repository.getCountAll();
+ assertThat(count, is(notNullValue()));
+ assertThat(count, is(equalTo(34)));
+ }
+
+ @Test
@Rollback(true)
public void save_newEntity() {
JpaRegion region = new JpaRegion();
Modified: rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java Mon Aug 12 20:26:49 2013
@@ -36,6 +36,7 @@ import org.springframework.transaction.a
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import java.util.ArrayList;
+import java.util.List;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertEquals;
@@ -75,6 +76,27 @@ public class JpaRegionWidgetRepositoryTe
}
@Test
+ public void getAll(){
+ List<RegionWidget> regions = repository.getAll();
+ assertThat(regions, is(notNullValue()));
+ assertThat(regions.size(), is(equalTo(51)));
+ }
+
+ @Test
+ public void getLimitedSet(){
+ List<RegionWidget> regions = repository.getLimitedList(0, 10);
+ assertThat(regions.size(), is(equalTo(10)));
+ }
+
+ @Test
+ public void getCount(){
+ int count = repository.getCountAll();
+ assertThat(count, is(notNullValue()));
+ assertThat(count, is(equalTo(51)));
+ }
+
+
+ @Test
@Rollback(true)
public void save_newEntity() {
RegionWidget regionWidget = new JpaRegionWidget();
@@ -185,4 +207,4 @@ public class JpaRegionWidgetRepositoryTe
manager.flush();
return ((JpaRegionWidgetPreference)saved.getPreferences().get(0)).getEntityId();
}
-}
\ No newline at end of file
+}
Modified: rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java (original)
+++ rave/branches/angular/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java Mon Aug 12 20:26:49 2013
@@ -151,6 +151,13 @@ public class JpaUserRepositoryTest {
}
@Test
+ public void getAll(){
+ List<User> users = repository.getAll();
+ assertNotNull(users);
+ assertThat(users.size(), is(13));
+ }
+
+ @Test
public void getLimitedList() {
final int offset = 0;
final int pageSize = 5;
Modified: rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbActivityStreamsRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbActivityStreamsRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbActivityStreamsRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbActivityStreamsRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java Mon Aug 12 20:26:49 2013
@@ -26,6 +26,7 @@ import org.apache.rave.portal.repository
import org.apache.rave.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -50,6 +51,16 @@ public class MongoDbCategoryRepository i
}
@Override
+ public List<Category> getLimitedList(int offset, int limit) {
+ return CollectionUtils.<Category>toBaseTypedList(hydrate(template.find(new Query().skip(offset).limit(limit), CLASS)));
+ }
+
+ @Override
+ public int getCountAll() {
+ return (int) template.count(new Query(), CLASS);
+ }
+
+ @Override
public int removeFromCreatedOrModifiedFields(String userId) {
List<MongoDbCategory> categories = template.find(query(where("lastModifiedUserId").is(userId).orOperator(where("createdUserId").is(userId))), CLASS, CATEGORY_COLLECTION);
int count = 0;
Modified: rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbGroupRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java Mon Aug 12 20:26:49 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);
}
@@ -266,4 +266,18 @@ public class MongoDbPageRepository imple
}
+ @Override
+ public List<Page> getAll() {
+ return template.find(new Query());
+ }
+
+ @Override
+ public List<Page> getLimitedList(int offset, int pageSize) {
+ return template.find(new Query().skip(offset).limit(pageSize));
+ }
+
+ @Override
+ public int getCountAll() {
+ return (int) template.count(new Query());
+ }
}
Modified: rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java Mon Aug 12 20:26:49 2013
@@ -38,6 +38,7 @@ import org.springframework.data.mongodb.
import org.springframework.stereotype.Component;
import javax.annotation.Nullable;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -187,7 +188,7 @@ public class MongoDbPersonRepository imp
@Override
public int removeAllFriendsAndRequests(String userid) {
- MongoDbUser person = (MongoDbUser)template.get(userid);
+ MongoDbUser person = (MongoDbUser) template.get(userid);
int count = person.getFriends().size();
person.setFriends(Lists.<MongoDbPersonAssociation>newArrayList());
save(person);
@@ -301,4 +302,29 @@ public class MongoDbPersonRepository imp
public void setWidgetOperations(MongoWidgetOperations widgetOperations) {
this.widgetOperations = widgetOperations;
}
+
+ @Override
+ public List<Person> getAll() {
+ List<User> users = template.find(new Query());
+ ArrayList<Person> persons= new ArrayList<Person>();
+ for(User user : users) {
+ persons.add(user.toPerson());
+ }
+ return persons;
+ }
+
+ @Override
+ public List<Person> getLimitedList(int offset, int limit) {
+ List<User> users = template.find(new Query().skip(offset).limit(limit));
+ ArrayList<Person> persons= new ArrayList<Person>();
+ for(User user : users) {
+ persons.add(user.toPerson());
+ }
+ return persons;
+ }
+
+ @Override
+ public int getCountAll() {
+ return (int) template.count(new Query());
+ }
}
Modified: rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java Mon Aug 12 20:26:49 2013
@@ -27,6 +27,7 @@ import org.apache.rave.portal.repository
import org.apache.rave.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -53,6 +54,17 @@ public class MongoDbPortalPreferenceRepo
}
@Override
+ public List<PortalPreference> getLimitedList(int offset, int pageSize) {
+ Query q = new Query().skip(offset).limit(pageSize);
+ return CollectionUtils.<PortalPreference>toBaseTypedList(template.find(q, CLASS, PREFERENCE_COLLECTION));
+ }
+
+ @Override
+ public int getCountAll() {
+ return (int)template.count(new Query(), CLASS);
+ }
+
+ @Override
public PortalPreference getByKey(String key) {
return template.findOne(query(where("key").is(key)), CLASS, PREFERENCE_COLLECTION);
}
Modified: rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java Mon Aug 12 20:26:49 2013
@@ -26,9 +26,11 @@ import org.apache.rave.portal.repository
import org.apache.rave.portal.repository.RegionRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Field;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Repository;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -87,6 +89,42 @@ public class MongoDbRegionRepository imp
template.save(page);
}
+ @Override
+ public List<Region> getAll(){
+
+ Query q = new Query();
+
+ List<Page> allPages = template.find(q);
+
+ List<Region> regions = new ArrayList<Region>();
+
+ for(Page page: allPages){
+ List<Region> rgns = page.getRegions();
+ if(rgns != null){
+ for(Region region : rgns) {
+ regions.add(region);
+ }
+ }
+
+ }
+
+ return regions;
+ }
+
+ @Override
+ public List<Region> getLimitedList(int offset, int pageSize){
+ List<Region> regions = this.getAll();
+ int end = regions.size() < offset + pageSize ? regions.size() : offset + pageSize;
+
+ return regions.subList(offset, end);
+ }
+
+ @Override
+ public int getCountAll() {
+ return this.getAll().size();
+ }
+
+
private void removeRegion(Page page, Region item) {
Iterator<Region> iterator = page.getRegions().iterator();
while(iterator.hasNext()) {
Modified: rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java Mon Aug 12 20:26:49 2013
@@ -27,8 +27,10 @@ import org.apache.rave.portal.repository
import org.apache.rave.portal.repository.RegionWidgetRepository;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Repository;
+import java.util.ArrayList;
import java.util.List;
import static org.springframework.data.mongodb.core.query.Criteria.where;
@@ -63,6 +65,45 @@ public class MongoDbRegionWidgetReposito
template.save(page);
}
+ @Override
+ public List<RegionWidget> getAll(){
+ Query q = new Query();
+
+ List<Page> allPages = template.find(q);
+
+ List<RegionWidget> regionWidgets = new ArrayList<RegionWidget>();
+
+ for(Page page: allPages){
+ List<Region> regions = page.getRegions();
+ if(regions != null){
+ for(Region region : regions) {
+ List<RegionWidget> rws = region.getRegionWidgets();
+ if(rws != null){
+ for(RegionWidget rw : rws){
+ regionWidgets.add(rw);
+ }
+ }
+ }
+ }
+
+ }
+
+ return regionWidgets;
+ }
+
+ @Override
+ public List<RegionWidget> getLimitedList(int offset, int pageSize) {
+ List<RegionWidget> regionWidgets = this.getAll();
+ int end = regionWidgets.size() < offset + pageSize ? regionWidgets.size() : offset + pageSize;
+
+ return regionWidgets.subList(offset, end);
+ }
+
+ @Override
+ public int getCountAll() {
+ return this.getAll().size();
+ }
+
private RegionWidget updateRegionWidget(RegionWidget item) {
RegionWidget savedWidget;
Page page = getPageByRegionWidgetId(item.getId());
Modified: rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java Mon Aug 12 20:26:49 2013
@@ -66,6 +66,12 @@ public class MongoDbUserRepository imple
}
@Override
+ public List<User> getAll(){
+ Query query = new Query();
+ return template.find(query);
+ }
+
+ @Override
public List<User> getLimitedList(int offset, int pageSize) {
Query query = new Query().skip(offset).limit(pageSize);
return template.find(addSort(query));
Modified: rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java Mon Aug 12 20:26:49 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/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java?rev=1513246&r1=1513245&r2=1513246&view=diff
==============================================================================
--- rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java (original)
+++ rave/branches/angular/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java Mon Aug 12 20:26:49 2013
@@ -21,13 +21,13 @@ 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;
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.*;
@@ -76,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);
}
@@ -339,4 +339,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())));
+ }
+
}