You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by er...@apache.org on 2013/07/26 21:19:42 UTC
svn commit: r1507405 - in /rave/trunk/rave-components:
rave-core/src/main/java/org/apache/rave/portal/repository/
rave-core/src/test/java/org/apache/rave/portal/service/impl/mock/
rave-jpa/src/main/java/org/apache/rave/portal/model/ rave-jpa/src/main/j...
Author: erinnp
Date: Fri Jul 26 19:19:42 2013
New Revision: 1507405
URL: http://svn.apache.org/r1507405
Log:
Update repository layer and tests
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java
rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/mock/MockCategoryRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java?rev=1507405&r1=1507404&r2=1507405&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java Fri Jul 26 19:19:42 2013
@@ -17,16 +17,11 @@ package org.apache.rave.portal.repositor
import org.apache.rave.repository.Repository;
import org.apache.rave.model.Category;
-import java.util.List;
+import org.apache.rave.repository.ResourceRepository;
-public interface CategoryRepository extends Repository<Category> {
- /**
- * Gets a list of <strong>all</strong> Category objects in the repository
- *
- * @return a valid List
- */
- List<Category> getAll();
+import java.util.List;
+public interface CategoryRepository extends Repository<Category>, ResourceRepository<Category> {
/**
* Removes a user from the createdBy or modifiedBy fields for any Category they are associated with and assigns
* the values to null
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/mock/MockCategoryRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/mock/MockCategoryRepository.java?rev=1507405&r1=1507404&r2=1507405&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/mock/MockCategoryRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/mock/MockCategoryRepository.java Fri Jul 26 19:19:42 2013
@@ -30,6 +30,16 @@ public class MockCategoryRepository impl
}
@Override
+ public List<Category> getLimitedList(int offset, int limit) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public int getCountAll() {
+ return 0; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
public int removeFromCreatedOrModifiedFields(String userId) {
return 0; //To change body of implemented methods use File | Settings | File Templates.
}
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java?rev=1507405&r1=1507404&r2=1507405&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java Fri Jul 26 19:19:42 2013
@@ -34,11 +34,13 @@ import java.util.List;
@Access(AccessType.FIELD)
@XmlRootElement
@NamedQueries({
- @NamedQuery(name = JpaCategory.GET_ALL, query = "select c from JpaCategory c order by c.text")
+ @NamedQuery(name = JpaCategory.GET_ALL, query = "select c from JpaCategory c order by c.text"),
+ @NamedQuery(name = JpaCategory.GET_COUNT, query = "select count(c) from JpaCategory c")
})
public class JpaCategory implements BasicEntity, Serializable, Category {
// constants for JPA query names
public static final String GET_ALL = "Category.getAll";
+ public static final String GET_COUNT = "Category.getCountAll";
@Id
@Column(name = "entity_id")
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java?rev=1507405&r1=1507404&r2=1507405&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java Fri Jul 26 19:19:42 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/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java?rev=1507405&r1=1507404&r2=1507405&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java Fri Jul 26 19:19:42 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/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java?rev=1507405&r1=1507404&r2=1507405&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java Fri Jul 26 19:19:42 2013
@@ -269,7 +269,7 @@ public class JpaPageRepository implement
@Override
public int getCountAll() {
- Query query = manager.createNamedQuery(JpaWidget.WIDGET_COUNT_ALL);
+ Query query = manager.createNamedQuery(JpaPage.GET_COUNT);
Number countResult = (Number) query.getSingleResult();
return countResult.intValue();
}
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java?rev=1507405&r1=1507404&r2=1507405&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java Fri Jul 26 19:19:42 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/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java?rev=1507405&r1=1507404&r2=1507405&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java Fri Jul 26 19:19:42 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/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java?rev=1507405&r1=1507404&r2=1507405&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java Fri Jul 26 19:19:42 2013
@@ -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/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java?rev=1507405&r1=1507404&r2=1507405&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java (original)
+++ rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java Fri Jul 26 19:19:42 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;