You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@rave.apache.org by Chris Geer <ch...@cxtsoftware.com> on 2013/07/29 18:25:21 UTC
Re: svn commit: r1508123 - in /rave/trunk/rave-components:
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/apache/rave/portal/repository/impl/
rave-jpa/src/test/java...
Erin, so since you applied the patch as is, are you just planning on making
the changes we discussed in the review after the fact?
On Mon, Jul 29, 2013 at 9:14 AM, <er...@apache.org> wrote:
> Author: erinnp
> Date: Mon Jul 29 16:14:50 2013
> New Revision: 1508123
>
> URL: http://svn.apache.org/r1508123
> Log:
> RAVE 998: Applying patch from dan gornstein.
>
> Modified:
>
> 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/UserRepository.java
>
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
>
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
>
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
>
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.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/JpaRegionWidgetRepository.java
>
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
>
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java
>
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
>
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java
>
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java
>
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java
>
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java
>
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
>
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
>
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepositoryTest.java
>
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepositoryTest.java
>
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java
>
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbUserRepositoryTest.java
>
> 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=1508123&r1=1508122&r2=1508123&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
> Mon Jul 29 16:14:50 2013
> @@ -21,15 +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> {
> -
> - List<PortalPreference> getAll();
> +public interface PortalPreferenceRepository extends
> Repository<PortalPreference>, ResourceRepository<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=1508123&r1=1508122&r2=1508123&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
> Mon Jul 29 16:14:50 2013
> @@ -21,8 +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> { }
> \ No newline at end of file
> +public interface RegionRepository extends Repository<Region>,
> ResourceRepository<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=1508123&r1=1508122&r2=1508123&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
> Mon Jul 29 16:14:50 2013
> @@ -20,5 +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>
> { }
> \ No newline at end of file
> +public interface RegionWidgetRepository extends Repository<RegionWidget>,
> ResourceRepository<RegionWidget> { }
> \ No newline at end of file
>
> 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=1508123&r1=1508122&r2=1508123&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
> Mon Jul 29 16:14:50 2013
> @@ -20,10 +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> {
> +public interface UserRepository extends Repository<User>,
> ResourceRepository<User> {
>
> /**
> * Gets a {@link org.apache.rave.model.User} by its username
>
> Modified:
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
> (original)
> +++
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
> Mon Jul 29 16:14:50 2013
> @@ -51,6 +51,7 @@ import java.util.List;
> @Table(name = "portal_preference")
> @NamedQueries({
> @NamedQuery(name = JpaPortalPreference.GET_ALL, query = "SELECT
> pp FROM JpaPortalPreference pp"),
> + @NamedQuery(name = JpaPortalPreference.COUNT_ALL, query = "SELECT
> count(pp) FROM JpaPortalPreference pp"),
> @NamedQuery(name = JpaPortalPreference.GET_BY_KEY,
> query = "SELECT pp FROM JpaPortalPreference pp WHERE
> pp.key = :" + JpaPortalPreference.PARAM_KEY)
> })
> @@ -59,6 +60,7 @@ public class JpaPortalPreference impleme
> private static final long serialVersionUID = 1L;
>
> public static final String GET_ALL = "PortalPreference.getAll";
> + public static final String COUNT_ALL = "PortalPreference.countAll";
> public static final String GET_BY_KEY = "PortalPreference.getByKey";
> public static final String PARAM_KEY = "key";
>
>
> Modified:
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
> (original)
> +++
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
> Mon Jul 29 16:14:50 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/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
> (original)
> +++
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
> Mon Jul 29 16:14:50 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/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java
> (original)
> +++
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java
> Mon Jul 29 16:14:50 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/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=1508123&r1=1508122&r2=1508123&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
> Mon Jul 29 16:14:50 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.repository.ResourceRepository;
> +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/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java
> (original)
> +++
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java
> Mon Jul 29 16:14:50 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/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
> (original)
> +++
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
> Mon Jul 29 16:14:50 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/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java
> (original)
> +++
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java
> Mon Jul 29 16:14:50 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/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
> (original)
> +++
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
> Mon Jul 29 16:14:50 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/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java
> (original)
> +++
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java
> Mon Jul 29 16:14:50 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/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java
> (original)
> +++
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java
> Mon Jul 29 16:14:50 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/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java
> (original)
> +++
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java
> Mon Jul 29 16:14:50 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/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java
> (original)
> +++
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java
> Mon Jul 29 16:14:50 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/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
> (original)
> +++
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
> Mon Jul 29 16:14:50 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/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
> (original)
> +++
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
> Mon Jul 29 16:14:50 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/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepositoryTest.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepositoryTest.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepositoryTest.java
> (original)
> +++
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepositoryTest.java
> Mon Jul 29 16:14:50 2013
> @@ -28,12 +28,14 @@ import org.apache.rave.util.CollectionUt
> import org.junit.Before;
> import org.junit.Test;
> import org.springframework.data.mongodb.core.MongoOperations;
> +import org.springframework.data.mongodb.core.query.Query;
>
> import java.util.ArrayList;
> import java.util.List;
>
> import static
> org.apache.rave.portal.repository.util.CollectionNames.PREFERENCE_COLLECTION;
> import static org.easymock.EasyMock.*;
> +import static org.easymock.EasyMock.isA;
> import static org.hamcrest.CoreMatchers.*;
> import static org.junit.Assert.assertNotNull;
> import static org.junit.Assert.assertThat;
> @@ -69,6 +71,25 @@ public class MongoDbPortalPreferenceRepo
> }
>
> @Test
> + public void getLimitedList_Valid(){
> + int offset = 234;
> + int pageSize = 123;
> + List<PortalPreferenceImpl> found = new
> ArrayList<PortalPreferenceImpl>();
> + Query q = new Query().skip(offset).limit(pageSize);
> + expect(template.find(q, preferenceRepository.CLASS,
> CollectionNames.PREFERENCE_COLLECTION)).andReturn(found);
> + replay(template);
> +
> assertThat(CollectionUtils.<PortalPreference>toBaseTypedList(found),
> is(sameInstance(preferenceRepository.getLimitedList(offset, pageSize))));
> + }
> +
> + @Test
> + public void getCountAll(){
> + long doubleOseven = 007;
> + expect(template.count(new Query(),
> preferenceRepository.CLASS)).andReturn(doubleOseven);
> + replay(template);
> + assertThat((int)doubleOseven,
> is(sameInstance(preferenceRepository.getCountAll())));
> + }
> +
> + @Test
> public void getByKey_Valid(){
> String key = "key";
> PortalPreferenceImpl found = new PortalPreferenceImpl();
>
> Modified:
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepositoryTest.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepositoryTest.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepositoryTest.java
> (original)
> +++
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepositoryTest.java
> Mon Jul 29 16:14:50 2013
> @@ -65,7 +65,7 @@ public class MongoDbRegionRepositoryTest
> regions.add(region);
> page.setRegions(regions);
>
> - expect( template.findOne(new
> Query(Criteria.where("regions").elemMatch(Criteria.where("_id").is(id))))).andReturn(page);
> + expect(template.findOne(new
> Query(Criteria.where("regions").elemMatch(Criteria.where("_id").is(id))))).andReturn(page);
> replay(template);
>
> Region result = repo.get(id);
> @@ -154,4 +154,75 @@ public class MongoDbRegionRepositoryTest
> repo.delete(item);
> }
>
> + @Test
> + public void getAll(){
> + String id = "1111L";
> + String id2 = "2222L";
> + Page page = new PageImpl("1234L");
> + List<Page> pages = Lists.newArrayList();
> + List<Region> regions = Lists.newArrayList();
> + Region region = new RegionImpl(id);
> + Region region2 = new RegionImpl(id2);
> + regions.add(region);
> + regions.add(region2);
> + pages.add(page);
> + page.setRegions(regions);
> +
> +
> + Query q = new Query();
> + expect(template.find(q)).andReturn(pages);
> + replay(template);
> +
> + List<Region> result = repo.getAll();
> + assertNotNull(result);
> + assertThat(result, is(equalTo(regions)));
> + assertThat(result.size(), equalTo(2));
> + }
> +
> + @Test
> + public void getLimitedList(){
> + String id = "1111L";
> + String id2 = "2222L";
> + Page page = new PageImpl("1234L");
> + List<Page> pages = Lists.newArrayList();
> + List<Region> regions = Lists.newArrayList();
> + Region region = new RegionImpl(id);
> + Region region2 = new RegionImpl(id2);
> + regions.add(region);
> + regions.add(region2);
> + pages.add(page);
> + page.setRegions(regions);
> +
> + Query q = new Query();
> + expect(template.find(q)).andReturn(pages);
> + replay(template);
> +
> + List<Region> result = repo.getLimitedList(1, 1);
> + assertNotNull(result);
> + assertThat(result.size(), equalTo(1));
> + }
> +
> +
> + @Test
> + public void getCount(){
> + String id = "1111L";
> + String id2 = "2222L";
> + Page page = new PageImpl("1234L");
> + List<Page> pages = Lists.newArrayList();
> + List<Region> regions = Lists.newArrayList();
> + Region region = new RegionImpl(id);
> + Region region2 = new RegionImpl(id2);
> + regions.add(region);
> + regions.add(region2);
> + pages.add(page);
> + page.setRegions(regions);
> +
> + Query q = new Query();
> + expect(template.find(q)).andReturn(pages);
> + replay(template);
> +
> + int count = repo.getCountAll();
> + assertNotNull(count);
> + assertThat(count, equalTo(2));
> + }
> }
>
> Modified:
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java
> (original)
> +++
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java
> Mon Jul 29 16:14:50 2013
> @@ -19,6 +19,7 @@
>
> package org.apache.rave.portal.repository.impl;
>
> +import com.google.common.collect.Lists;
> import org.apache.rave.portal.model.MongoDbPage;
> import org.apache.rave.model.Page;
> import org.apache.rave.model.Region;
> @@ -330,4 +331,112 @@ public class MongoDbRegionWidgetReposito
>
> }
>
> + @Test
> + public void getAll(){
> + String id = "1111L";
> + String id2 = "2222L";
> + String regionWidgetId1 = "9876L";
> + String regionWidgetId2 = "6543L";
> + String regionWidgetId3 = "2874L";
> + Page page = new PageImpl("1234L");
> + List<Page> pages = Lists.newArrayList();
> + List<Region> regions = Lists.newArrayList();
> + List<RegionWidget> regionWidgets = Lists.newArrayList();
> + Region region = new RegionImpl(id);
> + Region region2 = new RegionImpl(id2);
> + RegionWidget rw1 = new RegionWidgetImpl(regionWidgetId1);
> + RegionWidget rw2 = new RegionWidgetImpl(regionWidgetId2);
> + RegionWidget rw3 = new RegionWidgetImpl(regionWidgetId3);
> + regions.add(region);
> + regions.add(region2);
> + regionWidgets.add(rw1);
> + regionWidgets.add(rw2);
> + regionWidgets.add(rw3);
> + region.setRegionWidgets(regionWidgets);
> + pages.add(page);
> + page.setRegions(regions);
> +
> +
> + Query q = new Query();
> + expect(template.find(q)).andReturn(pages);
> + replay(template);
> +
> + List<RegionWidget> result = widgetRepository.getAll();
> + assertNotNull(result);
> + assertThat(result, is(equalTo(regionWidgets)));
> + assertThat(result.size(), equalTo(3));
> + }
> +
> + @Test
> + public void getLimitedList(){
> + String id = "1111L";
> + String id2 = "2222L";
> + String regionWidgetId1 = "9876L";
> + String regionWidgetId2 = "6543L";
> + String regionWidgetId3 = "2874L";
> + Page page = new PageImpl("1234L");
> + List<Page> pages = Lists.newArrayList();
> + List<Region> regions = Lists.newArrayList();
> + List<RegionWidget> regionWidgets = Lists.newArrayList();
> + Region region = new RegionImpl(id);
> + Region region2 = new RegionImpl(id2);
> + RegionWidget rw1 = new RegionWidgetImpl(regionWidgetId1);
> + RegionWidget rw2 = new RegionWidgetImpl(regionWidgetId2);
> + RegionWidget rw3 = new RegionWidgetImpl(regionWidgetId3);
> + regions.add(region);
> + regions.add(region2);
> + regionWidgets.add(rw1);
> + regionWidgets.add(rw2);
> + regionWidgets.add(rw3);
> + region.setRegionWidgets(regionWidgets);
> + pages.add(page);
> + page.setRegions(regions);
> +
> +
> + Query q = new Query();
> + expect(template.find(q)).andReturn(pages);
> + replay(template);
> +
> + List<RegionWidget> result = widgetRepository.getLimitedList(1,2);
> + assertNotNull(result);
> + assertThat(result, is(equalTo(regionWidgets.subList(1,3))));
> + assertThat(result.size(), equalTo(2));
> + }
> +
> +
> + @Test
> + public void getCount(){
> + String id = "1111L";
> + String id2 = "2222L";
> + String regionWidgetId1 = "9876L";
> + String regionWidgetId2 = "6543L";
> + String regionWidgetId3 = "2874L";
> + Page page = new PageImpl("1234L");
> + List<Page> pages = Lists.newArrayList();
> + List<Region> regions = Lists.newArrayList();
> + List<RegionWidget> regionWidgets = Lists.newArrayList();
> + Region region = new RegionImpl(id);
> + Region region2 = new RegionImpl(id2);
> + RegionWidget rw1 = new RegionWidgetImpl(regionWidgetId1);
> + RegionWidget rw2 = new RegionWidgetImpl(regionWidgetId2);
> + RegionWidget rw3 = new RegionWidgetImpl(regionWidgetId3);
> + regions.add(region);
> + regions.add(region2);
> + regionWidgets.add(rw1);
> + regionWidgets.add(rw2);
> + regionWidgets.add(rw3);
> + region.setRegionWidgets(regionWidgets);
> + pages.add(page);
> + page.setRegions(regions);
> +
> +
> + Query q = new Query();
> + expect(template.find(q)).andReturn(pages);
> + replay(template);
> +
> + int result = widgetRepository.getCountAll();
> + assertNotNull(result);
> + assertThat(result, equalTo(3));
> + }
> +
> }
>
> Modified:
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbUserRepositoryTest.java
> URL:
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbUserRepositoryTest.java?rev=1508123&r1=1508122&r2=1508123&view=diff
>
> ==============================================================================
> ---
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbUserRepositoryTest.java
> (original)
> +++
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbUserRepositoryTest.java
> Mon Jul 29 16:14:50 2013
> @@ -88,6 +88,14 @@ public class MongoDbUserRepositoryTest {
> }
>
> @Test
> + public void getAll(){
> + List<User> users = new ArrayList<User>();
> + expect(template.find(isA(Query.class))).andReturn(users);
> + replay(template);
> + assertThat(users, is(sameInstance(userRepository.getAll())));
> + }
> +
> + @Test
> public void getLimitedList_Valid(){
> int offset = 234;
> int pageSize = 123;
>
>
>
Re: svn commit: r1508123 - in /rave/trunk/rave-components:
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/apache/rave/portal/repository/impl/
rave-jpa/src/test/java...
Posted by Erin Noe-Payne <er...@gmail.com>.
Correct. Dan is goin to do the work of the interface merge and we had split
the previous repository work. I went ahead and applied so that he can patch
against the current state.
On Monday, July 29, 2013, Chris Geer wrote:
> Erin, so since you applied the patch as is, are you just planning on making
> the changes we discussed in the review after the fact?
>
>
> On Mon, Jul 29, 2013 at 9:14 AM, <er...@apache.org> wrote:
>
> > Author: erinnp
> > Date: Mon Jul 29 16:14:50 2013
> > New Revision: 1508123
> >
> > URL: http://svn.apache.org/r1508123
> > Log:
> > RAVE 998: Applying patch from dan gornstein.
> >
> > Modified:
> >
> >
> 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/UserRepository.java
> >
> >
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
> >
> >
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
> >
> >
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
> >
> >
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.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/JpaRegionWidgetRepository.java
> >
> >
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
> >
> >
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java
> >
> >
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
> >
> >
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java
> >
> >
> rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java
> >
> >
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java
> >
> >
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java
> >
> >
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
> >
> >
> rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
> >
> >
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepositoryTest.java
> >
> >
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepositoryTest.java
> >
> >
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java
> >
> >
> rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbUserRepositoryTest.java
> >
> > 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=1508123&r1=1508122&r2=1508123&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
> > Mon Jul 29 16:14:50 2013
> > @@ -21,15 +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> {
> > -
> > - List<PortalPreference> getAll();
> > +public interface PortalPreferenceRepository extends
> > Repository<PortalPreference>, ResourceRepository<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=1508123&r1=1508122&r2=1508123&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
> > Mon Jul 29 16:14:50 2013
> > @@ -21,8 +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> { }
> > \ No newline at end of file
> > +public interface RegionRepository extends Repository<Region>,
> > ResourceRepository<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=1508123&r1=1508122&r2=1508123&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
> > Mon Jul 29 16:14:50 2013
> > @@ -20,5 +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>
> > { }
> > \ No newline at end of file
> > +public interface RegionWidgetRepository extends
> Repository<RegionWidget>,
> > ResourceRepository<RegionWidget> { }
> > \ No newline at end of file
> >
> > 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=1508123&r1=1508122&r2=1508123&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
> > Mon Jul 29 16:14:50 2013
> > @@ -20,10 +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> {
> > +public interface UserRepository extends Repository<User>,
> > ResourceRepository<User> {
> >
> > /**
> > * Gets a {@link org.apache.rave.model.User} by its username
> >
> > Modified:
> >
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
> > URL:
> >
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java?rev=1508123&r1=1508122&r2=1508123&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
> > (original)
> > +++
> >
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
> > Mon Jul 29 16:14:50 2013
> > @@ -51,6 +51,7 @@ import java.util.List;
> > @Table(name = "portal_preference")
> > @NamedQueries({
> > @NamedQuery(name = JpaPortalPreference.GET_ALL, query = "SELECT
> > pp FROM JpaPortalPreference pp"),
> > + @NamedQuery(name = JpaPortalPreference.COUNT_ALL, query =
> "SELECT
> > count(pp) FROM JpaPortalPreference pp"),
> > @NamedQuery(name = JpaPortalPreference.GET_BY_KEY,
> > query = "SELECT pp FROM JpaPortalPreference pp WHERE
> > pp.key = :" + JpaPortalPreference.PARAM_KEY)
> > })
> > @@ -59,6 +60,7 @@ public class JpaPortalPreference impleme
> > private static final long serialVersionUID = 1L;
> >
> > public static final String GET_ALL = "PortalPreference.getAll";
> > + public static final String COUNT_ALL = "PortalPreference.countAll";
> > public static final String GET_BY_KEY = "PortalPreference.getByKey";
> > public static final String PARAM_KEY = "key";
> >
> >
> > Modified:
> >
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
> > URL:
> >
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java?rev=1508123&r1=1508122&r2=1508123&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
> > (original)
> > +++
> >
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
> > Mon Jul 29 16:14:50 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/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
> > URL:
> >
> http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java?rev=1508123&r1=1508122&r2=1508123&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
> > (original)
> > +++
> >
> rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
> > Mon Jul 29 16:14:50 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 @