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/08/27 14:41:55 UTC
svn commit: r1377655 - in /rave/branches/model-split:
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/
rave-components/rave-core/src/main/java/org/apache/ra...
Author: mfranklin
Date: Mon Aug 27 12:41:54 2012
New Revision: 1377655
URL: http://svn.apache.org/viewvc?rev=1377655&view=rev
Log:
Refactored WidgetComment (RAVE-729)
Modified:
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetComment.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepositoryTest.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java?rev=1377655&r1=1377654&r2=1377655&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java Mon Aug 27 12:41:54 2012
@@ -29,8 +29,8 @@ import java.util.Date;
public interface WidgetComment {
String getId();
- User getUser();
- void setUser(User user);
+ String getUserId();
+ void setUserId(String userId);
String getWidgetId();
void setWidgetId(String widgetId);
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java?rev=1377655&r1=1377654&r2=1377655&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java Mon Aug 27 12:41:54 2012
@@ -26,7 +26,7 @@ import java.util.Date;
public class WidgetCommentImpl implements WidgetComment {
private String id;
private String widgetId;
- private User user;
+ private String userId;
private String text;
private Date lastModifiedDate;
private Date createdDate;
@@ -57,13 +57,13 @@ public class WidgetCommentImpl implement
}
@Override
- public User getUser() {
- return user;
+ public String getUserId() {
+ return userId;
}
@Override
- public void setUser(User user) {
- this.user = user;
+ public void setUserId(String userId) {
+ this.userId = userId;
}
@Override
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java?rev=1377655&r1=1377654&r2=1377655&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java Mon Aug 27 12:41:54 2012
@@ -111,7 +111,7 @@ public class DefaultWidgetCommentPermiss
break;
case CREATE:
case CREATE_OR_UPDATE:
- hasPermission = isWidgetCommentOwnerById(authentication, widgetComment.getUser().getId());
+ hasPermission = isWidgetCommentOwnerById(authentication, widgetComment.getUserId());
break;
case DELETE:
case UPDATE:
@@ -173,7 +173,7 @@ public class DefaultWidgetCommentPermiss
trustedWidgetComment = getTrustedWidgetComment(widgetComment.getId(), trustedPageContainer);
}
- return isWidgetCommentOwnerByUsername(authentication, trustedWidgetComment.getUser().getUsername());
+ return isWidgetCommentOwnerById(authentication, trustedWidgetComment.getUserId());
}
// returns a trusted Page object, either from the PageRepository, or the
Modified: rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java?rev=1377655&r1=1377654&r2=1377655&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java Mon Aug 27 12:41:54 2012
@@ -67,7 +67,7 @@ public class DefaultWidgetCommentPermiss
user2.setUsername(VALID_USERNAME2);
user2.setId(INVALID_USER_ID);
widgetComment = new WidgetCommentImpl(VALID_COMMENT_ID);
- widgetComment.setUser(user);
+ widgetComment.setUserId(VALID_USER_ID);
grantedAuthoritiesList = new ArrayList<GrantedAuthority>();
grantedAuthoritiesList.add(new SimpleGrantedAuthority("ROLE_USER"));
}
@@ -220,7 +220,7 @@ public class DefaultWidgetCommentPermiss
WidgetComment localWidgetComment = new WidgetCommentImpl();
UserImpl localUser = new UserImpl();
localUser.setId(VALID_USER_ID);
- localWidgetComment.setUser(localUser);
+ localWidgetComment.setUserId(VALID_USER_ID);
expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(localWidgetComment).anyTimes();
replay(mockWidgetCommentRepository);
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetComment.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetComment.java?rev=1377655&r1=1377654&r2=1377655&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetComment.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetComment.java Mon Aug 27 12:41:54 2012
@@ -31,7 +31,7 @@ import java.util.Date;
@Table(name = "widget_comment")
@NamedQueries({
@NamedQuery(name = JpaWidgetComment.DELETE_ALL_BY_USER,
- query="DELETE FROM JpaWidgetComment wc WHERE wc.user.entityId = :userId")
+ query="DELETE FROM JpaWidgetComment wc WHERE wc.userId = :userId")
})
@XmlRootElement
public class JpaWidgetComment implements BasicEntity, Serializable, WidgetComment {
@@ -48,12 +48,12 @@ public class JpaWidgetComment implements
@Column(name = "widget_id")
private Long widgetId;
- @ManyToOne(fetch=FetchType.EAGER)
- @JoinColumn(name="user_id")
- private JpaUser user;
-
@Basic
- @Column(name = "text") @Lob
+ @Column(name="user_id")
+ private String userId;
+
+ @Basic @Lob
+ @Column(name = "text")
private String text;
@Basic
@@ -73,7 +73,7 @@ public class JpaWidgetComment implements
public JpaWidgetComment(Long entityId, Long widgetId, JpaUser user, String text, Date lastModified, Date created) {
this.entityId = entityId;
this.widgetId = widgetId;
- this.user = user;
+ this.userId = user.getId();
this.text = text;
this.lastModifiedDate = lastModified;
this.createdDate = created;
@@ -105,13 +105,13 @@ public class JpaWidgetComment implements
}
@Override
- public User getUser() {
- return user;
+ public String getUserId() {
+ return userId;
}
@Override
- public void setUser(User user) {
- this.user = JpaConverter.getInstance().convert(user, User.class);
+ public void setUserId(String userId) {
+ this.userId = userId;
}
@Override
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java?rev=1377655&r1=1377654&r2=1377655&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java Mon Aug 27 12:41:54 2012
@@ -63,7 +63,7 @@ public class JpaWidgetCommentConverter i
converted.setCreatedDate(source.getCreatedDate());
converted.setLastModifiedDate(source.getLastModifiedDate());
converted.setText(source.getText());
- converted.setUser(source.getUser());
+ converted.setUserId(source.getUserId());
converted.setWidgetId(source.getWidgetId());
}
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepository.java?rev=1377655&r1=1377654&r2=1377655&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepository.java Mon Aug 27 12:41:54 2012
@@ -19,14 +19,12 @@ import org.apache.rave.portal.model.JpaW
import org.apache.rave.portal.model.WidgetComment;
import org.apache.rave.portal.model.conversion.JpaWidgetCommentConverter;
import org.apache.rave.portal.repository.WidgetCommentRepository;
-import org.apache.rave.util.CollectionUtils;
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.saveOrUpdate;
@@ -62,7 +60,7 @@ public class JpaWidgetCommentRepository
@Override
public int deleteAll(String userId) {
TypedQuery<JpaWidgetComment> query = manager.createNamedQuery(JpaWidgetComment.DELETE_ALL_BY_USER, JpaWidgetComment.class);
- query.setParameter("userId", userId == null ? null : Long.parseLong(userId));
+ query.setParameter("userId", userId);
return query.executeUpdate();
}
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java?rev=1377655&r1=1377654&r2=1377655&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java Mon Aug 27 12:41:54 2012
@@ -18,7 +18,6 @@
*/
package org.apache.rave.portal.model.conversion;
-import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.JpaWidgetComment;
import org.apache.rave.portal.model.WidgetComment;
import org.apache.rave.portal.model.impl.WidgetCommentImpl;
@@ -59,7 +58,7 @@ public class JpaWidgetCommentConverterTe
comment.setCreatedDate(new Date());
comment.setLastModifiedDate(new Date());
comment.setText("hello");
- comment.setUser(new JpaUser(1L));
+ comment.setUserId("1");
comment.setWidgetId("9");
JpaWidgetComment converted = widgetCommentConverter.convert(comment);
@@ -70,7 +69,7 @@ public class JpaWidgetCommentConverterTe
assertThat(converted.getId(), is(equalTo(comment.getId())));
assertThat(converted.getLastModifiedDate(), is(equalTo(comment.getLastModifiedDate())));
assertThat(converted.getText(), is(equalTo(comment.getText())));
- assertThat(converted.getUser(), is(equalTo(comment.getUser())));
+ assertThat(converted.getUserId(), is(equalTo(comment.getUserId())));
assertThat(converted.getWidgetId(), is(equalTo(comment.getWidgetId())));
}
}
\ No newline at end of file
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepositoryTest.java?rev=1377655&r1=1377654&r2=1377655&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepositoryTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepositoryTest.java Mon Aug 27 12:41:54 2012
@@ -85,14 +85,14 @@ public class JpaWidgetCommentRepositoryT
wc.setWidgetId(VALID_WIDGET_ID.toString());
wc.setLastModifiedDate(lastModDate);
wc.setText(text);
- wc.setUser(user);
+ wc.setUserId(VALID_USER_ID.toString());
assertThat(wc.getId(), is(nullValue()));
repository.save(wc);
String newId = wc.getId();
assertThat(Long.parseLong(newId) > 0, is(true));
WidgetComment newComment = repository.get(newId);
assertThat(newComment.getWidgetId(), is(VALID_WIDGET_ID.toString()));
- assertThat(newComment.getUser().getId(), is(VALID_USER_ID.toString()));
+ assertThat(newComment.getUserId(), is(VALID_USER_ID.toString()));
assertThat(newComment.getText(), is(text));
assertThat(newComment.getCreatedDate(), is(createdDate));
assertThat(newComment.getLastModifiedDate(), is(lastModDate));
Modified: rave/branches/model-split/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-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java?rev=1377655&r1=1377654&r2=1377655&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java (original)
+++ rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java Mon Aug 27 12:41:54 2012
@@ -72,7 +72,7 @@ public class WidgetApi extends AbstractR
HttpServletResponse response) {
WidgetComment widgetComment = new WidgetCommentImpl();
widgetComment.setWidgetId(widgetId);
- widgetComment.setUser(userService.getAuthenticatedUser());
+ widgetComment.setUserId(userService.getAuthenticatedUser().getId());
widgetComment.setText(text);
widgetComment.setCreatedDate(new Date());
widgetComment.setLastModifiedDate(new Date());
@@ -98,7 +98,7 @@ public class WidgetApi extends AbstractR
if (widgetComment == null) {
widgetComment = new WidgetCommentImpl();
widgetComment.setWidgetId(widgetId);
- widgetComment.setUser(userService.getAuthenticatedUser());
+ widgetComment.setUserId(userService.getAuthenticatedUser().getId());
widgetComment.setCreatedDate(new Date());
widgetComment.setLastModifiedDate(new Date());
}
Modified: rave/branches/model-split/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-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java?rev=1377655&r1=1377654&r2=1377655&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java (original)
+++ rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java Mon Aug 27 12:41:54 2012
@@ -112,7 +112,7 @@ public class WidgetApiTest {
WidgetComment widgetComment = new WidgetCommentImpl();
widgetComment.setWidgetId("2");
widgetComment.setText(message);
- widgetComment.setUser(new UserImpl(VALID_USER_ID, "John.Doe"));
+ widgetComment.setUserId(VALID_USER_ID);
expect(userService.getAuthenticatedUser()).andReturn(user);
expect(widgetCommentService.getWidgetComment("3")).andReturn(null);
Modified: rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp?rev=1377655&r1=1377654&r2=1377655&view=diff
==============================================================================
--- rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp (original)
+++ rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp Mon Aug 27 12:41:54 2012
@@ -197,17 +197,18 @@
<fmt:formatDate value="${comment.createdDate}" type="both" var="commentDate"/>
<p class="comment-heading">
<span class="commenter">
+ <%-- TODO:Find way to get person before completion of RAVE-729--%>
<c:choose>
- <c:when test="${not empty comment.user.displayName}">
- <c:out value="${comment.user.displayName}"/>
+ <c:when test="${not empty comment.userId}">
+ <c:out value="${comment.userId}"/>
</c:when>
- <c:otherwise><c:out value="${comment.user.username}"/></c:otherwise>
+ <c:otherwise><c:out value="${comment.userId}"/></c:otherwise>
</c:choose>
</span>
<span class="comment-date">
<c:out value=" - ${commentDate} "/>
</span>
- <c:if test="${userProfile.id eq comment.user.id}">
+ <c:if test="${userProfile.id eq comment.userId}">
<button id="comment-delete-${comment.id}" class="btn btn-danger btn-mini commentDeleteButton"
value="Delete" title="Delete comment" data-widgetid="<c:out value="${comment.widgetId}"/>">
<i class="icon-remove icon-white"></i>