Author: mfranklin
Date: Wed Jan 30 18:21:28 2013
New Revision: 1440576
URL: http://svn.apache.org/viewvc?rev=1440576&view=rev
Log:
Updated repository to separate EntityId from ObjectId RAVE-880
Removed:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/MultiFormatActivityService.java
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsItem.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsItem.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsItem.java?rev=1440576&r1=1440575&r2=1440576&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsItem.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsItem.java
Wed Jan 30 18:21:28 2013
@@ -1,6 +1,8 @@
package org.apache.rave.portal.model;
+import org.apache.rave.persistence.BasicEntity;
+
import javax.persistence.*;
import java.util.Date;
import java.util.HashMap;
@@ -11,12 +13,15 @@ import java.util.HashMap;
@Table(name = "activities")
@SequenceGenerator(name="activityEntrySequence", sequenceName =
"activity_entry_sequence")
@DiscriminatorValue("Item")
-public class JpaActivityStreamsItem implements ActivityStreamsItem {
+public class JpaActivityStreamsItem implements ActivityStreamsItem,
BasicEntity {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy=GenerationType.SEQUENCE, generator =
"activityEntrySequence")
+ private Long entityId;
+
+ @Basic
private String id;
@Basic
@@ -40,6 +45,14 @@ public class JpaActivityStreamsItem impl
@OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
private HashMap extensions;
+ public Long getEntityId() {
+ return entityId;
+ }
+
+ public void setEntityId(Long entityId) {
+ this.entityId = entityId;
+ }
+
public String getId() {
return id;
}
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=1440576&r1=1440575&r2=1440576&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 Jan 30 18:21:28 2013
@@ -33,6 +33,7 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
import java.util.List;
+import java.util.UUID;
@Repository
@@ -52,23 +53,29 @@ public class JpaActivityStreamsRepositor
@Transactional
public ActivityStreamsEntry save(ActivityStreamsEntry e) {
JpaActivityStreamsEntry entry = converter.convert(e);
+
if(entry.getUserId() == null && entry.getActor() != null) {
entry.setUserId(entry.getActor().getId());
}
- return JpaUtil.saveOrUpdate(entry.getId(), manager, entry);
+ if(entry.getId() == null) {
+ entry.setId(UUID.randomUUID().toString());
+ }
+ return JpaUtil.saveOrUpdate(entry.getId(), manager, entry);
}
- public List<ActivityStreamsEntry> getAll() {
- TypedQuery<JpaActivityStreamsEntry> query =
manager.createNamedQuery("JpaActivityStreamsEntry.findAll",
JpaActivityStreamsEntry.class);
+ public List<ActivityStreamsEntry> getAll() {
+ TypedQuery<JpaActivityStreamsEntry> query =
manager.createNamedQuery(JpaActivityStreamsEntry.FIND_ALL,
JpaActivityStreamsEntry.class);
return
CollectionUtils.<ActivityStreamsEntry>toBaseTypedList(query.getResultList());
}
public ActivityStreamsEntry get(String id) {
- return manager.find(JpaActivityStreamsEntry.class, id);
+ TypedQuery<JpaActivityStreamsEntry> query =
manager.createNamedQuery(JpaActivityStreamsEntry.FIND_BY_ID,
JpaActivityStreamsEntry.class);
+ query.setParameter("id", id);
+ return CollectionUtils.getSingleValue(query.getResultList());
}
public List<ActivityStreamsEntry> getByUserId(String id) {
- TypedQuery<JpaActivityStreamsEntry> query =
manager.createNamedQuery("JpaActivityStreamsEntry.findByUserId",
JpaActivityStreamsEntry.class);
+ TypedQuery<JpaActivityStreamsEntry> query =
manager.createNamedQuery(JpaActivityStreamsEntry.FIND_BY_USERID,
JpaActivityStreamsEntry.class);
query.setParameter("userId", id);
return
CollectionUtils.<ActivityStreamsEntry>toBaseTypedList(query.getResultList());
}
Modified:
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java?rev=1440576&r1=1440575&r2=1440576&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java
(original)
+++
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java
Wed Jan 30 18:21:28 2013
@@ -66,7 +66,6 @@ public class DefaultActivityStreamsServi
public Future<RestfulCollection<ActivityEntry>>
getActivityEntries(Set<UserId> userIds, GroupId groupId, String appId,
Set<String> fields, CollectionOptions options, SecurityToken token) {
List<ActivityEntry> result = getFromRepository(userIds, groupId,
appId, fields, options, token);
-
return ImmediateFuture.newInstance(new
RestfulCollection<ActivityEntry>(result));
}
@@ -249,8 +248,8 @@ public class DefaultActivityStreamsServi
ActivityStreamsEntryImpl activityEntity = converter.convert(activity);
- repository.save(activityEntity);
- return
ImmediateFuture.newInstance((ActivityEntry)converter.convert(activityEntity));
+ ActivityStreamsEntry saved = repository.save(activityEntity);
+ return
ImmediateFuture.newInstance((ActivityEntry)converter.convert(saved));
}
@@ -376,9 +375,4 @@ public class DefaultActivityStreamsServi
this.repository = repository;
}
-
-
-
-
-
}
