You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/05/27 10:33:25 UTC
svn commit: r948726 - in /shindig/trunk: ./
java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/
java/social-api/src/main/java/org/apache/shindig/social/core/model/
java/social-api/src/main/java/org/apache/shindig/social/opensocial/mode...
Author: lindner
Date: Thu May 27 08:33:25 2010
New Revision: 948726
URL: http://svn.apache.org/viewvc?rev=948726&view=rev
Log:
SHINDIG-1345 | Patch from Henry Saputra | Fix location attribute of the MediaItem model as opensocial.Address instead of String
Modified:
shindig/trunk/UPGRADING
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/MediaItemDb.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java
Modified: shindig/trunk/UPGRADING
URL: http://svn.apache.org/viewvc/shindig/trunk/UPGRADING?rev=948726&r1=948725&r2=948726&view=diff
==============================================================================
--- shindig/trunk/UPGRADING (original)
+++ shindig/trunk/UPGRADING Thu May 27 08:33:25 2010
@@ -65,6 +65,9 @@ provision for reading "original" HttpRes
ImageRewriters may be migrated to ResponseRewriters as well by mutating the builder,
where previously a new HttpResponse was returned.
+* MediaItem
+
+Location field changed from String to Address.
== Java Guice Changes ==
Modified: shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/MediaItemDb.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/MediaItemDb.java?rev=948726&r1=948725&r2=948726&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/MediaItemDb.java (original)
+++ shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/MediaItemDb.java Thu May 27 08:33:25 2010
@@ -22,6 +22,7 @@ import static javax.persistence.Generati
import org.apache.shindig.social.opensocial.jpa.api.DbObject;
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.MediaItem;
+import org.apache.shindig.social.opensocial.model.Address;
import javax.persistence.Basic;
import javax.persistence.Column;
@@ -186,9 +187,9 @@ public class MediaItemDb implements Medi
* model field.
* @see org.apache.shindig.social.opensocial.model.MediaItem
*/
- @Basic
- @Column(name = "location")
- private String location;
+ @ManyToOne(targetEntity = AddressDb.class, cascade = { PERSIST, MERGE, REFRESH })
+ @JoinColumn(name = "address_id", referencedColumnName = "oid")
+ private Address location;
/**
* model field.
@@ -442,14 +443,14 @@ public class MediaItemDb implements Medi
/**
* {@inheritDoc}
*/
- public String getLocation() {
+ public Address getLocation() {
return location;
}
/**
* {@inheritDoc}
*/
- public void setLocation(String location) {
+ public void setLocation(Address location) {
this.location = location;
}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java?rev=948726&r1=948725&r2=948726&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/model/MediaItemImpl.java Thu May 27 08:33:25 2010
@@ -17,6 +17,7 @@
*/
package org.apache.shindig.social.core.model;
+import org.apache.shindig.social.opensocial.model.Address;
import org.apache.shindig.social.opensocial.model.MediaItem;
/**
@@ -34,7 +35,7 @@ public class MediaItemImpl implements Me
private String id;
private String language;
private String lastUpdated;
- private String location;
+ private Address location;
private String mimeType;
private String numComments;
private String numViews;
@@ -153,11 +154,11 @@ public class MediaItemImpl implements Me
this.lastUpdated = lastUpdated;
}
- public String getLocation() {
+ public Address getLocation() {
return location;
}
- public void setLocation(String location) {
+ public void setLocation(Address location) {
this.location = location;
}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java?rev=948726&r1=948725&r2=948726&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java Thu May 27 08:33:25 2010
@@ -257,13 +257,13 @@ public interface MediaItem {
* Get the location corresponding to the media item
* @return location
*/
- String getLocation();
+ Address getLocation();
/**
* Set the location corresponding to the media item
* @param location
*/
- void setLocation(String location);
+ void setLocation(Address location);
/**
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java?rev=948726&r1=948725&r2=948726&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java Thu May 27 08:33:25 2010
@@ -77,7 +77,7 @@ public class BeanXStreamAtomConverterTes
mediaItem.setMimeType("image/jpg");
mediaItem.setType(MediaItem.Type.IMAGE);
mediaItem.setUrl("http://foo.bar");
- mediaItem.setLocation("CA");
+ mediaItem.setLocation(new AddressImpl("Foo bar address"));
mediaItem.setNumViews("10000");
activity.setMediaItems(Lists.<MediaItem> newArrayList(mediaItem));
@@ -236,7 +236,9 @@ public class BeanXStreamAtomConverterTes
+ " <mimeType>image/jpg</mimeType>"
+ " <type>IMAGE</type>"
+ " <url>http://foo.bar</url>"
- + " <location>CA</location>"
+ + " <location>"
+ + " <formatted>Foo bar address</formatted>"
+ + " </location>"
+ " <numViews>10000</numViews>"
+ " </mediaItems>"
+ " <url>http://foo.com</url>"
@@ -248,7 +250,9 @@ public class BeanXStreamAtomConverterTes
+ " <mimeType>image/jpg</mimeType>"
+ " <type>IMAGE</type>"
+ " <url>http://foo.bar</url>"
- + " <location>CA</location>"
+ + " <location>"
+ + " <formatted>Foo bar address</formatted>"
+ + " </location>"
+ " <numViews>10000</numViews>"
+ " </mediaItems>"
+ " <url>http://foo.com</url>"
@@ -260,7 +264,9 @@ public class BeanXStreamAtomConverterTes
+ " <mimeType>image/jpg</mimeType>"
+ " <type>IMAGE</type>"
+ " <url>http://foo.bar</url>"
- + " <location>CA</location>"
+ + " <location>"
+ + " <formatted>Foo bar address</formatted>"
+ + " </location>"
+ " <numViews>10000</numViews>"
+ " </mediaItems>"
+ " <url>http://foo.com</url>"