You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by do...@apache.org on 2008/05/09 14:24:11 UTC
svn commit: r654782 - in
/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial:
model/Activity.java util/BeanJsonConverter.java
Author: doll
Date: Fri May 9 05:24:11 2008
New Revision: 654782
URL: http://svn.apache.org/viewvc?rev=654782&view=rev
Log:
More BeanJsonConverter related fixes
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java?rev=654782&r1=654781&r2=654782&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Activity.java Fri May 9 05:24:11 2008
@@ -215,7 +215,6 @@
this.url = url;
}
- @Mandatory
public String getUserId() {
return userId;
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java?rev=654782&r1=654781&r2=654782&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanJsonConverter.java Fri May 9 05:24:11 2008
@@ -31,6 +31,7 @@
/**
* Converts pojos to json objects
+ * TODO: Replace with standard library
*/
public class BeanJsonConverter {
@@ -123,7 +124,9 @@
|| val instanceof Date
|| val instanceof Long
|| val instanceof Enum
- || val instanceof Float) {
+ || val instanceof Float
+ || val instanceof JSONObject
+ || val instanceof JSONArray) {
return val;
}