svn commit: r1445155 - in /rave/trunk/rave-components: rave-core/src/main/java/org/apache/rave/portal/model/ rave-core/src/main/java/org/apache/rave/portal/model/impl/ rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/

[mfranklin]

Author: mfranklin
Date: Tue Feb 12 13:05:13 2013
New Revision: 1445155

URL: http://svn.apache.org/r1445155
Log:
Added ID property to MediaLink RAVE-880

Modified:
    
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ActivityStreamsMediaLink.java
    
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsMediaLinkImpl.java
    
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaActivityStreamsMediaLinkConverter.java

Modified: 
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ActivityStreamsMediaLink.java
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ActivityStreamsMediaLink.java?rev=1445155&r1=1445154&r2=1445155&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ActivityStreamsMediaLink.java
 (original)
+++ 
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ActivityStreamsMediaLink.java
 Tue Feb 12 13:05:13 2013
@@ -35,6 +35,8 @@ public interface ActivityStreamsMediaLin
 
     public String getId();
 
+    void setId(String id);
+
     public Integer getWidth() ;
 
     public void setWidth(Integer width) ;
@@ -43,8 +45,7 @@ public interface ActivityStreamsMediaLin
 
     public String getUrl() ;
 
-
     public void setOpenSocial(HashMap social);
-    public HashMap getOpenSocial();
 
+    public HashMap getOpenSocial();
 }

Modified: 
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsMediaLinkImpl.java
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsMediaLinkImpl.java?rev=1445155&r1=1445154&r2=1445155&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsMediaLinkImpl.java
 (original)
+++ 
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsMediaLinkImpl.java
 Tue Feb 12 13:05:13 2013
@@ -55,6 +55,10 @@ public class ActivityStreamsMediaLinkImp
          return id;
      }
 
+    public void setId(String id) {
+        this.id=id;
+    }
+
        /** {@inheritDoc} */
 
          public Integer getDuration() {

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=1445155&r1=1445154&r2=1445155&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
 Tue Feb 12 13:05:13 2013
@@ -27,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;
 
 
@@ -37,6 +39,9 @@ public class JpaActivityStreamsMediaLink
 
     @Override
     public JpaActivityStreamsMediaLink convert(ActivityStreamsMediaLink 
source) {
+        if(source != null && source.getId() == null) {
+            source.setId(source.getUrl() == null ? 
UUID.randomUUID().toString() : source.getUrl());
+        }
         return source instanceof JpaActivityStreamsMediaLink ? 
(JpaActivityStreamsMediaLink) source : createEntity(source);
     }