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/24 20:40:14 UTC
svn commit: r1377029 - 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: Fri Aug 24 18:40:14 2012
New Revision: 1377029
URL: http://svn.apache.org/viewvc?rev=1377029&view=rev
Log:
Refactored User out of Category (RAVE-729)
Modified:
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java
rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java Fri Aug 24 18:40:14 2012
@@ -33,14 +33,14 @@ public interface Category {
public String getText();
public void setText(String text);
- public User getCreatedUser();
- public void setCreatedUser(User createdUser);
+ public String getCreatedUserId();
+ public void setCreatedUserId(String createdUserId);
public Date getCreatedDate();
public void setCreatedDate(Date createdDate);
- public User getLastModifiedUser();
- public void setLastModifiedUser(User lastModifiedUser);
+ public String getLastModifiedUserId();
+ public void setLastModifiedUserId(String lastModifiedUserId);
public Date getLastModifiedDate();
public void setLastModifiedDate(Date lastModifiedDate);
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java Fri Aug 24 18:40:14 2012
@@ -26,9 +26,9 @@ import java.util.List;
public class CategoryImpl implements Category {
private String id;
private String text;
- private User createdUser;
+ private String createdUserId;
private Date createdDate;
- private User lastModifiedUser;
+ private String lastModifiedUserId;
private Date lastModifiedDate;
private List<Widget> widgets;
@@ -61,13 +61,13 @@ public class CategoryImpl implements Cat
}
@Override
- public User getCreatedUser() {
- return createdUser;
+ public String getCreatedUserId() {
+ return createdUserId;
}
@Override
- public void setCreatedUser(User createdUser) {
- this.createdUser = createdUser;
+ public void setCreatedUserId(String createdUserId) {
+ this.createdUserId = createdUserId;
}
@Override
@@ -81,13 +81,13 @@ public class CategoryImpl implements Cat
}
@Override
- public User getLastModifiedUser() {
- return lastModifiedUser;
+ public String getLastModifiedUserId() {
+ return lastModifiedUserId;
}
@Override
- public void setLastModifiedUser(User lastModifiedUser) {
- this.lastModifiedUser = lastModifiedUser;
+ public void setLastModifiedUserId(String lastModifiedUserId) {
+ this.lastModifiedUserId = lastModifiedUserId;
}
@Override
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java Fri Aug 24 18:40:14 2012
@@ -149,11 +149,11 @@ public class DefaultCategoryPermissionEv
trustedCategory = getTrustedCategory(category.getId(), trustedCategoryContainer);
}
- return isCategoryCreatedUserByUsername(authentication, trustedCategory.getCreatedUser().getUsername());
+ return isCategoryCreatedUserByUsername(authentication, trustedCategory.getCreatedUserId());
}
- private boolean isCategoryCreatedUserByUsername(Authentication authentication, String username) {
- return ((User)authentication.getPrincipal()).getUsername().equals(username);
+ private boolean isCategoryCreatedUserByUsername(Authentication authentication, String id) {
+ return ((User)authentication.getPrincipal()).getId().equals(id);
}
private boolean isCategoryCreatedUserById(Authentication authentication, String userId) {
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java Fri Aug 24 18:40:14 2012
@@ -84,7 +84,7 @@ public class DefaultWidgetPermissionEval
if (targetId instanceof RaveSecurityContext) {
hasPermission = verifyRaveSecurityContext(authentication, (RaveSecurityContext) targetId);
} else {
- hasPermission = hasPermission(authentication, widgetRepository.get((String) targetId), permission, true);
+ hasPermission = hasPermission(authentication, widgetRepository.get(targetId.toString()), permission, true);
}
return hasPermission;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java Fri Aug 24 18:40:14 2012
@@ -57,9 +57,9 @@ public class DefaultCategoryService impl
Date now = new Date();
category.setText(text);
category.setCreatedDate(now);
- category.setCreatedUser(createdUser);
+ category.setCreatedUserId(createdUser.getId());
category.setLastModifiedDate(now);
- category.setLastModifiedUser(createdUser);
+ category.setLastModifiedUserId(createdUser.getId());
categoryRepository.save(category);
return category;
}
@@ -70,7 +70,7 @@ public class DefaultCategoryService impl
Category category = categoryRepository.get(categoryId);
category.setText(text);
category.setLastModifiedDate(new Date());
- category.setLastModifiedUser(lastModifiedUser);
+ category.setLastModifiedUserId(lastModifiedUser.getId());
categoryRepository.save(category);
return category;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java Fri Aug 24 18:40:14 2012
@@ -68,7 +68,7 @@ public class DefaultCategoryPermissionEv
category = new CategoryImpl();
category.setId(VALID_WIDGET_CATEGORY_ID);
- category.setCreatedUser(user);
+ category.setCreatedUserId(VALID_USER_ID);
grantedAuthorities = new ArrayList<GrantedAuthority>();
grantedAuthorities.add(new SimpleGrantedAuthority("ROLE_USER"));
Modified: rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java Fri Aug 24 18:40:14 2012
@@ -66,9 +66,9 @@ public class DefaultCategoryServiceTest
validCategory = new CategoryImpl();
validCategory.setId(VALID_ID);
validCategory.setText(VALID_TEXT);
- validCategory.setCreatedUser(validCreatedUser);
+ validCategory.setCreatedUserId(VALID_CREATED_USER_ID);
validCategory.setCreatedDate(VALID_CREATED_DATE);
- validCategory.setLastModifiedUser(validLastModifiedUser);
+ validCategory.setLastModifiedUserId(VALID_LAST_MODIFIED_USER_ID);
validCategory.setLastModifiedDate(VALID_LAST_MODIFIED_DATE);
}
@@ -114,8 +114,8 @@ public class DefaultCategoryServiceTest
assertThat(wc.getText(), is(NEW_CATEGORY_TEXT));
assertThat(wc.getCreatedDate(), is(notNullValue(Date.class)));
assertThat(wc.getCreatedDate(), is(wc.getLastModifiedDate()));
- assertThat(wc.getCreatedUser(), is(validCreatedUser));
- assertThat(wc.getLastModifiedUser(), is(validCreatedUser));
+ assertThat(wc.getCreatedUserId(), is(VALID_CREATED_USER_ID));
+ assertThat(wc.getLastModifiedUserId(), is(VALID_CREATED_USER_ID));
verify(repository);
}
@@ -127,8 +127,8 @@ public class DefaultCategoryServiceTest
Category expectedSaveCategory = new CategoryImpl();
expectedSaveCategory.setId(VALID_ID);
expectedSaveCategory.setText(UPDATED_TEXT);
- expectedSaveCategory.setCreatedUser(validCreatedUser);
- expectedSaveCategory.setLastModifiedUser(validLastModifiedUser);
+ expectedSaveCategory.setCreatedUserId(VALID_CREATED_USER_ID);
+ expectedSaveCategory.setLastModifiedUserId(VALID_LAST_MODIFIED_USER_ID);
expectedSaveCategory.setCreatedDate(VALID_CREATED_DATE);
expectedSaveCategory.setLastModifiedDate(VALID_LAST_MODIFIED_DATE);
@@ -139,8 +139,8 @@ public class DefaultCategoryServiceTest
Category updatedCategory = service.update(VALID_ID, UPDATED_TEXT, validLastModifiedUser);
assertThat(updatedCategory.getId(), is(VALID_ID));
assertThat(updatedCategory.getText(), is(UPDATED_TEXT));
- assertThat(updatedCategory.getCreatedUser(), is(validCreatedUser));
- assertThat(updatedCategory.getLastModifiedUser(), is(validLastModifiedUser));
+ assertThat(updatedCategory.getCreatedUserId(), is(VALID_CREATED_USER_ID));
+ assertThat(updatedCategory.getLastModifiedUserId(), is(VALID_LAST_MODIFIED_USER_ID));
assertThat(updatedCategory.getLastModifiedDate().after(updatedCategory.getCreatedDate()), is(true));
verify(repository);
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java Fri Aug 24 18:40:14 2012
@@ -51,9 +51,9 @@ public class JpaCategory implements Basi
@Column(name = "text", unique = true)
private String text;
- @OneToOne(fetch=FetchType.EAGER)
- @JoinColumn(name="created_user_id")
- private JpaUser createdUser;
+ @Basic
+ @Column(name="created_user_id")
+ private String createdUserId;
@Basic
@Column(name ="created_date")
@@ -61,9 +61,9 @@ public class JpaCategory implements Basi
private Date createdDate;
- @OneToOne(fetch=FetchType.EAGER)
- @JoinColumn(name="last_modified_user_id")
- private JpaUser lastModifiedUser;
+ @Basic
+ @Column(name="last_modified_user_id")
+ private String lastModifiedUserId;
@Basic
@Column(name ="last_modified_date")
@@ -82,12 +82,12 @@ public class JpaCategory implements Basi
}
- public JpaCategory(Long entityId, String text, User createdUser, Date createdDate, User lastModifiedUser, Date lastModifiedDate) {
+ public JpaCategory(Long entityId, String text, User createdUserId, Date createdDate, User lastModifiedUserId, Date lastModifiedDate) {
this.entityId = entityId;
this.text = text;
- this.setCreatedUser(createdUser);
+ this.setCreatedUserId(createdUserId.getId());
this.createdDate = createdDate;
- this.setLastModifiedUser(lastModifiedUser);
+ this.setLastModifiedUserId(lastModifiedUserId.getId());
this.lastModifiedDate = lastModifiedDate;
}
@@ -108,7 +108,7 @@ public class JpaCategory implements Basi
@Override
public void setId(String id) {
- setEntityId(Long.parseLong(id));
+ setEntityId(id == null ? null : Long.parseLong(id));
}
@Override
@@ -122,13 +122,13 @@ public class JpaCategory implements Basi
}
@Override
- public User getCreatedUser() {
- return createdUser;
+ public String getCreatedUserId() {
+ return createdUserId;
}
@Override
- public void setCreatedUser(User createdUser) {
- this.createdUser = JpaConverter.getInstance().convert(createdUser, User.class);
+ public void setCreatedUserId(String createdUserId) {
+ this.createdUserId = createdUserId;
}
@Override
@@ -142,13 +142,13 @@ public class JpaCategory implements Basi
}
@Override
- public User getLastModifiedUser() {
- return lastModifiedUser;
+ public String getLastModifiedUserId() {
+ return lastModifiedUserId;
}
@Override
- public void setLastModifiedUser(User lastModifiedUser) {
- this.lastModifiedUser = JpaConverter.getInstance().convert(lastModifiedUser, User.class);
+ public void setLastModifiedUserId(String lastModifiedUserId) {
+ this.lastModifiedUserId = lastModifiedUserId;
}
@Override
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java Fri Aug 24 18:40:14 2012
@@ -47,7 +47,7 @@ public class JpaPageUser implements Basi
private Long entityId;
@Basic
- @JoinColumn(name = "user_id")
+ @Column(name = "user_id")
private String userId;
@ManyToOne(fetch=FetchType.EAGER)
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java Fri Aug 24 18:40:14 2012
@@ -60,9 +60,9 @@ public class JpaCategoryConverter implem
private void updateProperties(Category source, JpaCategory converted) {
converted.setId(source.getId());
converted.setCreatedDate(source.getCreatedDate());
- converted.setCreatedUser(source.getCreatedUser());
+ converted.setCreatedUserId(source.getCreatedUserId());
converted.setLastModifiedDate(source.getLastModifiedDate());
- converted.setLastModifiedUser(source.getLastModifiedUser());
+ converted.setLastModifiedUserId(source.getLastModifiedUserId());
converted.setText(source.getText());
converted.setWidgets(source.getWidgets());
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java Fri Aug 24 18:40:14 2012
@@ -21,7 +21,6 @@ package org.apache.rave.portal.repositor
import org.apache.rave.portal.model.Category;
import org.apache.rave.portal.model.JpaCategory;
-import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.conversion.JpaCategoryConverter;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.util.CollectionUtils;
@@ -79,14 +78,14 @@ public class JpaCategoryRepository imple
int numRecordsChanged = 0;
for (Category category : categories) {
boolean changed = false;
- User createdUser = category.getCreatedUser();
- User lastModifiedUser = category.getLastModifiedUser();
- if (createdUser != null && userId.equals(createdUser.getId())) {
- category.setCreatedUser(null);
+ String createdUser = category.getCreatedUserId();
+ String lastModifiedUser = category.getLastModifiedUserId();
+ if (createdUser != null && userId.equals(createdUser)) {
+ category.setCreatedUserId(null);
changed = true;
}
- if (lastModifiedUser != null && userId.equals(lastModifiedUser.getId())) {
- category.setLastModifiedUser(null);
+ if (lastModifiedUser != null && userId.equals(lastModifiedUser)) {
+ category.setLastModifiedUserId(null);
changed = true;
}
if (changed) {
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java Fri Aug 24 18:40:14 2012
@@ -58,19 +58,19 @@ public class JpaCategoryConverterTest {
category.setId("9");
category.setLastModifiedDate(new Date());
category.setText("hello");
- category.setCreatedUser(new JpaUser(1L));
- category.setLastModifiedUser(new JpaUser(1L));
+ category.setCreatedUserId("1");
+ category.setLastModifiedUserId("1");
category.setWidgets(new ArrayList<Widget>());
JpaCategory converted = categoryConverter.convert(category);
assertThat(converted, is(not(sameInstance(category))));
assertThat(converted, is(instanceOf(JpaCategory.class)));
assertThat(converted.getCreatedDate(), is(equalTo(category.getCreatedDate())));
- assertThat(converted.getCreatedUser(), is(equalTo(category.getCreatedUser())));
+ assertThat(converted.getCreatedUserId(), is(equalTo(category.getCreatedUserId())));
assertThat(converted.getEntityId().toString(), is(equalTo(category.getId())));
assertThat(converted.getId(), is(equalTo(category.getId())));
assertThat(converted.getLastModifiedDate(), is(equalTo(category.getLastModifiedDate())));
- assertThat(converted.getLastModifiedUser(), is(equalTo(category.getLastModifiedUser())));
+ assertThat(converted.getLastModifiedUserId(), is(equalTo(category.getLastModifiedUserId())));
assertThat(converted.getText(), is(equalTo(category.getText())));
assertThat(converted.getWidgets(), is(equalTo(category.getWidgets())));
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java Fri Aug 24 18:40:14 2012
@@ -88,10 +88,10 @@ public class JpaCategoryRepositoryTest {
Date now = new Date();
JpaCategory category = new JpaCategory();
category.setLastModifiedDate(now);
- category.setLastModifiedUser(validUser);
+ category.setLastModifiedUserId(VALID_USER_ID.toString());
category.setText(NEW_TEXT);
category.setCreatedDate(now);
- category.setCreatedUser(validUser);
+ category.setCreatedUserId(VALID_USER_ID.toString());
assertThat(category.getEntityId(), is(nullValue()));
repository.save(category);
@@ -149,9 +149,9 @@ public class JpaCategoryRepositoryTest {
JpaCategory wc = new JpaCategory();
wc.setText(DUPLICATE_TEXT_VALUE);
wc.setCreatedDate(now);
- wc.setCreatedUser(user);
+ wc.setCreatedUserId(user.getId());
wc.setLastModifiedDate(now);
- wc.setLastModifiedUser(user);
+ wc.setLastModifiedUserId(user.getId());
boolean gotExpectedException = false;
try {
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java Fri Aug 24 18:40:14 2012
@@ -417,9 +417,9 @@ public class JpaWidgetRepositoryTest {
Category category = new JpaCategory();
category.setId("1");
category.setText("Sample Category");
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setCreatedDate(new Date());
- category.setLastModifiedUser(user);
+ category.setLastModifiedUserId(user.getId());
category.setLastModifiedDate(new Date());
sharedManager.merge(category);
Modified: rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java (original)
+++ rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java Fri Aug 24 18:40:14 2012
@@ -204,7 +204,7 @@ public class CategoryControllerTest {
String id = "1";
String categoryText = "Social";
CategoryImpl category = new CategoryImpl(id);
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
SessionStatus sessionStatus = createMock(SessionStatus.class);
expect(userService.getAuthenticatedUser()).andReturn(user).once();
@@ -227,7 +227,7 @@ public class CategoryControllerTest {
String categoryText = "Social";
String invalidToken = AdminControllerUtil.generateSessionToken();
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -249,7 +249,7 @@ public class CategoryControllerTest {
String id = "1";
String categoryText = "";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -268,7 +268,7 @@ public class CategoryControllerTest {
User user = new UserImpl();
String categoryText = "Social";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -287,7 +287,7 @@ public class CategoryControllerTest {
String id = "1";
String categoryText = "Social";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -307,7 +307,7 @@ public class CategoryControllerTest {
String id = "1";
String categoryText = "Social";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -332,7 +332,7 @@ public class CategoryControllerTest {
String categoryText = "Social";
String invalidToken = AdminControllerUtil.generateSessionToken();
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -355,7 +355,7 @@ public class CategoryControllerTest {
String id = "1";
String categoryText = "";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -374,7 +374,7 @@ public class CategoryControllerTest {
User user = new UserImpl();
String categoryText = "Social";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -393,7 +393,7 @@ public class CategoryControllerTest {
String id = "1";
String categoryText = "Social";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -413,7 +413,7 @@ public class CategoryControllerTest {
String id = "1";
String categoryText = "Social";
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
SessionStatus sessionStatus = createMock(SessionStatus.class);
@@ -432,7 +432,7 @@ public class CategoryControllerTest {
String categoryText = "Social";
Model model = new ExtendedModelMap();
CategoryImpl category = new CategoryImpl();
- category.setCreatedUser(user);
+ category.setCreatedUserId(user.getId());
category.setText(categoryText);
category.setId(id);
expect(categoryService.get(id)).andReturn(category).once();
Modified: rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp?rev=1377029&r1=1377028&r2=1377029&view=diff
==============================================================================
--- rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp (original)
+++ rave/branches/model-split/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp Fri Aug 24 18:40:14 2012
@@ -59,13 +59,15 @@
<a href="${detaillink}"><c:out value="${category.text}"/></a>
</td>
<td>
- <c:out value="${category.createdUser.username}"/>
+ <!--TODO: GET USER NAME-->
+ <c:out value="${category.createdUserId}"/>
</td>
<td>
<c:out value="${category.createdDate}"/>
</td>
<td>
- <c:out value="${category.lastModifiedUser.username}"/>
+ <!--TODO: GET USER NAME-->
+ <c:out value="${category.lastModifiedUserId}"/>
</td>
<td>
<c:out value="${category.lastModifiedDate}"/>