You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by cg...@apache.org on 2012/08/09 09:05:57 UTC
svn commit: r1371052 [4/6] - in /rave/branches/model-split:
rave-components/rave-commons/src/main/java/org/apache/rave/persistence/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache...
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java Thu Aug 9 07:05:51 2012
@@ -49,7 +49,7 @@ public class JpaRegionWidgetPreferenceCo
if (source != null) {
TypedQuery<JpaRegionWidgetPreference> query = manager.createNamedQuery(JpaRegionWidgetPreference.FIND_BY_REGION_WIDGET_AND_NAME, JpaRegionWidgetPreference.class);
query.setParameter(JpaRegionWidgetPreference.NAME_PARAM, source.getName());
- query.setParameter(JpaRegionWidgetPreference.REGION_WIDGET_ID, source.getRegionWidgetId());
+ query.setParameter(JpaRegionWidgetPreference.REGION_WIDGET_ID, Long.parseLong(source.getRegionWidgetId()));
converted = getSingleResult(query.getResultList());
if (converted == null) {
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaTagConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaTagConverter.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaTagConverter.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaTagConverter.java Thu Aug 9 07:05:51 2012
@@ -62,7 +62,6 @@ public class JpaTagConverter implements
private void updateProperties(Tag source, JpaTag jpaTag) {
jpaTag.setKeyword(source.getKeyword());
- jpaTag.setWidgets(source.getWidgets());
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaUserConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaUserConverter.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaUserConverter.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaUserConverter.java Thu Aug 9 07:05:51 2012
@@ -57,7 +57,7 @@ public class JpaUserConverter implements
}
private void updateProperties(User source, JpaUser converted) {
- converted.setEntityId(source.getId());
+ converted.setEntityId(source.getId() == null ? null : Long.parseLong(source.getId()));
converted.setUsername(source.getUsername());
converted.setEmail(source.getEmail());
converted.setDisplayName(source.getDisplayName());
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=1371052&r1=1371051&r2=1371052&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 Thu Aug 9 07:05:51 2012
@@ -48,7 +48,7 @@ public class JpaWidgetCommentConverter i
private JpaWidgetComment createEntity(WidgetComment source) {
JpaWidgetComment converted = null;
if (source != null) {
- converted = manager.find(JpaWidgetComment.class, source.getId());
+ converted = manager.find(JpaWidgetComment.class, source.getId() == null ? null : Long.parseLong(source.getId()));
if (converted == null) {
converted = new JpaWidgetComment();
@@ -59,8 +59,7 @@ public class JpaWidgetCommentConverter i
}
private void updateProperties(WidgetComment source, JpaWidgetComment converted) {
- converted.setEntityId(source.getId());
- converted.setId(source.getId());
+ converted.setEntityId(source.getId() == null ? null : Long.parseLong(source.getId()));
converted.setCreatedDate(source.getCreatedDate());
converted.setLastModifiedDate(source.getLastModifiedDate());
converted.setText(source.getText());
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetConverter.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetConverter.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetConverter.java Thu Aug 9 07:05:51 2012
@@ -54,7 +54,7 @@ public class JpaWidgetConverter implemen
}
private void updateProperties(Widget source, JpaWidget converted) {
- converted.setEntityId(source.getId());
+ converted.setEntityId(source.getId() == null ? null : Long.parseLong(source.getId()));
converted.setUrl(source.getUrl());
converted.setType(source.getType());
converted.setTitle(source.getTitle());
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java Thu Aug 9 07:05:51 2012
@@ -49,7 +49,7 @@ public class JpaWidgetRatingConverter im
}
private void updateProperties(WidgetRating source, JpaWidgetRating converted) {
- converted.setId(source.getId());
+ converted.setEntityId(source.getId() == null ? null : Long.parseLong(source.getId()));
converted.setScore(source.getScore());
converted.setUserId(source.getUserId());
converted.setWidgetId(source.getWidgetId());
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverter.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverter.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverter.java Thu Aug 9 07:05:51 2012
@@ -50,7 +50,7 @@ public class JpaWidgetTagConverter imple
private JpaWidgetTag createEntity(WidgetTag source) {
JpaWidgetTag convertedWidgetTag;
TypedQuery<JpaWidgetTag> query = manager.createNamedQuery(JpaWidgetTag.FIND_BY_WIDGET_AND_KEYWORD, JpaWidgetTag.class);
- query.setParameter(JpaWidgetTag.WIDGET_ID_PARAM, source.getWidgetId());
+ query.setParameter(JpaWidgetTag.WIDGET_ID_PARAM, Long.parseLong(source.getWidgetId()));
query.setParameter(JpaWidgetTag.TAG_KEYWORD_PARAM, source.getTag().getKeyword());
convertedWidgetTag = JpaUtil.getSingleResult(query.getResultList());
@@ -64,7 +64,6 @@ public class JpaWidgetTagConverter imple
private void updateProperties(WidgetTag source, JpaWidgetTag convertedWidgetTag) {
convertedWidgetTag.setCreatedDate(source.getCreatedDate());
convertedWidgetTag.setTag(source.getTag());
- convertedWidgetTag.setUser(source.getUser());
- convertedWidgetTag.setWidgetId(source.getWidgetId());
+ convertedWidgetTag.setUserId(source.getUserId());
}
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java Thu Aug 9 07:05:51 2012
@@ -52,7 +52,7 @@ public class JpaApplicationDataRepositor
}
@Override
- public ApplicationData get(long id) {
+ public ApplicationData get(String id) {
JpaSerializableApplicationData applicationData = (JpaSerializableApplicationData) manager.find(JpaApplicationData.class, id);
if (applicationData != null) {
applicationData.deserializeData();
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java Thu Aug 9 07:05:51 2012
@@ -81,7 +81,7 @@ public class JpaAuthorityRepository impl
}
@Override
- public Authority get(long id) {
+ public Authority get(String id) {
return manager.find(JpaAuthority.class, id);
}
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=1371052&r1=1371051&r2=1371052&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 Thu Aug 9 07:05:51 2012
@@ -52,7 +52,7 @@ public class JpaCategoryRepository imple
}
@Override
- public Category get(long id) {
+ public Category get(String id) {
return manager.find(JpaCategory.class, id);
}
@@ -74,18 +74,18 @@ public class JpaCategoryRepository imple
}
@Override
- public int removeFromCreatedOrModifiedFields(long userId) {
+ public int removeFromCreatedOrModifiedFields(String userId) {
List<Category> categories = getAll();
int numRecordsChanged = 0;
for (Category category : categories) {
boolean changed = false;
User createdUser = category.getCreatedUser();
User lastModifiedUser = category.getLastModifiedUser();
- if (createdUser != null && userId == createdUser.getId()) {
+ if (createdUser != null && userId.equals(createdUser.getId())) {
category.setCreatedUser(null);
changed = true;
}
- if (lastModifiedUser != null && userId == lastModifiedUser.getId()) {
+ if (lastModifiedUser != null && userId.equals(lastModifiedUser.getId())) {
category.setLastModifiedUser(null);
changed = true;
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java Thu Aug 9 07:05:51 2012
@@ -51,7 +51,7 @@ public class JpaOAuthConsumerStoreReposi
}
@Override
- public OAuthConsumerStore get(long id) {
+ public OAuthConsumerStore get(String id) {
return manager.find(JpaOAuthConsumerStore.class, id);
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java Thu Aug 9 07:05:51 2012
@@ -51,7 +51,7 @@ public class JpaOAuthTokenInfoRepository
}
@Override
- public OAuthTokenInfo get(long id) {
+ public OAuthTokenInfo get(String id) {
return manager.find(JpaOAuthTokenInfo.class, id);
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java Thu Aug 9 07:05:51 2012
@@ -70,7 +70,7 @@ public class JpaPageLayoutRepository imp
}
@Override
- public PageLayout get(long id) {
+ public PageLayout get(String id) {
return manager.find(JpaPageLayout.class, id);
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java Thu Aug 9 07:05:51 2012
@@ -50,7 +50,7 @@ public class JpaPageRepository implement
}
@Override
- public Page get(long id) {
+ public Page get(String id) {
return manager.find(JpaPage.class, id);
}
@@ -74,15 +74,15 @@ public class JpaPageRepository implement
}
@Override
- public List<Page> getAllPages(Long userId, PageType pageType) {
+ public List<Page> getAllPages(String userId, PageType pageType) {
TypedQuery<JpaPage> query = manager.createNamedQuery(JpaPageUser.GET_BY_USER_ID_AND_PAGE_TYPE, JpaPage.class);
- query.setParameter("userId", userId);
+ query.setParameter("userId", userId == null ? null : Long.parseLong(userId));
query.setParameter("pageType", pageType);
return CollectionUtils.<Page>toBaseTypedList(query.getResultList());
}
@Override
- public int deletePages(Long userId, PageType pageType) {
+ public int deletePages(String userId, PageType pageType) {
List<Page> pages = getAllPages(userId, pageType);
int pageCount = pages.size();
for(Page page : pages) {
@@ -92,26 +92,26 @@ public class JpaPageRepository implement
}
@Override
- public boolean hasPersonPage(long userId){
+ public boolean hasPersonPage(String userId){
TypedQuery<Long> query = manager.createNamedQuery(JpaPage.USER_HAS_PERSON_PAGE, Long.class);
- query.setParameter("userId", userId);
+ query.setParameter("userId", userId == null ? null : Long.parseLong(userId));
query.setParameter("pageType", PageType.PERSON_PROFILE);
return query.getSingleResult() > 0;
}
@Override
- public List<PageUser> getPagesForUser(Long userId, PageType pageType) {
+ public List<PageUser> getPagesForUser(String userId, PageType pageType) {
TypedQuery<JpaPageUser> query = manager.createNamedQuery(JpaPageUser.GET_PAGES_FOR_USER, JpaPageUser.class);
- query.setParameter("userId", userId);
+ query.setParameter("userId", userId == null ? null : Long.parseLong(userId));
query.setParameter("pageType", pageType);
return CollectionUtils.<PageUser>toBaseTypedList(query.getResultList());
}
@Override
- public PageUser getSingleRecord(Long userId, Long pageId){
+ public PageUser getSingleRecord(String userId, String pageId){
TypedQuery<JpaPageUser> query = manager.createNamedQuery(JpaPageUser.GET_SINGLE_RECORD, JpaPageUser.class);
- query.setParameter("userId", userId);
- query.setParameter("pageId", pageId);
+ query.setParameter("userId", userId == null ? null : Long.parseLong(userId));
+ query.setParameter("pageId", pageId == null ? null : Long.parseLong(pageId));
return query.getSingleResult();
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java Thu Aug 9 07:05:51 2012
@@ -102,7 +102,7 @@ public class JpaPersonRepository impleme
Widget widget = getSingleResult(resultList);
query = manager.createNamedQuery(JpaUser.USER_GET_ALL_FOR_ADDED_WIDGET, JpaUser.class);
- query.setParameter(JpaUser.PARAM_WIDGET_ID, widget.getId());
+ query.setParameter(JpaUser.PARAM_WIDGET_ID, Long.parseLong(widget.getId()));
List<User> widgetUsers = query.getResultList();
List<Person> userFriends = findFriends(username);
@@ -155,7 +155,7 @@ public class JpaPersonRepository impleme
}
@Override
- public Person get(long id) {
+ public Person get(String id) {
return manager.find(JpaPerson.class, id);
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java Thu Aug 9 07:05:51 2012
@@ -69,7 +69,7 @@ public class JpaPortalPreferenceReposito
}
@Override
- public PortalPreference get(long id) {
+ public PortalPreference get(String id) {
return manager.find(JpaPortalPreference.class, id);
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java Thu Aug 9 07:05:51 2012
@@ -46,8 +46,8 @@ public class JpaRegionRepository impleme
}
@Override
- public Region get(long id) {
- return manager.find(JpaRegion.class, id);
+ public Region get(String id) {
+ return manager.find(JpaRegion.class, Long.parseLong(id));
}
@Override
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java Thu Aug 9 07:05:51 2012
@@ -47,8 +47,8 @@ public class JpaRegionWidgetRepository i
}
@Override
- public RegionWidget get(long id) {
- return manager.find(JpaRegionWidget.class, id);
+ public RegionWidget get(String id) {
+ return manager.find(JpaRegionWidget.class, Long.parseLong(id));
}
@Override
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java Thu Aug 9 07:05:51 2012
@@ -78,14 +78,14 @@ public class JpaTagRepository implements
}
@Override
- public List<Tag> getAvailableTagsByWidgetId(Long widgetId) {
+ public List<Tag> getAvailableTagsByWidgetId(String widgetId) {
TypedQuery<JpaTag> query = manager.createNamedQuery(JpaTag.GET_ALL_NOT_IN_WIDGET, JpaTag.class);
- query.setParameter("widgetId", widgetId);
+ query.setParameter("widgetId", Long.parseLong(widgetId));
return CollectionUtils.<Tag>toBaseTypedList(query.getResultList());
}
@Override
- public Tag get(long id) {
+ public Tag get(String id) {
return manager.find(JpaTag.class, id);
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java Thu Aug 9 07:05:51 2012
@@ -89,9 +89,9 @@ public class JpaUserRepository implement
}
@Override
- public List<User> getAllByAddedWidget(long widgetId) {
+ public List<User> getAllByAddedWidget(String widgetId) {
TypedQuery<JpaUser> query = manager.createNamedQuery(JpaUser.USER_GET_ALL_FOR_ADDED_WIDGET, JpaUser.class);
- query.setParameter(JpaUser.PARAM_WIDGET_ID, widgetId);
+ query.setParameter(JpaUser.PARAM_WIDGET_ID, Long.parseLong(widgetId));
return CollectionUtils.<User>toBaseTypedList(query.getResultList());
}
@@ -108,7 +108,7 @@ public class JpaUserRepository implement
}
@Override
- public User get(long id) {
+ public User get(String id) {
return manager.find(JpaUser.class, id);
}
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=1371052&r1=1371051&r2=1371052&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 Thu Aug 9 07:05:51 2012
@@ -44,7 +44,7 @@ public class JpaWidgetCommentRepository
}
@Override
- public WidgetComment get(long id) {
+ public WidgetComment get(String id) {
return manager.find(JpaWidgetComment.class, id);
}
@@ -60,9 +60,9 @@ public class JpaWidgetCommentRepository
}
@Override
- public int deleteAll(Long userId) {
+ public int deleteAll(String userId) {
TypedQuery<JpaWidgetComment> query = manager.createNamedQuery(JpaWidgetComment.DELETE_ALL_BY_USER, JpaWidgetComment.class);
- query.setParameter("userId", userId);
+ query.setParameter("userId", userId == null ? null : Long.parseLong(userId));
return query.executeUpdate();
}
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java Thu Aug 9 07:05:51 2012
@@ -47,19 +47,19 @@ public class JpaWidgetRatingRepository i
private JpaWidgetRatingConverter converter;
@Override
- public WidgetRating getByWidgetIdAndUserId(Long widgetId, Long userId) {
+ public WidgetRating getByWidgetIdAndUserId(String widgetId, String userId) {
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);
+ query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, Long.parseLong(widgetId));
+ query.setParameter(JpaWidgetRating.PARAM_USER_ID, Long.parseLong(userId));
final List<JpaWidgetRating> resultList = query.getResultList();
return getSingleResult(resultList);
}
@Override
- public int deleteAll(Long userId) {
+ public int deleteAll(String userId) {
TypedQuery<JpaWidgetRating> query = manager.createNamedQuery(JpaWidgetRating.DELETE_ALL_BY_USER, JpaWidgetRating.class);
- query.setParameter("userId", userId);
+ query.setParameter("userId", userId == null ? null : Long.parseLong(userId));
return query.executeUpdate();
}
@@ -69,7 +69,7 @@ public class JpaWidgetRatingRepository i
}
@Override
- public WidgetRating get(long id) {
+ public WidgetRating get(String id) {
return manager.find(JpaWidgetRating.class, id);
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java Thu Aug 9 07:05:51 2012
@@ -156,25 +156,25 @@ public class JpaWidgetRepository impleme
}
@Override
- public WidgetStatistics getWidgetStatistics(long widget_id, long user_id) {
+ public WidgetStatistics getWidgetStatistics(String widget_id, String user_id) {
WidgetStatistics widgetStatistics = new WidgetStatistics();
Query query = manager.createNamedQuery(JpaWidgetRating.WIDGET_TOTAL_LIKES);
- query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, widget_id);
+ query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, Long.parseLong(widget_id));
widgetStatistics.setTotalLike(((Number) query.getSingleResult()).intValue());
query = manager.createNamedQuery(JpaWidgetRating.WIDGET_TOTAL_DISLIKES);
- query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, widget_id);
+ query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, Long.parseLong(widget_id));
widgetStatistics.setTotalDislike(((Number) query.getSingleResult()).intValue());
query = manager.createNamedQuery(JpaRegionWidget.REGION_WIDGET_GET_DISTINCT_USER_COUNT_SINGLE_WIDGET);
- query.setParameter(JpaRegionWidget.PARAM_WIDGET_ID, widget_id);
+ query.setParameter(JpaRegionWidget.PARAM_WIDGET_ID, Long.parseLong(widget_id));
widgetStatistics.setTotalUserCount(((Number) query.getSingleResult()).intValue());
try {
query = manager.createNamedQuery(JpaWidgetRating.WIDGET_USER_RATING);
- query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, widget_id);
- query.setParameter(JpaWidgetRating.PARAM_USER_ID, user_id);
+ query.setParameter(JpaWidgetRating.PARAM_WIDGET_ID, Long.parseLong(widget_id));
+ query.setParameter(JpaWidgetRating.PARAM_USER_ID, Long.parseLong(user_id));
widgetStatistics.setUserRating(((Number) query.getSingleResult()).intValue());
} catch (NoResultException e) {
widgetStatistics.setUserRating(JpaWidgetRating.UNSET);
@@ -184,12 +184,12 @@ public class JpaWidgetRepository impleme
}
@Override
- public Map<Long, WidgetRating> getUsersWidgetRatings(long user_id) {
+ public Map<String, WidgetRating> getUsersWidgetRatings(String user_id) {
TypedQuery<JpaWidgetRating> query =
manager.createNamedQuery(JpaWidgetRating.WIDGET_ALL_USER_RATINGS, JpaWidgetRating.class);
- query.setParameter(JpaWidgetRating.PARAM_USER_ID, user_id);
+ query.setParameter(JpaWidgetRating.PARAM_USER_ID, user_id == null ? null : Long.parseLong(user_id));
- Map<Long, WidgetRating> map = new HashMap<Long, WidgetRating>();
+ Map<String, WidgetRating> map = new HashMap<String, WidgetRating>();
for (WidgetRating widgetRating : query.getResultList()) {
map.put(widgetRating.getWidgetId(), widgetRating);
}
@@ -199,8 +199,8 @@ public class JpaWidgetRepository impleme
@SuppressWarnings("unchecked")
@Override
- public Map<Long, WidgetStatistics> getAllWidgetStatistics(long userId) {
- HashMap<Long, WidgetStatistics> map = new HashMap<Long, WidgetStatistics>();
+ public Map<String, WidgetStatistics> getAllWidgetStatistics(String userId) {
+ HashMap<String, WidgetStatistics> map = new HashMap<String, WidgetStatistics>();
//Generate the mapping of all likes done for the widgets
Query query = manager.createNamedQuery(JpaWidgetRating.WIDGET_ALL_TOTAL_LIKES);
@@ -209,7 +209,7 @@ public class JpaWidgetRepository impleme
Long widgetId = (Long) result[1];
WidgetStatistics widgetStatistics = new WidgetStatistics();
widgetStatistics.setTotalLike(totalLikes.intValue());
- map.put(widgetId, widgetStatistics);
+ map.put(widgetId.toString(), widgetStatistics);
}
//Add the mapping of all dislikes done for the widgets
@@ -217,10 +217,10 @@ public class JpaWidgetRepository impleme
for (Object[] result : (List<Object[]>) query.getResultList()) {
Long totalDislikes = (Long) result[0];
Long widgetId = (Long) result[1];
- WidgetStatistics widgetStatistics = map.get(widgetId);
+ WidgetStatistics widgetStatistics = map.get(widgetId.toString());
if (widgetStatistics == null) {
widgetStatistics = new WidgetStatistics();
- map.put(widgetId, widgetStatistics);
+ map.put(widgetId.toString(), widgetStatistics);
}
widgetStatistics.setTotalDislike(totalDislikes.intValue());
}
@@ -230,17 +230,17 @@ public class JpaWidgetRepository impleme
for (Object[] result : (List<Object[]>) query.getResultList()) {
Long widgetId = (Long) result[0];
Long totalUserCount = (Long) result[1];
- WidgetStatistics widgetStatistics = map.get(widgetId);
+ WidgetStatistics widgetStatistics = map.get(widgetId.toString());
if (widgetStatistics == null) {
widgetStatistics = new WidgetStatistics();
- map.put(widgetId, widgetStatistics);
+ map.put(widgetId.toString(), widgetStatistics);
}
widgetStatistics.setTotalUserCount(totalUserCount.intValue());
}
//Add the current user's current rating of the widget
- Map<Long, WidgetRating> userRatings = getUsersWidgetRatings(userId);
- for (Map.Entry<Long, WidgetStatistics> entry : map.entrySet()) {
+ Map<String, WidgetRating> userRatings = getUsersWidgetRatings(userId);
+ for (Map.Entry<String, WidgetStatistics> entry : map.entrySet()) {
//If the user has a widget rating then record it
if (userRatings.containsKey(entry.getKey())) {
entry.getValue().setUserRating(userRatings.get(entry.getKey()).getScore());
@@ -276,9 +276,9 @@ public class JpaWidgetRepository impleme
}
@Override
- public int unassignWidgetOwner(long userId) {
+ public int unassignWidgetOwner(String userId) {
Query query = manager.createNamedQuery(JpaWidget.WIDGET_UNASSIGN_OWNER);
- query.setParameter(JpaWidget.PARAM_OWNER, userId);
+ query.setParameter(JpaWidget.PARAM_OWNER, userId == null ? null : Long.parseLong(userId));
return query.executeUpdate();
}
@@ -288,7 +288,7 @@ public class JpaWidgetRepository impleme
}
@Override
- public Widget get(long id) {
+ public Widget get(String id) {
return manager.find(JpaWidget.class, id);
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepository.java Thu Aug 9 07:05:51 2012
@@ -40,13 +40,13 @@ public class JpaWidgetTagRepository impl
JpaWidgetTagConverter converter;
@Override
- public JpaWidgetTag getByWidgetIdAndTag(Long widgetId, String keyword) {
+ public JpaWidgetTag getByWidgetIdAndTag(String widgetId, String keyword) {
if (keyword != null) {
keyword = keyword.trim();
}
TypedQuery<JpaWidgetTag> query = manager.createNamedQuery(JpaWidgetTag.FIND_BY_WIDGET_AND_KEYWORD, JpaWidgetTag.class);
query.setParameter("keyword", keyword);
- query.setParameter("widgetId", widgetId);
+ query.setParameter("widgetId", widgetId == null ? null : Long.parseLong(widgetId));
return getSingleResult(query.getResultList());
}
@@ -56,7 +56,7 @@ public class JpaWidgetTagRepository impl
}
@Override
- public WidgetTag get(long id) {
+ public WidgetTag get(String id) {
return manager.find(JpaWidgetTag.class, id);
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java Thu Aug 9 07:05:51 2012
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertTru
public class PageTest {
private Page page;
private long id;
- private long parentId;
+ private String parentId;
private String testName;
private JpaUser testOwner;
private Page parentPage;
@@ -52,14 +52,14 @@ public class PageTest {
private List<Region> regions;
private PageUser pageUser;
- private final Long SUB_PAGE_1_ID = 666666L;
- private final Long SUB_PAGE_2_ID = 121212L;
+ private final String SUB_PAGE_1_ID = "666666";
+ private final String SUB_PAGE_2_ID = "121212";
@Before
public void setup(){
- page=new PageImpl();
id=19191991L;
- parentId = 12345L;
+ page=new PageImpl(Long.toBinaryString(id));
+ parentId = "12345";
testName="testName";
testOwner=new JpaUser(id);
parentPage = new PageImpl(parentId);
@@ -103,7 +103,6 @@ public class PageTest {
regions.add(new RegionImpl());
regions.add(new RegionImpl());
- page.setId(id);
page.setName(testName);
page.setOwner(testOwner);
page.setParentPage(parentPage);
@@ -124,7 +123,7 @@ public class PageTest {
@Test
public void testAccessorMethods() {
- assertTrue(page.getId()==id);
+ assertTrue(page.getId()==Long.toString(id));
assertTrue(page.getName().equals(testName));
assertTrue(page.getOwner().equals(testOwner));
assertTrue(page.getParentPage().equals(parentPage));
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java Thu Aug 9 07:05:51 2012
@@ -33,15 +33,15 @@ public class WidgetRatingTest {
JpaWidgetRating widgetRating;
Long id;
- Long widgetId;
- Long userId;
+ String widgetId;
+ String userId;
Integer score;
@Before
public void setUp() throws Exception {
id = 1L;
- widgetId = 1L;
- userId = 1L;
+ widgetId = "1";
+ userId = "1";
score = 1;
widgetRating = new JpaWidgetRating();
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java Thu Aug 9 07:05:51 2012
@@ -32,16 +32,15 @@ public class WidgetTagTest {
private JpaWidgetTag widgetTag;
private static final Long VALID_ENTITY_ID = 1L;
- private static final Long VALID_USER_ID = 1L;
+ private static final String VALID_USER_ID = "1";
private static final Long VALID_WIDGET_ID = 3L;
private static final Date VALID_CREATED_DATE = new Date();
@Before
public void setUp() {
- widgetTag = new JpaWidgetTag();
+ widgetTag = new JpaWidgetTag(VALID_WIDGET_ID);
widgetTag.setEntityId(VALID_ENTITY_ID);
- widgetTag.setWidgetId(VALID_WIDGET_ID);
- widgetTag.setUser(new JpaUser(1L, "John.Doe"));
+ widgetTag.setUserId("1");
widgetTag.setCreatedDate(VALID_CREATED_DATE);
widgetTag.setTag(new JpaTag(1L, "test"));
}
@@ -50,7 +49,7 @@ public class WidgetTagTest {
public void getters() {
assertEquals(VALID_ENTITY_ID, widgetTag.getEntityId());
assertEquals(VALID_WIDGET_ID, widgetTag.getWidgetId());
- assertEquals(VALID_USER_ID, widgetTag.getUser().getId());
+ assertEquals(VALID_USER_ID, widgetTag.getUserId());
assertEquals(VALID_CREATED_DATE, widgetTag.getCreatedDate());
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java Thu Aug 9 07:05:51 2012
@@ -70,8 +70,8 @@ public class WidgetTest {
ratings.add(new JpaWidgetRating(1L, 1L, 1L, 1));
tags = new ArrayList<WidgetTag>();
- tags.add(new JpaWidgetTag(1L, 1L, new JpaUser(), new Date(), tag)) ;
- tags.add(new JpaWidgetTag(2L,1L, new JpaUser(), new Date(), tag1)) ;
+ tags.add(new JpaWidgetTag(1L, 1L, 1, new Date(), tag)) ;
+ tags.add(new JpaWidgetTag(2L,1L, 2, new Date(), tag1)) ;
widget.setEntityId(id);
widget.setTitle(title);
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverterTest.java Thu Aug 9 07:05:51 2012
@@ -54,7 +54,7 @@ public class JpaApplicationDataConverter
@Test
public void newApplicationData() {
ApplicationData applicationData = new ApplicationDataImpl();
- applicationData.setId(1L);
+ applicationData.setId("1");
applicationData.setAppUrl("url");
applicationData.setData(new HashMap<String, String>());
applicationData.setUserId("userid");
@@ -63,7 +63,7 @@ public class JpaApplicationDataConverter
assertThat(converted, is(not(sameInstance(applicationData))));
assertThat(converted, is(instanceOf(JpaApplicationData.class)));
assertThat(converted.getId(), is(equalTo(applicationData.getId())));
- assertThat(converted.getEntityId(), is(equalTo(applicationData.getId())));
+ assertThat(converted.getEntityId().toString(), is(equalTo(applicationData.getId())));
assertThat(converted.getAppUrl(), is(equalTo(applicationData.getAppUrl())));
assertThat(converted.getData(), is(equalTo(applicationData.getData())));
assertThat(converted.getUserId(), is(equalTo(applicationData.getUserId())));
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java Thu Aug 9 07:05:51 2012
@@ -62,7 +62,7 @@ public class JpaAuthorityConverterTest {
Authority template = new AuthorityImpl();
template.setAuthority("FOO");
template.setDefaultForNewUser(true);
- template.addUser(new UserImpl(42L));
+ template.addUser(new UserImpl("42"));
JpaAuthority jpaTemplate = converter.convert(template);
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=1371052&r1=1371051&r2=1371052&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 Thu Aug 9 07:05:51 2012
@@ -55,7 +55,7 @@ public class JpaCategoryConverterTest {
public void newCategory() {
Category category = new CategoryImpl();
category.setCreatedDate(new Date());
- category.setId(9L);
+ category.setId("9");
category.setLastModifiedDate(new Date());
category.setText("hello");
category.setCreatedUser(new JpaUser(1L));
@@ -67,7 +67,7 @@ public class JpaCategoryConverterTest {
assertThat(converted, is(instanceOf(JpaCategory.class)));
assertThat(converted.getCreatedDate(), is(equalTo(category.getCreatedDate())));
assertThat(converted.getCreatedUser(), is(equalTo(category.getCreatedUser())));
- assertThat(converted.getEntityId(), is(equalTo(category.getId())));
+ 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())));
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverterTest.java Thu Aug 9 07:05:51 2012
@@ -52,7 +52,7 @@ public class JpaOAuthConsumerStoreConver
@Test
public void newOAuthConsumerStore() {
OAuthConsumerStore oAuthConsumerStore = new OAuthConsumerStoreImpl();
- oAuthConsumerStore.setId(1L);
+ oAuthConsumerStore.setId("1");
oAuthConsumerStore.setServiceName("servicename");
oAuthConsumerStore.setCallbackUrl("callbackurl");
oAuthConsumerStore.setConsumerKey("key");
@@ -69,7 +69,7 @@ public class JpaOAuthConsumerStoreConver
assertThat(converted.getCallbackUrl(), is(equalTo(oAuthConsumerStore.getCallbackUrl())));
assertThat(converted.getConsumerKey(), is(equalTo(oAuthConsumerStore.getConsumerKey())));
assertThat(converted.getConsumerSecret(), is(equalTo(oAuthConsumerStore.getConsumerSecret())));
- assertThat(converted.getEntityId(), is(equalTo(oAuthConsumerStore.getId())));
+ assertThat(converted.getEntityId().toString(), is(equalTo(oAuthConsumerStore.getId())));
assertThat(converted.getGadgetUri(), is(equalTo(oAuthConsumerStore.getGadgetUri())));
assertThat(converted.getKeyName(), is(equalTo(oAuthConsumerStore.getKeyName())));
assertThat(converted.getKeyType(), is(equalTo(oAuthConsumerStore.getKeyType())));
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverterTest.java Thu Aug 9 07:05:51 2012
@@ -53,7 +53,7 @@ public class JpaOAuthTokenInfoConverterT
@Test
public void newOAuthTokenInfo() {
OAuthTokenInfo oAuthTokenInfo = new OAuthTokenInfoImpl();
- oAuthTokenInfo.setId(1L);
+ oAuthTokenInfo.setId("1");
oAuthTokenInfo.setAccessToken("accesstoken");
oAuthTokenInfo.setAppUrl("appurl");
oAuthTokenInfo.setModuleId("moduleid");
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java Thu Aug 9 07:05:51 2012
@@ -54,13 +54,13 @@ public class JpaPageConverterTest {
@Test
public void newPage() {
Page page = new PageImpl();
- page.setId(1L);
+ page.setId("1");
page.setMembers(new ArrayList<PageUser>());
page.setName("name");
page.setOwner(new JpaUser());
page.setPageLayout(new PageLayoutImpl());
page.setPageType(PageType.USER);
- page.setParentPage(new PageImpl(1L));
+ page.setParentPage(new PageImpl("1"));
page.setRegions(new ArrayList<Region>());
page.setSubPages(new ArrayList<Page>());
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java Thu Aug 9 07:05:51 2012
@@ -60,14 +60,14 @@ public class JpaPageTemplateConverterTes
@Test
public void convertValid() {
- PageTemplate template = new PageTemplateImpl();
+ PageTemplate template = new PageTemplateImpl("1");
template.setName("name");
template.setSubPageTemplates(new ArrayList<PageTemplate>());
template.setDefaultTemplate(true);
template.setRenderSequence(1);
template.setPageTemplateRegions(new ArrayList<PageTemplateRegion>());
template.setPageLayout(new PageLayoutImpl());
- template.setParentPageTemplate(new PageTemplateImpl());
+ template.setParentPageTemplate(new PageTemplateImpl("1"));
template.setDescription("Description");
template.setPageType(PageType.USER);
@@ -75,7 +75,7 @@ public class JpaPageTemplateConverterTes
assertThat(jpaTemplate, is(not(sameInstance(template))));
assertThat(jpaTemplate, is(instanceOf(JpaPageTemplate.class)));
- assertThat(jpaTemplate.getId(), is(equalTo(template.getId())));
+ assertThat(jpaTemplate.getId().toString(), is(equalTo(template.getId())));
assertThat(jpaTemplate.getPageType(), is(equalTo(template.getPageType())));
assertThat(jpaTemplate.getName(), is(equalTo(template.getName())));
assertThat(jpaTemplate.getDescription(), is(equalTo(template.getDescription())));
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java Thu Aug 9 07:05:51 2012
@@ -63,10 +63,10 @@ public class JpaPageTemplateRegionConver
@Test
public void convertValid() {
- PageTemplateRegion template = new PageTemplateRegionImpl();
+ PageTemplateRegion template = new PageTemplateRegionImpl("1");
template.setRenderSequence(1);
template.setPageTemplateWidgets(new ArrayList<PageTemplateWidget>());
- template.setPageTemplate(new PageTemplateImpl());
+ template.setPageTemplate(new PageTemplateImpl("1"));
template.setLocked(true);
JpaPageTemplateRegion jpaTemplate = converter.convert(template);
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java Thu Aug 9 07:05:51 2012
@@ -59,10 +59,10 @@ public class JpaPageTemplateWidgetConver
@Test
public void convertValid() {
JpaWidget widget = new JpaWidget();
- PageTemplateWidget template = new PageTemplateWidgetImpl();
+ PageTemplateWidget template = new PageTemplateWidgetImpl("1");
template.setLocked(true);
template.setHideChrome(true);
- template.setPageTemplateRegion(new PageTemplateRegionImpl());
+ template.setPageTemplateRegion(new PageTemplateRegionImpl("1"));
template.setRenderSeq(1);
template.setWidget(widget);
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java Thu Aug 9 07:05:51 2012
@@ -58,8 +58,7 @@ public class JpaPersonPropertyConverterT
@Test
public void convertValid() {
- PersonProperty template = new PersonPropertyImpl();
- template.setId(42L);
+ PersonProperty template = new PersonPropertyImpl("42");
template.setType("TEST_A");
template.setValue("TEST_B");
template.setQualifier("TEST_C");
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java Thu Aug 9 07:05:51 2012
@@ -54,8 +54,7 @@ public class JpaRegionConverterTest {
@Test
public void newRegion() {
- Region region = new RegionImpl();
- region.setId(9L);
+ Region region = new RegionImpl("9");
region.setLocked(false);
region.setPage(new JpaPage());
region.setRegionWidgets(new ArrayList<RegionWidget>());
@@ -65,7 +64,7 @@ public class JpaRegionConverterTest {
assertThat(converted, is(not(sameInstance(region))));
assertThat(converted, is(instanceOf(JpaRegion.class)));
assertThat(converted.getRegionWidgets(), is(equalTo(region.getRegionWidgets())));
- assertThat(converted.getEntityId(), is(equalTo(region.getId())));
+ assertThat(converted.getEntityId().toString(), is(equalTo(region.getId())));
assertThat(converted.getId(), is(equalTo(region.getId())));
assertThat(converted.getPage(), is(instanceOf(Page.class)));
assertThat(converted.getRenderOrder(), is(equalTo(region.getRenderOrder())));
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java Thu Aug 9 07:05:51 2012
@@ -55,22 +55,21 @@ public class JpaRegionWidgetConverterTes
@Test
public void newRegion() {
- RegionWidget rw = new RegionWidgetImpl();
- rw.setId(9L);
+ RegionWidget rw = new RegionWidgetImpl("9");
rw.setLocked(false);
rw.setCollapsed(false);
rw.setHideChrome(true);
rw.setRenderOrder(9);
rw.setPreferences(new ArrayList<RegionWidgetPreference>());
- rw.setRegion(new RegionImpl());
+ rw.setRegion(new RegionImpl("1"));
rw.setRenderPosition("last");
- rw.setWidget(new WidgetImpl());
+ rw.setWidget(new WidgetImpl("1"));
JpaRegionWidget converted = regionWidgetConverter.convert(rw);
assertThat(converted, is(not(sameInstance(rw))));
assertThat(converted, is(instanceOf(JpaRegionWidget.class)));
assertThat(converted.getPreferences(), is(equalTo(rw.getPreferences())));
- assertThat(converted.getEntityId(), is(equalTo(rw.getId())));
+ assertThat(converted.getEntityId().toString(), is(equalTo(rw.getId())));
assertThat(converted.getId(), is(equalTo(rw.getId())));
assertThat(converted.isCollapsed(), is(equalTo(rw.isCollapsed())));
assertThat(converted.getRenderOrder(), is(equalTo(rw.getRenderOrder())));
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java Thu Aug 9 07:05:51 2012
@@ -60,7 +60,7 @@ public class JpaRegionWidgetPreferenceCo
public void convertValid() {
RegionWidgetPreference template = new RegionWidgetPreferenceImpl();
template.setName("TEST_A");
- template.setRegionWidgetId(42L);
+ template.setRegionWidgetId("42");
template.setValue("TEST_B");
JpaRegionWidgetPreference jpaTemplate = converter.convert(template);
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaTagConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaTagConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaTagConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaTagConverterTest.java Thu Aug 9 07:05:51 2012
@@ -42,11 +42,10 @@ public class JpaTagConverterTest {
@Test
public void convert_valid_tagImpl(){
- TagImpl tag = new TagImpl("blazer", new ArrayList<WidgetTag>());
+ TagImpl tag = new TagImpl("blazer");
JpaTag jpaTag = jpaTagConverter.convert(tag);
assertNotNull(jpaTag);
- assertEquals(tag.getKeyword(), jpaTag.getKeyword());
- assertEquals(tag.getWidgets().size(), jpaTag.getWidgets().size());
+ assertEquals(tag.getKeyword(), jpaTag.getKeyword());
}
@@ -54,7 +53,6 @@ public class JpaTagConverterTest {
public void convert_valid_jpaTag(){
JpaTag tag = new JpaTag();
tag.setKeyword("blazer");
- tag.setWidgets(new ArrayList<WidgetTag>());
tag.setEntityId(387L);
JpaTag jpaTag = jpaTagConverter.convert(tag);
assertNotNull(jpaTag);
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java Thu Aug 9 07:05:51 2012
@@ -63,7 +63,7 @@ public class JpaUserConverterTest {
@Test
public void convertValid() {
- User template = new UserImpl();
+ User template = new UserImpl("1");
template.setUsername("TEST_A");
template.setEmail("TEST_B");
template.setDisplayName("TEST_C");
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=1371052&r1=1371051&r2=1371052&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 Thu Aug 9 07:05:51 2012
@@ -55,19 +55,18 @@ public class JpaWidgetCommentConverterTe
@Test
public void newComment() {
- WidgetComment comment = new WidgetCommentImpl();
+ WidgetComment comment = new WidgetCommentImpl("9");
comment.setCreatedDate(new Date());
- comment.setId(9L);
comment.setLastModifiedDate(new Date());
comment.setText("hello");
comment.setUser(new JpaUser(1L));
- comment.setWidgetId(9L);
+ comment.setWidgetId("9");
JpaWidgetComment converted = widgetCommentConverter.convert(comment);
assertThat(converted, is(not(sameInstance(comment))));
assertThat(converted, is(instanceOf(JpaWidgetComment.class)));
assertThat(converted.getCreatedDate(), is(equalTo(comment.getCreatedDate())));
- assertThat(converted.getEntityId(), is(equalTo(comment.getId())));
+ assertThat(converted.getEntityId().toString(), is(equalTo(comment.getId())));
assertThat(converted.getId(), is(equalTo(comment.getId())));
assertThat(converted.getLastModifiedDate(), is(equalTo(comment.getLastModifiedDate())));
assertThat(converted.getText(), is(equalTo(comment.getText())));
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java Thu Aug 9 07:05:51 2012
@@ -60,8 +60,7 @@ public class JpaWidgetConverterTest {
@Test
public void convertValid() {
- WidgetImpl template = new WidgetImpl();
- template.setId(42L);
+ WidgetImpl template = new WidgetImpl("42");
template.setUrl("TEST_A");
template.setType("TEST_B");
template.setTitle("TEST_C");
@@ -74,7 +73,7 @@ public class JpaWidgetConverterTest {
template.setDescription("TEST_J");
template.setWidgetStatus(WidgetStatus.PUBLISHED);
template.setComments(new ArrayList<WidgetComment>());
- template.setOwner(new UserImpl(24L));
+ template.setOwner(new UserImpl("24"));
template.setDisableRendering(true);
template.setRatings(new ArrayList<WidgetRating>());
template.setTags(new ArrayList<WidgetTag>());
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java Thu Aug 9 07:05:51 2012
@@ -58,10 +58,10 @@ public class JpaWidgetRatingConverterTes
@Test
public void convertValid() {
- WidgetRating template = new WidgetRatingImpl();
+ WidgetRating template = new WidgetRatingImpl("1");
template.setScore(1);
- template.setUserId(42L);
- template.setWidgetId(24L);
+ template.setUserId("42");
+ template.setWidgetId("24");
JpaWidgetRating jpaTemplate = converter.convert(template);
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverterTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverterTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverterTest.java Thu Aug 9 07:05:51 2012
@@ -41,25 +41,23 @@ public class JpaWidgetTagConverterTest {
@Test
public void convert_valid_widgetTaq(){
- WidgetTag widgetTag = new WidgetTagImpl();
+ WidgetTag widgetTag = new WidgetTagImpl("3");
widgetTag.setCreatedDate(new Date());
- widgetTag.setUser(new JpaUser());
- widgetTag.setWidgetId(3L);
+ widgetTag.setUserId(new JpaUser(1L).getId());
widgetTag.setTag(new JpaTag(1L, "news"));
JpaWidgetTag jpaWidgetTag = jpaWidgetTagConverter.convert(widgetTag);
assertNotNull(jpaWidgetTag);
assertEquals(widgetTag.getCreatedDate(), jpaWidgetTag.getCreatedDate());
assertSame(widgetTag.getTag(), jpaWidgetTag.getTag());
- assertSame(widgetTag.getUser(), jpaWidgetTag.getUser());
+ assertEquals(widgetTag.getUserId(), jpaWidgetTag.getUserId());
assertEquals(widgetTag.getWidgetId(), jpaWidgetTag.getWidgetId());
}
@Test
public void convert_valid_jpaWidgetTaq(){
- JpaWidgetTag widgetTag = new JpaWidgetTag();
+ JpaWidgetTag widgetTag = new JpaWidgetTag(3);
widgetTag.setCreatedDate(new Date());
- widgetTag.setUser(new JpaUser());
- widgetTag.setWidgetId(3L);
+ widgetTag.setUserId(new JpaUser(1L).getId());
widgetTag.setTag(new JpaTag(1L, "news"));
JpaWidgetTag jpaWidgetTag = jpaWidgetTagConverter.convert(widgetTag);
assertNotNull(jpaWidgetTag);
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepositoryTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepositoryTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepositoryTest.java Thu Aug 9 07:05:51 2012
@@ -74,13 +74,13 @@ public class JpaApplicationDataRepositor
@Test
public void get_valid() {
- JpaApplicationData applicationData = (JpaApplicationData) repository.get(VALID_APPLICATION_DATA_ID);
+ JpaApplicationData applicationData = (JpaApplicationData) repository.get(VALID_APPLICATION_DATA_ID.toString());
validateApplicationData(applicationData);
}
@Test
public void get_invalid() {
- ApplicationData applicationData = repository.get(-1L);
+ ApplicationData applicationData = repository.get("-1");
assertThat(applicationData, is(nullValue()));
}
@@ -149,10 +149,10 @@ public class JpaApplicationDataRepositor
@Transactional(readOnly=false)
@Rollback(true)
public void delete_jpaObject() {
- ApplicationData applicationData = repository.get(VALID_APPLICATION_DATA_ID);
+ ApplicationData applicationData = repository.get(VALID_APPLICATION_DATA_ID.toString());
assertThat(applicationData, is(notNullValue()));
repository.delete(applicationData);
- applicationData = repository.get(VALID_APPLICATION_DATA_ID);
+ applicationData = repository.get(VALID_APPLICATION_DATA_ID.toString());
assertThat(applicationData, is(nullValue()));
}
@@ -160,11 +160,11 @@ public class JpaApplicationDataRepositor
@Transactional(readOnly=false)
@Rollback(true)
public void delete_implObject() {
- ApplicationData applicationData = repository.get(VALID_APPLICATION_DATA_ID);
+ ApplicationData applicationData = repository.get(VALID_APPLICATION_DATA_ID.toString());
assertThat(applicationData, is(notNullValue()));
ApplicationDataImpl impl = new ApplicationDataImpl(applicationData.getId());
repository.delete(impl);
- applicationData = repository.get(VALID_APPLICATION_DATA_ID);
+ applicationData = repository.get(VALID_APPLICATION_DATA_ID.toString());
assertThat(applicationData, is(nullValue()));
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java Thu Aug 9 07:05:51 2012
@@ -66,7 +66,7 @@ public class JpaAuthorityRepositoryTest
@Test
public void getById_validId() {
- final JpaAuthority authority = (JpaAuthority)repository.get(VALID_ID);
+ final JpaAuthority authority = (JpaAuthority)repository.get(VALID_ID.toString());
assertNotNull(authority);
assertEquals(VALID_ID, authority.getEntityId());
}
@@ -103,7 +103,7 @@ public class JpaAuthorityRepositoryTest
final String authorityName = "guest";
Authority authority = new JpaAuthority();
authority.setAuthority(authorityName);
- User user = userRepository.get(1L);
+ User user = userRepository.get("1");
Assert.assertNotNull("User is null", user);
Assert.assertTrue("User has no authorities", user.getAuthorities().isEmpty());
@@ -121,7 +121,7 @@ public class JpaAuthorityRepositoryTest
repository.delete(authority);
assertNull("No authority guest", repository.getByAuthority(authorityName));
- user = userRepository.get(1L);
+ user = userRepository.get("1");
Assert.assertNotNull("User should not be deleted after removing an authority", user);
Assert.assertTrue("User should have no authorities", user.getAuthorities().isEmpty());
}
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=1371052&r1=1371051&r2=1371052&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 Thu Aug 9 07:05:51 2012
@@ -72,13 +72,13 @@ public class JpaCategoryRepositoryTest {
@Test
public void getById_validId() {
- JpaCategory category = (JpaCategory) repository.get(VALID_ENTITY_ID);
+ JpaCategory category = (JpaCategory) repository.get(VALID_ENTITY_ID.toString());
assertThat(category.getEntityId(), is(equalTo(VALID_ENTITY_ID)));
}
@Test
public void getById_invalidId() {
- assertThat(repository.get(INVALID_ENTITY_ID), is(nullValue()));
+ assertThat(repository.get(INVALID_ENTITY_ID.toString()), is(nullValue()));
}
@Test
@@ -99,29 +99,29 @@ public class JpaCategoryRepositoryTest {
Long newEntityId = category.getEntityId();
assertThat(newEntityId, is(notNullValue()));
// verify that it persisted ok
- assertThat((JpaCategory)repository.get(newEntityId), is(category));
+ assertThat((JpaCategory)repository.get(newEntityId.toString()), is(category));
}
@Test
@Rollback(true)
public void save_existingEntity() {
final String UPDATED_TEXT = "changed the text";
- Category category = repository.get(VALID_ENTITY_ID);
+ Category category = repository.get(VALID_ENTITY_ID.toString());
assertThat(category.getText(), is(not(UPDATED_TEXT)));
category.setText(UPDATED_TEXT);
repository.save(category);
// fetch again and verify update
- Category modCategory = repository.get(VALID_ENTITY_ID);
+ Category modCategory = repository.get(VALID_ENTITY_ID.toString());
assertThat(modCategory.getText(), is(UPDATED_TEXT));
}
@Test
@Rollback(true)
public void delete() {
- Category entity = repository.get(VALID_ENTITY_ID);
+ Category entity = repository.get(VALID_ENTITY_ID.toString());
assertThat(entity, is(notNullValue()));
repository.delete(entity);
- assertThat(repository.get(VALID_ENTITY_ID), is(nullValue()));
+ assertThat(repository.get(VALID_ENTITY_ID.toString()), is(nullValue()));
}
@Test
@@ -176,10 +176,10 @@ public class JpaCategoryRepositoryTest {
@Transactional(readOnly=false)
@Rollback(true)
public void delete_jpaObject() {
- Category category = repository.get(VALID_ENTITY_ID);
+ Category category = repository.get(VALID_ENTITY_ID.toString());
assertThat(category, is(notNullValue()));
repository.delete(category);
- category = repository.get(VALID_ENTITY_ID);
+ category = repository.get(VALID_ENTITY_ID.toString());
assertThat(category, is(nullValue()));
}
@@ -187,11 +187,11 @@ public class JpaCategoryRepositoryTest {
@Transactional(readOnly=false)
@Rollback(true)
public void delete_implObject() {
- Category category = repository.get(VALID_ENTITY_ID);
+ Category category = repository.get(VALID_ENTITY_ID.toString());
assertThat(category, is(notNullValue()));
CategoryImpl impl = new CategoryImpl(category.getId());
repository.delete(impl);
- category = repository.get(VALID_ENTITY_ID);
+ category = repository.get(VALID_ENTITY_ID.toString());
assertThat(category, is(nullValue()));
}
@@ -199,6 +199,6 @@ public class JpaCategoryRepositoryTest {
@Transactional(readOnly=false)
@Rollback(true)
public void removeFromCreatedOrModifiedFields() {
- assertThat(repository.removeFromCreatedOrModifiedFields(VALID_USER_ID), is(5));
+ assertThat(repository.removeFromCreatedOrModifiedFields(VALID_USER_ID.toString()), is(5));
}
}
Modified: rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepositoryTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepositoryTest.java (original)
+++ rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepositoryTest.java Thu Aug 9 07:05:51 2012
@@ -65,7 +65,7 @@ public class JpaOAuthConsumerStoreReposi
@Test
public void get() {
- JpaOAuthConsumerStore oAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(VALID_ID);
+ JpaOAuthConsumerStore oAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(VALID_ID.toString());
assertThat(oAuthConsumerStore.getEntityId(), is(VALID_ID));
assertThat(oAuthConsumerStore.getGadgetUri(), is(GADGET_URI));
assertThat(oAuthConsumerStore.getServiceName(), is(SERVICE_NAME_GOOGLE));
@@ -97,9 +97,9 @@ public class JpaOAuthConsumerStoreReposi
assertThat(oAuthConsumerStore.getEntityId(), is(nullValue()));
repository.save(oAuthConsumerStore);
- long newId = oAuthConsumerStore.getEntityId();
+ Long newId = oAuthConsumerStore.getEntityId();
assertThat(newId > 0, is(true));
- JpaOAuthConsumerStore newOAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(newId);
+ JpaOAuthConsumerStore newOAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(newId.toString());
assertThat(newOAuthConsumerStore.getServiceName(), is(NEW_SERVICE_NAME));
assertThat(newOAuthConsumerStore.getCallbackUrl(), is(NEW_URL));
}
@@ -109,21 +109,21 @@ public class JpaOAuthConsumerStoreReposi
@Rollback(true)
public void save_existing() {
final String UPDATED_SERVICE_NAME = "updated service name";
- JpaOAuthConsumerStore oAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(VALID_ID);
+ JpaOAuthConsumerStore oAuthConsumerStore = (JpaOAuthConsumerStore) repository.get(VALID_ID.toString());
assertThat(oAuthConsumerStore.getServiceName(), is(not(UPDATED_SERVICE_NAME)));
oAuthConsumerStore.setServiceName(UPDATED_SERVICE_NAME);
repository.save(oAuthConsumerStore);
- assertThat(repository.get(VALID_ID).getServiceName(), is(UPDATED_SERVICE_NAME));
+ assertThat(repository.get(VALID_ID.toString()).getServiceName(), is(UPDATED_SERVICE_NAME));
}
@Test
@Transactional(readOnly=false)
@Rollback(true)
public void delete() {
- OAuthConsumerStore oAuthConsumerStore = repository.get(VALID_ID);
+ OAuthConsumerStore oAuthConsumerStore = repository.get(VALID_ID.toString());
assertThat(oAuthConsumerStore, is(notNullValue()));
repository.delete(oAuthConsumerStore);
- oAuthConsumerStore = repository.get(VALID_ID);
+ oAuthConsumerStore = repository.get(VALID_ID.toString());
assertThat(oAuthConsumerStore, is(nullValue()));
}
}