You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/06/04 16:54:32 UTC
svn commit: r1345997 - in /rave/branches/model_interfaces/rave-components:
rave-core/src/main/java/org/apache/rave/portal/model/
rave-core/src/main/java/org/apache/rave/portal/model/conversion/
rave-core/src/main/java/org/apache/rave/portal/repository/...
Author: mfranklin
Date: Mon Jun 4 14:54:31 2012
New Revision: 1345997
URL: http://svn.apache.org/viewvc?rev=1345997&view=rev
Log:
Converted WidgetRating (Fixed RAVE-646)
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaWidgetRating.java
- copied, changed from r1344852, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTest.java
- copied, changed from r1344852, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTest.java
Modified:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepositoryTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaWidgetRating.java (from r1344852, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaWidgetRating.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaWidgetRating.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java&r1=1344852&r2=1345997&rev=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaWidgetRating.java Mon Jun 4 14:54:31 2012
@@ -31,25 +31,25 @@ import java.io.Serializable;
@Access(AccessType.FIELD)
@Table(name = "widget_rating")
@NamedQueries ({
- @NamedQuery(name = WidgetRating.WIDGET_ALL_TOTAL_LIKES,
- query = "SELECT COUNT(wr) total, wr.widgetId widgetIt FROM WidgetRating wr WHERE wr.score = 10 GROUP BY wr.widgetId"),
- @NamedQuery(name = WidgetRating.WIDGET_TOTAL_LIKES,
- query = "SELECT COUNT(wr) FROM WidgetRating wr WHERE wr.widgetId = :widgetId AND wr.score = 10"),
- @NamedQuery(name = WidgetRating.WIDGET_ALL_TOTAL_DISLIKES,
- query = "SELECT COUNT(wr) total, wr.widgetId widgetId FROM WidgetRating wr WHERE wr.score = 0 GROUP BY wr.widgetId"),
- @NamedQuery(name = WidgetRating.WIDGET_TOTAL_DISLIKES,
- query = "SELECT COUNT(wr) FROM WidgetRating wr WHERE wr.widgetId = :widgetId AND wr.score = 0"),
- @NamedQuery(name = WidgetRating.WIDGET_ALL_USER_RATINGS,
- query = "SELECT wr FROM WidgetRating wr WHERE wr.userId = :userId"),
- @NamedQuery(name = WidgetRating.WIDGET_RATING_BY_WIDGET_AND_USER,
- query = "SELECT wr FROM WidgetRating wr WHERE wr.widgetId = :widgetId AND wr.userId = :userId"),
- @NamedQuery(name = WidgetRating.WIDGET_USER_RATING,
- query = "SELECT wr.score FROM WidgetRating wr WHERE wr.widgetId = :widgetId AND wr.userId = :userId"),
- @NamedQuery(name = WidgetRating.DELETE_ALL_BY_USER,
- query="DELETE FROM WidgetRating wr WHERE wr.userId = :userId")
+ @NamedQuery(name = JpaWidgetRating.WIDGET_ALL_TOTAL_LIKES,
+ query = "SELECT COUNT(wr) total, wr.widgetId widgetIt FROM JpaWidgetRating wr WHERE wr.score = 10 GROUP BY wr.widgetId"),
+ @NamedQuery(name = JpaWidgetRating.WIDGET_TOTAL_LIKES,
+ query = "SELECT COUNT(wr) FROM JpaWidgetRating wr WHERE wr.widgetId = :widgetId AND wr.score = 10"),
+ @NamedQuery(name = JpaWidgetRating.WIDGET_ALL_TOTAL_DISLIKES,
+ query = "SELECT COUNT(wr) total, wr.widgetId widgetId FROM JpaWidgetRating wr WHERE wr.score = 0 GROUP BY wr.widgetId"),
+ @NamedQuery(name = JpaWidgetRating.WIDGET_TOTAL_DISLIKES,
+ query = "SELECT COUNT(wr) FROM JpaWidgetRating wr WHERE wr.widgetId = :widgetId AND wr.score = 0"),
+ @NamedQuery(name = JpaWidgetRating.WIDGET_ALL_USER_RATINGS,
+ query = "SELECT wr FROM JpaWidgetRating wr WHERE wr.userId = :userId"),
+ @NamedQuery(name = JpaWidgetRating.WIDGET_RATING_BY_WIDGET_AND_USER,
+ query = "SELECT wr FROM JpaWidgetRating wr WHERE wr.widgetId = :widgetId AND wr.userId = :userId"),
+ @NamedQuery(name = JpaWidgetRating.WIDGET_USER_RATING,
+ query = "SELECT wr.score FROM JpaWidgetRating wr WHERE wr.widgetId = :widgetId AND wr.userId = :userId"),
+ @NamedQuery(name = JpaWidgetRating.DELETE_ALL_BY_USER,
+ query="DELETE FROM JpaWidgetRating wr WHERE wr.userId = :userId")
})
@XmlRootElement
-public class WidgetRating implements BasicEntity, Serializable {
+public class JpaWidgetRating implements BasicEntity, Serializable, WidgetRating {
public static final String WIDGET_ALL_TOTAL_LIKES = "widget_all_total_likes";
public static final String WIDGET_TOTAL_LIKES = "widget_total_likes";
@@ -86,11 +86,11 @@ public class WidgetRating implements Bas
public static final Integer DISLIKE = 0;
public static final Integer UNSET = -1;
- public WidgetRating() {
+ public JpaWidgetRating() {
}
- public WidgetRating(Long entityId, Long widgetId, Long userId, Integer score) {
+ public JpaWidgetRating(Long entityId, Long widgetId, Long userId, Integer score) {
this.entityId = entityId;
this.widgetId = widgetId;
this.userId = userId;
@@ -112,43 +112,46 @@ public class WidgetRating implements Bas
this.entityId = entityId;
}
- /**
- * Gets the ID of the Widget this rating is for
- * @return The ID of the Widget this rating is for
- */
+ @Override
public Long getWidgetId() {
return widgetId;
}
+ @Override
public void setWidgetId(Long widgetId) {
this.widgetId = widgetId;
}
- /**
- * Gets the ID of the User this rating is for
- * @return The ID of the User this rating is for
- */
+ @Override
public Long getUserId() {
return userId;
}
+ @Override
public void setUserId(Long userId) {
this.userId = userId;
}
- /**
- * Gets the score of this rating
- *
- * @return The score of this rating
- */
+ @Override
public Integer getScore() {
return score;
}
+ @Override
public void setScore(Integer value) {
this.score = value;
}
-
+
+ @Override
+ public Long getId() {
+ return this.getEntityId();
+ }
+
+ @Override
+ public void setId(Long id) {
+ this.setEntityId(id);
+ }
+
@Override
public int hashCode() {
int hash = 7;
@@ -164,7 +167,7 @@ public class WidgetRating implements Bas
if (getClass() != obj.getClass()) {
return false;
}
- final WidgetRating other = (WidgetRating) obj;
+ final JpaWidgetRating other = (JpaWidgetRating) obj;
if (this.entityId != other.entityId && (this.entityId == null || !this.entityId.equals(other.entityId))) {
return false;
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java Mon Jun 4 14:54:31 2012
@@ -178,7 +178,7 @@ public class Widget implements BasicEnti
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
@JoinColumn(name = "widget_id", referencedColumnName = "entity_id")
- private List<WidgetRating> ratings;
+ private List<JpaWidgetRating> ratings;
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
@JoinColumn(name = "widget_id", referencedColumnName = "entity_id")
@@ -339,11 +339,18 @@ public class Widget implements BasicEnti
* @return The user ratings for this Widget.
*/
public List<WidgetRating> getRatings() {
- return ratings;
+ return ConvertingListProxyFactory.createProxyList(WidgetRating.class, this.ratings);
}
public void setRatings(List<WidgetRating> ratings) {
- this.ratings = ratings;
+ if (this.ratings == null) {
+ this.ratings = new ArrayList<JpaWidgetRating>();
+ }
+ //Ensure that all operations go through the conversion proxy
+ this.getRatings().clear();
+ if (ratings != null) {
+ this.getRatings().addAll(ratings);
+ }
}
public boolean isDisableRendering() {
@@ -375,12 +382,14 @@ public class Widget implements BasicEnti
}
public void setCategories(List<Category> categories) {
- if(this.categories == null) {
+ if (this.categories == null) {
this.categories = new ArrayList<JpaCategory>();
}
//Ensure that all operations go through the conversion proxy
this.getCategories().clear();
- this.getCategories().addAll(categories);
+ if (categories != null) {
+ this.getCategories().addAll(categories);
+ }
}
public boolean isFeatured() {
Added: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java?rev=1345997&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java (added)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java Mon Jun 4 14:54:31 2012
@@ -0,0 +1,34 @@
+package org.apache.rave.portal.model;
+
+/**
+ */
+public interface WidgetRating {
+ /**
+ * Gets the ID of the Widget this rating is for
+ * @return The ID of the Widget this rating is for
+ */
+ Long getWidgetId();
+
+ void setWidgetId(Long widgetId);
+
+ /**
+ * Gets the ID of the User this rating is for
+ * @return The ID of the User this rating is for
+ */
+ Long getUserId();
+
+ void setUserId(Long userId);
+
+ /**
+ * Gets the score of this rating
+ *
+ * @return The score of this rating
+ */
+ Integer getScore();
+
+ void setScore(Integer value);
+
+ Long getId();
+
+ void setId(Long id);
+}
Added: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java?rev=1345997&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java (added)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java Mon Jun 4 14:54:31 2012
@@ -0,0 +1,45 @@
+package org.apache.rave.portal.model.conversion;
+
+import org.apache.rave.model.ModelConverter;
+import org.apache.rave.portal.model.JpaWidgetRating;
+import org.apache.rave.portal.model.WidgetRating;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ * Converts a WidgetRating to a JpaWidgetRating
+ */
+@Component
+public class JpaWidgetRatingConverter implements ModelConverter<WidgetRating, JpaWidgetRating> {
+
+ @PersistenceContext
+ private EntityManager manager;
+
+ @Override
+ public Class<WidgetRating> getSourceType() {
+ return WidgetRating.class;
+ }
+
+ @Override
+ public JpaWidgetRating convert(WidgetRating source) {
+ return source instanceof JpaWidgetRating? (JpaWidgetRating)source : createEntity(source);
+ }
+
+ private JpaWidgetRating createEntity(WidgetRating source) {
+ JpaWidgetRating converted = manager.find(JpaWidgetRating.class, source.getId());
+
+ if(converted == null) {
+ converted = new JpaWidgetRating();
+ }
+ updateProperties(source, converted);
+ return converted;
+ }
+
+ private void updateProperties(WidgetRating source, JpaWidgetRating converted) {
+ converted.setScore(source.getScore());
+ converted.setUserId(source.getUserId());
+ converted.setWidgetId(source.getWidgetId());
+ }
+}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java Mon Jun 4 14:54:31 2012
@@ -25,11 +25,11 @@ import org.apache.rave.portal.model.Widg
public interface WidgetRatingRepository extends Repository<WidgetRating> {
/**
- * Tries to find a {@link WidgetRating} by the id's of a Widget and USer
+ * Tries to find a {@link org.apache.rave.portal.model.JpaWidgetRating} by the id's of a Widget and USer
*
* @param widgetId unique identifier of a Widget
* @param userId unique identifier of a User
- * @return {@link WidgetRating} if it exists, otherwise {@literal null}
+ * @return {@link org.apache.rave.portal.model.JpaWidgetRating} if it exists, otherwise {@literal null}
*/
WidgetRating getByWidgetIdAndUserId(Long widgetId, Long userId);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java Mon Jun 4 14:54:31 2012
@@ -146,7 +146,7 @@ public interface WidgetRepository extend
* Generates the mapping of widget ratings for the user.
*
* @param userId id of the user
- * @return Mapping of {@link WidgetRating} objects keyed off of the widget's entityId
+ * @return Mapping of {@link org.apache.rave.portal.model.JpaWidgetRating} objects keyed off of the widget's entityId
*/
Map<Long, WidgetRating> getUsersWidgetRatings(long userId);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java Mon Jun 4 14:54:31 2012
@@ -20,39 +20,68 @@
package org.apache.rave.portal.repository.impl;
import org.apache.rave.persistence.jpa.AbstractJpaRepository;
+import org.apache.rave.portal.model.JpaWidgetRating;
import org.apache.rave.portal.model.WidgetRating;
+import org.apache.rave.portal.model.conversion.JpaWidgetRatingConverter;
import org.apache.rave.portal.repository.WidgetRatingRepository;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
+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;
/**
* JPA implementation for {@link org.apache.rave.portal.repository.WidgetRatingRepository}
*/
@Repository
-public class JpaWidgetRatingRepository extends AbstractJpaRepository<WidgetRating> implements WidgetRatingRepository {
+public class JpaWidgetRatingRepository implements WidgetRatingRepository {
- public JpaWidgetRatingRepository() {
- super(WidgetRating.class);
- }
+ @PersistenceContext
+ private EntityManager manager;
+
+ @Autowired
+ private JpaWidgetRatingConverter converter;
@Override
public WidgetRating getByWidgetIdAndUserId(Long widgetId, Long userId) {
- TypedQuery<WidgetRating> query =
- manager.createNamedQuery(WidgetRating.WIDGET_RATING_BY_WIDGET_AND_USER, WidgetRating.class);
- query.setParameter(WidgetRating.PARAM_WIDGET_ID, widgetId);
- query.setParameter(WidgetRating.PARAM_USER_ID, userId);
- final List<WidgetRating> resultList = query.getResultList();
+ TypedQuery<JpaWidgetRating> query =
+ manager.createNamedQuery(JpaWidgetRating.WIDGET_RATING_BY_WIDGET_AND_USER, JpaWidgetRating.class);
+ query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, widgetId);
+ query.setParameter(JpaWidgetRating.PARAM_USER_ID, userId);
+ final List<JpaWidgetRating> resultList = query.getResultList();
return getSingleResult(resultList);
}
@Override
public int deleteAll(Long userId) {
- TypedQuery<WidgetRating> query = manager.createNamedQuery(WidgetRating.DELETE_ALL_BY_USER, WidgetRating.class);
+ TypedQuery<JpaWidgetRating> query = manager.createNamedQuery(JpaWidgetRating.DELETE_ALL_BY_USER, JpaWidgetRating.class);
query.setParameter("userId", userId);
return query.executeUpdate();
}
+
+ @Override
+ public Class<? extends WidgetRating> getType() {
+ return JpaWidgetRating.class;
+ }
+
+ @Override
+ public WidgetRating get(long id) {
+ return manager.find(JpaWidgetRating.class, id);
+ }
+
+ @Override
+ public WidgetRating save(WidgetRating item) {
+ JpaWidgetRating jpaItem = converter.convert(item);
+ return saveOrUpdate(jpaItem.getEntityId(), manager, jpaItem);
+ }
+
+ @Override
+ public void delete(WidgetRating item) {
+ manager.remove(converter.convert(item));
+ }
}
\ No newline at end of file
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java Mon Jun 4 14:54:31 2012
@@ -21,7 +21,6 @@ package org.apache.rave.portal.repositor
import org.apache.commons.lang.StringUtils;
-import org.apache.openjpa.jdbc.kernel.exps.ToLowerCase;
import org.apache.rave.persistence.jpa.AbstractJpaRepository;
import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.util.WidgetStatistics;
@@ -159,12 +158,12 @@ public class JpaWidgetRepository extends
public WidgetStatistics getWidgetStatistics(long widget_id, long user_id) {
WidgetStatistics widgetStatistics = new WidgetStatistics();
- Query query = manager.createNamedQuery(WidgetRating.WIDGET_TOTAL_LIKES);
- query.setParameter(WidgetRating.PARAM_WIDGET_ID, widget_id);
+ Query query = manager.createNamedQuery(JpaWidgetRating.WIDGET_TOTAL_LIKES);
+ query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, widget_id);
widgetStatistics.setTotalLike(((Number) query.getSingleResult()).intValue());
- query = manager.createNamedQuery(WidgetRating.WIDGET_TOTAL_DISLIKES);
- query.setParameter(WidgetRating.PARAM_WIDGET_ID, widget_id);
+ query = manager.createNamedQuery(JpaWidgetRating.WIDGET_TOTAL_DISLIKES);
+ query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, widget_id);
widgetStatistics.setTotalDislike(((Number) query.getSingleResult()).intValue());
query = manager.createNamedQuery(RegionWidget.REGION_WIDGET_GET_DISTINCT_USER_COUNT_SINGLE_WIDGET);
@@ -172,12 +171,12 @@ public class JpaWidgetRepository extends
widgetStatistics.setTotalUserCount(((Number) query.getSingleResult()).intValue());
try {
- query = manager.createNamedQuery(WidgetRating.WIDGET_USER_RATING);
- query.setParameter(WidgetRating.PARAM_WIDGET_ID, widget_id);
- query.setParameter(WidgetRating.PARAM_USER_ID, user_id);
+ query = manager.createNamedQuery(JpaWidgetRating.WIDGET_USER_RATING);
+ query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, widget_id);
+ query.setParameter(JpaWidgetRating.PARAM_USER_ID, user_id);
widgetStatistics.setUserRating(((Number) query.getSingleResult()).intValue());
} catch (NoResultException e) {
- widgetStatistics.setUserRating(WidgetRating.UNSET);
+ widgetStatistics.setUserRating(JpaWidgetRating.UNSET);
}
return widgetStatistics;
@@ -185,9 +184,9 @@ public class JpaWidgetRepository extends
@Override
public Map<Long, WidgetRating> getUsersWidgetRatings(long user_id) {
- TypedQuery<WidgetRating> query =
- manager.createNamedQuery(WidgetRating.WIDGET_ALL_USER_RATINGS, WidgetRating.class);
- query.setParameter(WidgetRating.PARAM_USER_ID, user_id);
+ TypedQuery<JpaWidgetRating> query =
+ manager.createNamedQuery(JpaWidgetRating.WIDGET_ALL_USER_RATINGS, JpaWidgetRating.class);
+ query.setParameter(JpaWidgetRating.PARAM_USER_ID, user_id);
Map<Long, WidgetRating> map = new HashMap<Long, WidgetRating>();
for (WidgetRating widgetRating : query.getResultList()) {
@@ -203,7 +202,7 @@ public class JpaWidgetRepository extends
HashMap<Long, WidgetStatistics> map = new HashMap<Long, WidgetStatistics>();
//Generate the mapping of all likes done for the widgets
- Query query = manager.createNamedQuery(WidgetRating.WIDGET_ALL_TOTAL_LIKES);
+ Query query = manager.createNamedQuery(JpaWidgetRating.WIDGET_ALL_TOTAL_LIKES);
for (Object[] result : (List<Object[]>) query.getResultList()) {
Long totalLikes = (Long) result[0];
Long widgetId = (Long) result[1];
@@ -213,7 +212,7 @@ public class JpaWidgetRepository extends
}
//Add the mapping of all dislikes done for the widgets
- query = manager.createNamedQuery(WidgetRating.WIDGET_ALL_TOTAL_DISLIKES);
+ query = manager.createNamedQuery(JpaWidgetRating.WIDGET_ALL_TOTAL_DISLIKES);
for (Object[] result : (List<Object[]>) query.getResultList()) {
Long totalDislikes = (Long) result[0];
Long widgetId = (Long) result[1];
@@ -247,7 +246,7 @@ public class JpaWidgetRepository extends
}
//otherwise set the rating to UNSET
else {
- entry.getValue().setUserRating(WidgetRating.UNSET);
+ entry.getValue().setUserRating(JpaWidgetRating.UNSET);
}
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java Mon Jun 4 14:54:31 2012
@@ -18,8 +18,8 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.WidgetRating;
+import org.apache.rave.portal.model.User;
import org.apache.rave.portal.repository.WidgetRatingRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -146,7 +146,7 @@ public class DefaultWidgetRatingPermissi
if (trustedDomainObject) {
trustedWidgetRating = widgetRating;
} else {
- trustedWidgetRating = getTrustedWidgetRating(widgetRating.getEntityId(), trustedWidgetRatingContainer);
+ trustedWidgetRating = getTrustedWidgetRating(widgetRating.getId(), trustedWidgetRatingContainer);
}
return isWidgetRatingOwnerById(authentication, trustedWidgetRating.getUserId());
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java Mon Jun 4 14:54:31 2012
@@ -23,12 +23,12 @@ import org.apache.rave.portal.model.Widg
import org.springframework.security.access.prepost.PreAuthorize;
/**
- * Interface for {@link org.apache.rave.portal.model.WidgetRating}
+ * Interface for {@link org.apache.rave.portal.model.JpaWidgetRating}
*/
public interface WidgetRatingService {
/**
- * Gets a {@link WidgetRating} for the widgetId and userId
+ * Gets a {@link org.apache.rave.portal.model.JpaWidgetRating} for the widgetId and userId
*
* @param widgetId unique identifier for a Widget
* @param userId unique identifier for a User
@@ -38,7 +38,7 @@ public interface WidgetRatingService {
WidgetRating getByWidgetIdAndUserId(Long widgetId, Long userId);
/**
- * Updates the score of a {@link WidgetRating}
+ * Updates the score of a {@link org.apache.rave.portal.model.JpaWidgetRating}
*
* @param widgetRating WidgetRating
* @param score value of the rating
@@ -47,7 +47,7 @@ public interface WidgetRatingService {
void updateScore(WidgetRating widgetRating, Integer score);
/**
- * Saves a {@link WidgetRating} for a widget
+ * Saves a {@link org.apache.rave.portal.model.JpaWidgetRating} for a widget
*
* @param rating WidgetRating
*/
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml Mon Jun 4 14:54:31 2012
@@ -30,7 +30,7 @@
<class>org.apache.rave.portal.model.RegionWidgetPreference</class>
<class>org.apache.rave.portal.model.Widget</class>
<class>org.apache.rave.portal.model.JpaWidgetComment</class>
- <class>org.apache.rave.portal.model.WidgetRating</class>
+ <class>org.apache.rave.portal.model.JpaWidgetRating</class>
<class>org.apache.rave.portal.model.PageLayout</class>
<class>org.apache.rave.portal.model.Authority</class>
<class>org.apache.rave.portal.model.Tag</class>
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java Mon Jun 4 14:54:31 2012
@@ -30,7 +30,7 @@ import static junit.framework.Assert.ass
Test for {@link WidgetRatingTest}
*/
public class WidgetRatingTest {
- WidgetRating widgetRating;
+ JpaWidgetRating widgetRating;
Long id;
Long widgetId;
@@ -44,7 +44,7 @@ public class WidgetRatingTest {
userId = 1L;
score = 1;
- widgetRating = new WidgetRating();
+ widgetRating = new JpaWidgetRating();
widgetRating.setEntityId(id);
widgetRating.setScore(score);
widgetRating.setUserId(userId);
@@ -61,14 +61,14 @@ public class WidgetRatingTest {
@Test
public void equality() {
- WidgetRating tester = new WidgetRating();
+ JpaWidgetRating tester = new JpaWidgetRating();
tester.setEntityId(1L);
assertEquals(widgetRating, tester);
tester.setEntityId(2L);
assertFalse(widgetRating.equals(tester));
assertFalse(widgetRating.equals(null));
- assertFalse(widgetRating.equals(new WidgetRating()));
+ assertFalse(widgetRating.equals(new JpaWidgetRating()));
assertFalse(widgetRating.equals(new String()));
widgetRating.toString();
Copied: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTest.java (from r1344852, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTest.java)
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTest.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTest.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTest.java&r1=1344852&r2=1345997&rev=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTest.java Mon Jun 4 14:54:31 2012
@@ -66,7 +66,7 @@ public class WidgetTest {
Tag tag1=new Tag(2L, "test1") ;
ratings = new ArrayList<WidgetRating>();
- ratings.add(new WidgetRating(1L, 1L, 1L, 1));
+ ratings.add(new JpaWidgetRating(1L, 1L, 1L, 1));
tags = new ArrayList<WidgetTag>();
tags.add(new WidgetTag(1L, 1L, new User(), new Date(), tag)) ;
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepositoryTest.java?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepositoryTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepositoryTest.java Mon Jun 4 14:54:31 2012
@@ -19,7 +19,7 @@
package org.apache.rave.portal.repository.impl;
-import org.apache.rave.portal.model.WidgetRating;
+import org.apache.rave.portal.model.JpaWidgetRating;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,7 +62,7 @@ public class JpaWidgetRatingRepositoryTe
@Test
public void getByWidgetIdAndUserId_missing() {
- assertThat(repository.getByWidgetIdAndUserId(INVALID_WIDGET_ID, INVALID_USER_ID), is(nullValue(WidgetRating.class)));
+ assertThat(repository.getByWidgetIdAndUserId(INVALID_WIDGET_ID, INVALID_USER_ID), is(nullValue()));
}
@Test
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java Mon Jun 4 14:54:31 2012
@@ -227,21 +227,21 @@ public class JpaWidgetRepositoryTest {
Map<Long, WidgetRating> widgetRatings = repository.getUsersWidgetRatings(1L);
WidgetRating gadgetOne = widgetRatings.get(1L);
- assertEquals(WidgetRating.DISLIKE, gadgetOne.getScore());
+ assertEquals(JpaWidgetRating.DISLIKE, gadgetOne.getScore());
assertEquals(new Long(1), gadgetOne.getUserId());
- assertEquals(new Long(1), gadgetOne.getEntityId());
+ assertEquals(new Long(1), gadgetOne.getId());
WidgetRating gadgetTwo = widgetRatings.get(2L);
- assertEquals(WidgetRating.LIKE, gadgetTwo.getScore());
+ assertEquals(JpaWidgetRating.LIKE, gadgetTwo.getScore());
assertEquals(new Long(1), gadgetTwo.getUserId());
- assertEquals(new Long(2), gadgetTwo.getEntityId());
+ assertEquals(new Long(2), gadgetTwo.getId());
}
@Test
public void getEmptyUserWidgetStatistics() {
//ensure that a bogus user has only UNSET widget ratings
for (Map.Entry<Long, WidgetStatistics> entry : repository.getAllWidgetStatistics(Long.MAX_VALUE).entrySet()) {
- assertEquals(WidgetRating.UNSET.intValue(), entry.getValue().getUserRating());
+ assertEquals(JpaWidgetRating.UNSET.intValue(), entry.getValue().getUserRating());
}
}
@@ -258,7 +258,7 @@ public class JpaWidgetRepositoryTest {
assertEquals(0, widgetStatistics.getTotalLike());
assertEquals(1, widgetStatistics.getTotalDislike());
assertEquals(10, widgetStatistics.getTotalUserCount());
- assertEquals(WidgetRating.DISLIKE.intValue(), widgetStatistics.getUserRating());
+ assertEquals(JpaWidgetRating.DISLIKE.intValue(), widgetStatistics.getUserRating());
}
@Test
@@ -273,7 +273,7 @@ public class JpaWidgetRepositoryTest {
assertEquals(1, widgetStatistics.getTotalLike());
assertEquals(0, widgetStatistics.getTotalDislike());
assertEquals(10, widgetStatistics.getTotalUserCount());
- assertEquals(WidgetRating.LIKE.intValue(), widgetStatistics.getUserRating());
+ assertEquals(JpaWidgetRating.LIKE.intValue(), widgetStatistics.getUserRating());
}
@Test
@@ -287,7 +287,7 @@ public class JpaWidgetRepositoryTest {
assertNotNull(widgetStatistics);
assertEquals(0, widgetStatistics.getTotalDislike());
assertEquals(0, widgetStatistics.getTotalLike());
- assertEquals(WidgetRating.UNSET.intValue(), widgetStatistics.getUserRating());
+ assertEquals(JpaWidgetRating.UNSET.intValue(), widgetStatistics.getUserRating());
}
@Test
@@ -296,7 +296,7 @@ public class JpaWidgetRepositoryTest {
public void addWidgetRating() {
Widget widget = repository.get(3L);
assertNotNull(widget.getRatings());
- WidgetRating widgetRating = new WidgetRating();
+ WidgetRating widgetRating = new JpaWidgetRating();
widgetRating.setScore(10);
widgetRating.setUserId(1L);
widgetRating.setWidgetId(widget.getEntityId());
@@ -321,7 +321,7 @@ public class JpaWidgetRepositoryTest {
public void updateWidgetRating() {
Widget widget = repository.get(4L);
assertNotNull(widget.getRatings());
- WidgetRating widgetRating = new WidgetRating();
+ WidgetRating widgetRating = new JpaWidgetRating();
widgetRating.setScore(10);
widgetRating.setUserId(1L);
widgetRating.setWidgetId(widget.getEntityId());
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java Mon Jun 4 14:54:31 2012
@@ -18,6 +18,7 @@
*/
package org.apache.rave.portal.security.impl;
+import org.apache.rave.portal.model.JpaWidgetRating;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.WidgetRating;
import org.apache.rave.portal.repository.WidgetRatingRepository;
@@ -44,7 +45,7 @@ public class DefaultWidgetRatingPermissi
private WidgetRatingRepository mockWidgetRatingRepository;
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthoritiesList;
- private WidgetRating widgetRating;
+ private JpaWidgetRating widgetRating;
private User user, user2;
private final Long VALID_USER_ID = 99L;
@@ -59,7 +60,7 @@ public class DefaultWidgetRatingPermissi
mockWidgetRatingRepository = createMock(WidgetRatingRepository.class);
defaultWidgetRatingPermissionEvaluator = new DefaultWidgetRatingPermissionEvaluator(mockWidgetRatingRepository);
- widgetRating = new WidgetRating();
+ widgetRating = new JpaWidgetRating();
widgetRating.setUserId(VALID_USER_ID);
widgetRating.setWidgetId(VALID_WIDGET_ID);
widgetRating.setEntityId(VALID_WIDGET_ID);
@@ -194,7 +195,7 @@ public class DefaultWidgetRatingPermissi
public void testHasPermission_4args_administer() {
EasyMock.<Collection<? extends GrantedAuthority>>expect(mockAuthentication.getAuthorities()).andReturn(grantedAuthoritiesList);
replay(mockAuthentication);
- assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.ADMINISTER), is(false));
+ assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, JpaWidgetRating.class.getName(), ModelPermissionEvaluator.Permission.ADMINISTER), is(false));
verify(mockAuthentication);
}
@@ -205,7 +206,7 @@ public class DefaultWidgetRatingPermissi
expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
- assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(true));
+ assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, JpaWidgetRating.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(true));
verify(mockAuthentication);
verify(mockWidgetRatingRepository);
}
@@ -217,7 +218,7 @@ public class DefaultWidgetRatingPermissi
expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
- assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(false));
+ assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, JpaWidgetRating.class.getName(), ModelPermissionEvaluator.Permission.CREATE), is(false));
verify(mockAuthentication);
verify(mockWidgetRatingRepository);
}
@@ -229,7 +230,7 @@ public class DefaultWidgetRatingPermissi
expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
- assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.DELETE), is(true));
+ assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, JpaWidgetRating.class.getName(), ModelPermissionEvaluator.Permission.DELETE), is(true));
verify(mockAuthentication);
verify(mockWidgetRatingRepository);
}
@@ -241,7 +242,7 @@ public class DefaultWidgetRatingPermissi
expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
- assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.DELETE), is(false));
+ assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, JpaWidgetRating.class.getName(), ModelPermissionEvaluator.Permission.DELETE), is(false));
verify(mockAuthentication);
verify(mockWidgetRatingRepository);
}
@@ -253,7 +254,7 @@ public class DefaultWidgetRatingPermissi
expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
- assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.READ), is(true));
+ assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, JpaWidgetRating.class.getName(), ModelPermissionEvaluator.Permission.READ), is(true));
verify(mockAuthentication);
verify(mockWidgetRatingRepository);
}
@@ -265,7 +266,7 @@ public class DefaultWidgetRatingPermissi
expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
- assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.READ), is(false));
+ assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, JpaWidgetRating.class.getName(), ModelPermissionEvaluator.Permission.READ), is(false));
verify(mockAuthentication);
verify(mockWidgetRatingRepository);
}
@@ -277,7 +278,7 @@ public class DefaultWidgetRatingPermissi
expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
- assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.UPDATE), is(true));
+ assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, JpaWidgetRating.class.getName(), ModelPermissionEvaluator.Permission.UPDATE), is(true));
verify(mockAuthentication);
verify(mockWidgetRatingRepository);
}
@@ -289,7 +290,7 @@ public class DefaultWidgetRatingPermissi
expect(mockWidgetRatingRepository.get(VALID_WIDGET_RATING_ID)).andReturn(widgetRating);
replay(mockAuthentication);
replay(mockWidgetRatingRepository);
- assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.UPDATE), is(false));
+ assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, VALID_WIDGET_RATING_ID, JpaWidgetRating.class.getName(), ModelPermissionEvaluator.Permission.UPDATE), is(false));
verify(mockAuthentication);
verify(mockWidgetRatingRepository);
}
@@ -300,7 +301,7 @@ public class DefaultWidgetRatingPermissi
expect(mockAuthentication.getPrincipal()).andReturn(user);
replay(mockAuthentication);
- assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, raveSecurityContext, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.UPDATE), is(true));
+ assertThat(defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, raveSecurityContext, JpaWidgetRating.class.getName(), ModelPermissionEvaluator.Permission.UPDATE), is(true));
verify(mockAuthentication);
}
@@ -310,7 +311,7 @@ public class DefaultWidgetRatingPermissi
expect(mockAuthentication.getPrincipal()).andReturn(user);
replay(mockAuthentication);
- defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, raveSecurityContext, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.UPDATE);
+ defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, raveSecurityContext, JpaWidgetRating.class.getName(), ModelPermissionEvaluator.Permission.UPDATE);
verify(mockAuthentication);
}
@@ -320,7 +321,7 @@ public class DefaultWidgetRatingPermissi
expect(mockAuthentication.getPrincipal()).andReturn(user);
replay(mockAuthentication);
- defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, raveSecurityContext, WidgetRating.class.getName(), ModelPermissionEvaluator.Permission.UPDATE);
+ defaultWidgetRatingPermissionEvaluator.hasPermission(mockAuthentication, raveSecurityContext, JpaWidgetRating.class.getName(), ModelPermissionEvaluator.Permission.UPDATE);
verify(mockAuthentication);
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java Mon Jun 4 14:54:31 2012
@@ -19,6 +19,7 @@
package org.apache.rave.portal.service.impl;
+import org.apache.rave.portal.model.JpaWidgetRating;
import org.apache.rave.portal.model.WidgetRating;
import org.apache.rave.portal.repository.WidgetRatingRepository;
import org.apache.rave.portal.service.WidgetRatingService;
@@ -45,7 +46,7 @@ public class DefaultWidgetRatingServiceT
@Test
public void testGetByWidgetIdAndUserId() {
- WidgetRating widgetRating = new WidgetRating(1L, 2L, 3L, 5);
+ WidgetRating widgetRating = new JpaWidgetRating(1L, 2L, 3L, 5);
expect(repository.getByWidgetIdAndUserId(2L, 3L)).andReturn(widgetRating);
replay(repository);
final WidgetRating rating = service.getByWidgetIdAndUserId(2L, 3L);
@@ -55,7 +56,7 @@ public class DefaultWidgetRatingServiceT
@Test
public void updateScore() {
- WidgetRating widgetRating = createMock(WidgetRating.class);
+ WidgetRating widgetRating = createMock(JpaWidgetRating.class);
widgetRating.setScore(10);
expectLastCall().once();
@@ -68,7 +69,7 @@ public class DefaultWidgetRatingServiceT
@Test
public void saveWidgetRating_new() {
- WidgetRating newRating = new WidgetRating();
+ WidgetRating newRating = new JpaWidgetRating();
newRating.setWidgetId(2L);
newRating.setUserId(1L);
newRating.setScore(10);
@@ -83,8 +84,8 @@ public class DefaultWidgetRatingServiceT
@Test
public void saveWidgetRating_existing() {
- WidgetRating existingRating = new WidgetRating(1L, 1L, 1L, 5);
- WidgetRating newRating = new WidgetRating();
+ WidgetRating existingRating = new JpaWidgetRating(1L, 1L, 1L, 5);
+ WidgetRating newRating = new JpaWidgetRating();
newRating.setWidgetId(1L);
newRating.setUserId(1L);
newRating.setScore(10);
@@ -101,7 +102,7 @@ public class DefaultWidgetRatingServiceT
@Test
public void removeWidgetRating_existingRating() {
- final WidgetRating widgetRating = new WidgetRating(1L, 1L, 1L, 5);
+ final WidgetRating widgetRating = new JpaWidgetRating(1L, 1L, 1L, 5);
expect(repository.getByWidgetIdAndUserId(1L, 1L)).andReturn(widgetRating);
repository.delete(widgetRating);
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java Mon Jun 4 14:54:31 2012
@@ -132,7 +132,7 @@ public class WidgetApi extends AbstractR
HttpServletResponse response) {
logger.debug("POST WidgetRating received for /api/rest/widgets/{} score: {}", widgetId, score);
- WidgetRating widgetRating = new WidgetRating();
+ WidgetRating widgetRating = new JpaWidgetRating();
widgetRating.setScore(score);
widgetRating.setUserId(userService.getAuthenticatedUser().getEntityId());
widgetRating.setWidgetId(widgetId);
Modified: rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java?rev=1345997&r1=1345996&r2=1345997&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java Mon Jun 4 14:54:31 2012
@@ -177,7 +177,7 @@ public class WidgetApiTest {
@Test
public void updateWidgetRating() {
- WidgetRating widgetRating = new WidgetRating();
+ WidgetRating widgetRating = new JpaWidgetRating();
widgetRating.setScore(5);
widgetRating.setUserId(2L);
widgetRating.setWidgetId(1L);