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 2013/01/18 19:35:08 UTC
svn commit: r1435298 - in /rave/trunk/rave-components/rave-jpa/src:
main/java/org/apache/rave/portal/model/conversion/
main/java/org/apache/rave/portal/repository/impl/
test/java/org/apache/rave/portal/repository/impl/
Author: mfranklin
Date: Fri Jan 18 18:35:08 2013
New Revision: 1435298
URL: http://svn.apache.org/viewvc?rev=1435298&view=rev
Log:
Fixed repositories for RAVE-875
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java?rev=1435298&r1=1435297&r2=1435298&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java Fri Jan 18 18:35:08 2013
@@ -49,7 +49,8 @@ public class JpaPageConverter implements
private JpaPage createEntity(Page source) {
JpaPage converted = null;
if (source != null) {
- converted = source.getId() == null ? new JpaPage() : manager.find(JpaPage.class, source.getId()); if(converted == null) {
+ converted = source.getId() == null ? new JpaPage() : manager.find(JpaPage.class, Long.parseLong(source.getId()));
+ if(converted == null) {
converted = new JpaPage();
}
updateProperties(source, converted);
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java?rev=1435298&r1=1435297&r2=1435298&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java Fri Jan 18 18:35:08 2013
@@ -53,7 +53,7 @@ public class JpaApplicationDataRepositor
@Override
public ApplicationData get(String id) {
- JpaSerializableApplicationData applicationData = (JpaSerializableApplicationData) manager.find(JpaApplicationData.class, id);
+ JpaSerializableApplicationData applicationData = (JpaSerializableApplicationData) manager.find(JpaApplicationData.class, Long.parseLong(id));
if (applicationData != null) {
applicationData.deserializeData();
}
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java?rev=1435298&r1=1435297&r2=1435298&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java Fri Jan 18 18:35:08 2013
@@ -82,7 +82,7 @@ public class JpaAuthorityRepository impl
@Override
public Authority get(String id) {
- return manager.find(JpaAuthority.class, id);
+ return manager.find(JpaAuthority.class, Long.parseLong(id));
}
@Override
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java?rev=1435298&r1=1435297&r2=1435298&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java Fri Jan 18 18:35:08 2013
@@ -52,7 +52,7 @@ public class JpaCategoryRepository imple
@Override
public Category get(String id) {
- return manager.find(JpaCategory.class, id);
+ return manager.find(JpaCategory.class, Long.parseLong(id));
}
@Override
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java?rev=1435298&r1=1435297&r2=1435298&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java Fri Jan 18 18:35:08 2013
@@ -52,7 +52,7 @@ public class JpaOAuthConsumerStoreReposi
@Override
public OAuthConsumerStore get(String id) {
- return manager.find(JpaOAuthConsumerStore.class, id);
+ return manager.find(JpaOAuthConsumerStore.class, Long.parseLong(id));
}
@Override
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java?rev=1435298&r1=1435297&r2=1435298&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java Fri Jan 18 18:35:08 2013
@@ -52,7 +52,7 @@ public class JpaOAuthTokenInfoRepository
@Override
public OAuthTokenInfo get(String id) {
- return manager.find(JpaOAuthTokenInfo.class, id);
+ return manager.find(JpaOAuthTokenInfo.class, Long.parseLong(id));
}
@Override
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java?rev=1435298&r1=1435297&r2=1435298&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java Fri Jan 18 18:35:08 2013
@@ -71,7 +71,7 @@ public class JpaPageLayoutRepository imp
@Override
public PageLayout get(String id) {
- return manager.find(JpaPageLayout.class, id);
+ return manager.find(JpaPageLayout.class, Long.parseLong(id));
}
@Override
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java?rev=1435298&r1=1435297&r2=1435298&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java Fri Jan 18 18:35:08 2013
@@ -51,7 +51,7 @@ public class JpaPageRepository implement
@Override
public Page get(String id) {
- return manager.find(JpaPage.class, id);
+ return manager.find(JpaPage.class, Long.parseLong(id));
}
@Override
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java?rev=1435298&r1=1435297&r2=1435298&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java Fri Jan 18 18:35:08 2013
@@ -155,7 +155,7 @@ public class JpaPersonRepository impleme
@Override
public Person get(String id) {
- return manager.find(JpaPerson.class, id);
+ return manager.find(JpaPerson.class, Long.parseLong(id));
}
@Override
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java?rev=1435298&r1=1435297&r2=1435298&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java Fri Jan 18 18:35:08 2013
@@ -70,7 +70,7 @@ public class JpaPortalPreferenceReposito
@Override
public PortalPreference get(String id) {
- return manager.find(JpaPortalPreference.class, id);
+ return manager.find(JpaPortalPreference.class, Long.parseLong(id));
}
@Override
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java?rev=1435298&r1=1435297&r2=1435298&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java Fri Jan 18 18:35:08 2013
@@ -79,7 +79,7 @@ public class JpaTagRepository implements
@Override
public Tag get(String id) {
- return manager.find(JpaTag.class, id);
+ return manager.find(JpaTag.class, Long.parseLong(id));
}
@Override
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java?rev=1435298&r1=1435297&r2=1435298&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java Fri Jan 18 18:35:08 2013
@@ -307,7 +307,7 @@ public class JpaWidgetRepository impleme
@Override
public Widget get(String id) {
- return manager.find(JpaWidget.class, id);
+ return manager.find(JpaWidget.class, Long.parseLong(id));
}
@Override
@@ -398,7 +398,7 @@ public class JpaWidgetRepository impleme
@Override
public WidgetTag getTagById(String widgetTagId) {
- return manager.find(JpaWidgetTag.class, widgetTagId);
+ return manager.find(JpaWidgetTag.class, Long.parseLong(widgetTagId));
}
@Override
@@ -410,7 +410,7 @@ public class JpaWidgetRepository impleme
@Override
public void deleteWidgetTag(WidgetTag tag) {
- manager.remove(tag instanceof JpaWidgetTag ? tag: manager.find(Tag.class, tag.getTagId()));
+ manager.remove(tag instanceof JpaWidgetTag ? tag: manager.find(Tag.class, Long.parseLong(tag.getTagId())));
}
// ***************************************************************************************************************
@@ -456,7 +456,7 @@ public class JpaWidgetRepository impleme
@Override
public WidgetRating getRatingById(String widgetId, String widgetRatingId) {
- return manager.find(JpaWidgetRating.class, widgetRatingId);
+ return manager.find(JpaWidgetRating.class, Long.parseLong(widgetRatingId));
}
@Override
Modified: rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java?rev=1435298&r1=1435297&r2=1435298&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java Fri Jan 18 18:35:08 2013
@@ -25,7 +25,6 @@ import org.apache.rave.portal.model.Regi
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.impl.RegionImpl;
import org.apache.rave.portal.repository.RegionRepository;
-import org.hamcrest.CoreMatchers;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +38,8 @@ import javax.persistence.PersistenceCont
import java.util.ArrayList;
import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
@Transactional
@RunWith(SpringJUnit4ClassRunner.class)
@@ -143,7 +143,7 @@ public class JpaRegionRepositoryTest {
Region saved = repository.save(region);
manager.flush();
- RegionWidget widget = manager.find(JpaRegionWidget.class, id);
+ RegionWidget widget = manager.find(JpaRegionWidget.class, Long.parseLong(id));
assertThat(saved.getRegionWidgets().size(), is(equalTo(1)));
assertThat(widget, is(nullValue()));