Author: mfranklin
Date: Wed Feb 6 15:50:49 2013
New Revision: 1443028
URL: http://svn.apache.org/viewvc?rev=1443028&view=rev
Log:
Fixed conversion issues RAVE-880
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsEntryConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsMediaLinkConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsObjectConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsEntryConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsEntryConverter.java?rev=1443028&r1=1443027&r2=1443028&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsEntryConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsEntryConverter.java
Wed Feb 6 15:50:49 2013
@@ -20,7 +20,6 @@ package org.apache.rave.portal.model.con
import org.apache.rave.model.ModelConverter;
import org.apache.rave.portal.model.ActivityStreamsEntry;
-
import org.apache.rave.portal.model.JpaActivityStreamsEntry;
import org.springframework.stereotype.Component;
@@ -28,6 +27,8 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
+import java.util.UUID;
+
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
@@ -38,6 +39,9 @@ public class JpaActivityStreamsEntryConv
@Override
public JpaActivityStreamsEntry convert(ActivityStreamsEntry source) {
+ if(source != null && source.getId() == null) {
+ source.setId(UUID.randomUUID().toString());
+ }
return source instanceof JpaActivityStreamsEntry ?
(JpaActivityStreamsEntry) source : createEntity(source);
}
@@ -62,6 +66,7 @@ public class JpaActivityStreamsEntryConv
}
private void updateProperties(ActivityStreamsEntry source,
JpaActivityStreamsEntry converted) {
+ converted.setId(source.getId());
converted.setActor(source.getActor());
converted.setOpenSocial(source.getOpenSocial());
converted.setObject(source.getObject());
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsMediaLinkConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsMediaLinkConverter.java?rev=1443028&r1=1443027&r2=1443028&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsMediaLinkConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsMediaLinkConverter.java
Wed Feb 6 15:50:49 2013
@@ -20,7 +20,6 @@ package org.apache.rave.portal.model.con
import org.apache.rave.model.ModelConverter;
import org.apache.rave.portal.model.ActivityStreamsMediaLink;
-
import org.apache.rave.portal.model.JpaActivityStreamsMediaLink;
import org.springframework.stereotype.Component;
@@ -62,8 +61,7 @@ public class JpaActivityStreamsMediaLink
}
private void updateProperties(ActivityStreamsMediaLink source,
JpaActivityStreamsMediaLink converted) {
-
- converted.setDuration(source.getDuration());
+ converted.setDuration(source.getDuration());
converted.setHeight(source.getHeight());
converted.setWidth(source.getWidth());
converted.setUrl(source.getUrl());
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsObjectConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsObjectConverter.java?rev=1443028&r1=1443027&r2=1443028&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsObjectConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsObjectConverter.java
Wed Feb 6 15:50:49 2013
@@ -20,7 +20,6 @@ package org.apache.rave.portal.model.con
import org.apache.rave.model.ModelConverter;
import org.apache.rave.portal.model.ActivityStreamsObject;
-
import org.apache.rave.portal.model.JpaActivityStreamsObject;
import org.springframework.stereotype.Component;
@@ -28,6 +27,8 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
+import java.util.UUID;
+
import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
@@ -38,6 +39,9 @@ public class JpaActivityStreamsObjectCon
@Override
public JpaActivityStreamsObject convert(ActivityStreamsObject source) {
+ if(source != null && source.getId() == null) {
+ source.setId(UUID.randomUUID().toString());
+ }
return source instanceof JpaActivityStreamsObject ?
(JpaActivityStreamsObject) source : createEntity(source);
}
@@ -62,9 +66,8 @@ public class JpaActivityStreamsObjectCon
}
private void updateProperties(ActivityStreamsObject source,
JpaActivityStreamsObject converted) {
-
+ converted.setId(source.getId());
converted.setOpenSocial(source.getOpenSocial());
-
converted.setObjectType(source.getObjectType());
converted.setExtensions(source.getExtensions());
converted.setDisplayName(source.getDisplayName());
@@ -91,30 +94,19 @@ public class JpaActivityStreamsObjectCon
converted.setReplies(source.getReplies());
converted.setContent(source.getContent());
converted.setDc(source.getDc());
-
converted.setGeojson(source.getGeojson());
-
converted.setLd(source.getLd());
converted.setLinks(source.getLinks());
converted.setEndTime(source.getEndTime());
converted.setLocation(source.getLocation());
converted.setMood(source.getMood());
converted.setOdata(source.getOdata());
-
converted.setPublished(source.getPublished());
-
converted.setOpengraph(source.getOpengraph());
-
converted.setRating(source.getRating());
-
converted.setSchema_org(source.getSchema_org());
converted.setSource(source.getSource());
-
-
converted.setUpdated(source.getUpdated());
-
converted.setUrl(source.getUrl());
-
-
}
}
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java?rev=1443028&r1=1443027&r2=1443028&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java
Wed Feb 6 15:50:49 2013
@@ -33,7 +33,6 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
import java.util.List;
-import java.util.UUID;
@Repository
@@ -57,9 +56,6 @@ public class JpaActivityStreamsRepositor
if(entry.getUserId() == null && entry.getActor() != null) {
entry.setUserId(entry.getActor().getId());
}
- if(entry.getId() == null) {
- entry.setId(UUID.randomUUID().toString());
- }
return JpaUtil.saveOrUpdate(entry.getId(), manager, entry);
}
