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:07:20 UTC
svn commit: r654775 - in /incubator/shindig/trunk:
java/social-api/src/main/java/org/apache/shindig/social/
java/social-api/src/main/java/org/apache/shindig/social/abdera/
java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/
java/s...
Author: doll
Date: Fri May 9 05:07:19 2008
New Revision: 654775
URL: http://svn.apache.org/viewvc?rev=654775&view=rev
Log:
Removed AbstractGadgetData in favor of the BeanJsonConverter (same code but the latter is not inheritance based). Also fixed small typo in SocialActivitiesWorld.
Removed:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/AbstractGadgetData.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/Mandatory.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/DataResponse.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RequestItem.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/ResponseItem.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java
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/model/Address.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ApiCollection.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
incubator/shindig/trunk/javascript/samplecontainer/examples/SocialActivitiesWorld.xml
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/DataResponse.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/DataResponse.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/DataResponse.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/DataResponse.java Fri May 9 05:07:19 2008
@@ -24,7 +24,7 @@
/**
* Represents the response object which gets passed as json to the gadget
*/
-public class DataResponse extends AbstractGadgetData {
+public class DataResponse {
private List<ResponseItem> responses;
private ResponseError error;
@@ -37,7 +37,6 @@
this.responses = responses;
}
- @Mandatory
public List<ResponseItem> getResponses() {
return responses;
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java Fri May 9 05:07:19 2008
@@ -17,11 +17,13 @@
*/
package org.apache.shindig.social;
-import com.google.inject.Inject;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.GadgetToken;
import org.apache.shindig.gadgets.GadgetTokenDecoder;
import org.apache.shindig.gadgets.http.InjectedServlet;
+import org.apache.shindig.social.opensocial.util.BeanJsonConverter;
+
+import com.google.inject.Inject;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -56,6 +58,7 @@
private List<GadgetDataHandler> handlers;
private GadgetTokenDecoder gadgetTokenDecoder;
+ private BeanJsonConverter beanJsonConverter;
@Inject
public void setGadgetDataHandlers(List<GadgetDataHandler> handlers) {
@@ -67,6 +70,11 @@
this.gadgetTokenDecoder = gadgetTokenDecoder;
}
+ @Inject
+ public void setBeanJsonConverter(BeanJsonConverter beanJsonConverter) {
+ this.beanJsonConverter = beanJsonConverter;
+ }
+
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp)
throws IOException {
@@ -86,7 +94,7 @@
}
resp.setContentType("application/json; charset=utf-8");
PrintWriter writer = resp.getWriter();
- writer.write(response.toJson().toString());
+ writer.write(beanJsonConverter.convertToJson(response).toString());
}
private List<ResponseItem> createResponse(String requestParam, String token)
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RequestItem.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RequestItem.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RequestItem.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RequestItem.java Fri May 9 05:07:19 2008
@@ -17,14 +17,15 @@
*/
package org.apache.shindig.social;
-import org.json.JSONObject;
import org.apache.shindig.gadgets.GadgetToken;
+import org.json.JSONObject;
+
/**
* Represents the request items that come from the json. Each RequestItem should
* map to one ResponseItem.
*/
-public class RequestItem extends AbstractGadgetData {
+public class RequestItem {
private String type;
private JSONObject params;
private GadgetToken token;
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/ResponseItem.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/ResponseItem.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/ResponseItem.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/ResponseItem.java Fri May 9 05:07:19 2008
@@ -21,7 +21,7 @@
* Represents the response items that get handed back as json within the
* DataResponse
*/
-public class ResponseItem<T> extends AbstractGadgetData {
+public class ResponseItem<T> {
private ResponseError error;
private String errorMessage;
@@ -55,7 +55,6 @@
this.errorMessage = errorMessage;
}
- @Mandatory
public T getResponse() {
return response;
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java Fri May 9 05:07:19 2008
@@ -17,11 +17,11 @@
*/
package org.apache.shindig.social.abdera;
-import org.apache.shindig.social.AbstractGadgetData;
+import org.apache.shindig.gadgets.GadgetToken;
import org.apache.shindig.social.opensocial.model.Activity;
import org.apache.shindig.social.opensocial.model.Person;
+import org.apache.shindig.social.opensocial.util.BeanJsonConverter;
import org.apache.shindig.social.opensocial.util.BeanXmlConverter;
-import org.apache.shindig.gadgets.GadgetToken;
import com.google.inject.Inject;
import org.apache.abdera.model.Entry;
@@ -38,7 +38,6 @@
/**
* handles logic to create feeds, entries etc.
- *
*/
@SuppressWarnings("unchecked")
public abstract class RestServerCollectionAdapter
@@ -46,7 +45,8 @@
private static Logger logger =
Logger.getLogger(RestServerCollectionAdapter.class.getName());
- private BeanXmlConverter beanXmlConverter;
+ private BeanXmlConverter beanXmlConverter;
+ private BeanJsonConverter beanJsonConverter;
private static final String INVALID_FORMAT =
"Invalid format. only atom/json-c are supported";
@@ -66,8 +66,11 @@
}
}
- @Inject public void setBeanXmlConverter(final BeanXmlConverter beanXmlConverter) {
+ @Inject
+ public void setConverters(BeanXmlConverter beanXmlConverter,
+ BeanJsonConverter beanJsonConverter) {
this.beanXmlConverter = beanXmlConverter;
+ this.beanJsonConverter = beanJsonConverter;
}
protected ResponseContext returnFeed(RequestContext request, String title,
@@ -99,11 +102,11 @@
String entryId = null;
Date updated = null;
if (obj instanceof Person) {
- entryId = request.getUri().toString() + "/" + ((Person)obj).getId();
- updated = ((Person)obj).getUpdated();
+ entryId = request.getUri().toString() + "/" + ((Person) obj).getId();
+ updated = ((Person) obj).getUpdated();
} else if (obj instanceof Activity) {
- entryId = request.getUri().toString() + "/" + ((Activity)obj).getId();
- updated = ((Activity)obj).getUpdated();
+ entryId = request.getUri().toString() + "/" + ((Activity) obj).getId();
+ updated = ((Activity) obj).getUpdated();
}
Entry entry = fillEntry(request, obj, entryId, updated, format);
feed.insertEntry(entry);
@@ -124,10 +127,10 @@
entry.addAuthor("Author TODO");
// TODO what should this be?
if (obj instanceof Person) {
- entry.setTitle((((Person)obj).getName().getUnstructured() != null) ?
- ((Person)obj).getName().getUnstructured() : "title TODO");
+ entry.setTitle((((Person) obj).getName().getUnstructured() != null) ?
+ ((Person) obj).getName().getUnstructured() : "title TODO");
} else if (obj instanceof Activity) {
- entry.setTitle(((Activity)obj).getTitle());
+ entry.setTitle(((Activity) obj).getTitle());
} else {
entry.setTitle("title TODO");
}
@@ -138,7 +141,7 @@
"application/xml");
break;
case JSON:
- entry.setContent(((AbstractGadgetData)obj).toJson().toString(),
+ entry.setContent(beanJsonConverter.convertToJson(obj).toString(),
"application/json");
break;
}
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=654775&r1=654774&r2=654775&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:07:19 2008
@@ -17,14 +17,11 @@
*/
package org.apache.shindig.social.opensocial.model;
-import org.apache.shindig.social.Mandatory;
-import org.apache.shindig.social.AbstractGadgetData;
-
-import java.util.Map;
-import java.util.List;
import java.util.Date;
+import java.util.List;
+import java.util.Map;
-public class Activity extends AbstractGadgetData {
+public class Activity {
public static enum Field {
APP_ID("appId"),
@@ -114,7 +111,6 @@
this.externalId = externalId;
}
- @Mandatory
public String getId() {
return id;
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java Fri May 9 05:07:19 2008
@@ -17,14 +17,12 @@
*/
package org.apache.shindig.social.opensocial.model;
-import org.apache.shindig.social.AbstractGadgetData;
-
/**
* see
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Address.Field.html
*
*/
-public class Address extends AbstractGadgetData {
+public class Address {
public static enum Field {
COUNTRY("country"),
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ApiCollection.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ApiCollection.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ApiCollection.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ApiCollection.java Fri May 9 05:07:19 2008
@@ -17,15 +17,13 @@
*/
package org.apache.shindig.social.opensocial.model;
-import org.apache.shindig.social.AbstractGadgetData;
-
import java.util.List;
/**
* see
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Collection.html
*/
-public class ApiCollection<T> extends AbstractGadgetData {
+public class ApiCollection<T> {
private List<T> items;
private int offset;
private int totalSize;
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/BodyType.java Fri May 9 05:07:19 2008
@@ -17,14 +17,12 @@
*/
package org.apache.shindig.social.opensocial.model;
-import org.apache.shindig.social.AbstractGadgetData;
-
/**
* see
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.BodyType.Field.html
*
*/
-public class BodyType extends AbstractGadgetData {
+public class BodyType {
public static enum Field {
BUILD("build"),
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Email.java Fri May 9 05:07:19 2008
@@ -17,14 +17,12 @@
*/
package org.apache.shindig.social.opensocial.model;
-import org.apache.shindig.social.AbstractGadgetData;
-
/**
* see
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Email.Field.html
*
*/
-public class Email extends AbstractGadgetData {
+public class Email {
public static enum Field {
ADDRESS("address"),
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Enum.java Fri May 9 05:07:19 2008
@@ -17,10 +17,6 @@
*/
package org.apache.shindig.social.opensocial.model;
-import org.apache.shindig.social.AbstractGadgetData;
-import org.apache.shindig.social.Mandatory;
-
-
/**
* see
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Enum.html
@@ -29,12 +25,11 @@
* for fields that have a common set of values.
*
*/
-public final class Enum<E extends Enum.EnumKey> extends AbstractGadgetData {
+public final class Enum<E extends Enum.EnumKey> {
private String displayValue;
private E key = null;
public interface EnumKey {
- @Mandatory
String getDisplayValue();
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaItem.java Fri May 9 05:07:19 2008
@@ -17,14 +17,12 @@
*/
package org.apache.shindig.social.opensocial.model;
-import org.apache.shindig.social.AbstractGadgetData;
-
/**
* see
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Activity.MediaItem.Field.html
*
*/
-public class MediaItem extends AbstractGadgetData {
+public class MediaItem {
public static enum Field {
MIME_TYPE("mimeType"),
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Message.java Fri May 9 05:07:19 2008
@@ -17,8 +17,6 @@
*/
package org.apache.shindig.social.opensocial.model;
-import org.apache.shindig.social.AbstractGadgetData;
-
/**
*
* Base interface for all message objects.
@@ -27,7 +25,7 @@
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Message.html
*
*/
-public final class Message extends AbstractGadgetData {
+public final class Message {
public static enum Field {
BODY("body"),
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Name.java Fri May 9 05:07:19 2008
@@ -17,14 +17,12 @@
*/
package org.apache.shindig.social.opensocial.model;
-import org.apache.shindig.social.AbstractGadgetData;
-
/**
* see
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Name.Field.html
*
*/
-public class Name extends AbstractGadgetData {
+public class Name {
public static enum Field {
ADDITIONAL_NAME("additionalName"),
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Organization.java Fri May 9 05:07:19 2008
@@ -17,8 +17,6 @@
*/
package org.apache.shindig.social.opensocial.model;
-import org.apache.shindig.social.AbstractGadgetData;
-
import java.util.Date;
/**
@@ -26,7 +24,7 @@
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Organization.Field.html
*
*/
-public class Organization extends AbstractGadgetData {
+public class Organization {
public static enum Field {
ADDRESS("address"),
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java Fri May 9 05:07:19 2008
@@ -17,9 +17,6 @@
*/
package org.apache.shindig.social.opensocial.model;
-import org.apache.shindig.social.AbstractGadgetData;
-import org.apache.shindig.social.Mandatory;
-
import java.util.Date;
import java.util.List;
@@ -28,7 +25,7 @@
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Person.Field.html
*
*/
-public class Person extends AbstractGadgetData {
+public class Person {
public static enum Field {
ABOUT_ME("aboutMe"),
@@ -314,7 +311,6 @@
this.humor = humor;
}
- @Mandatory
public String getId() {
return id;
}
@@ -395,7 +391,6 @@
this.music = music;
}
- @Mandatory
public Name getName() {
return name;
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Phone.java Fri May 9 05:07:19 2008
@@ -17,15 +17,12 @@
*/
package org.apache.shindig.social.opensocial.model;
-import org.apache.shindig.social.AbstractGadgetData;
-import org.apache.shindig.social.Mandatory;
-
/**
* see
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Phone.Field.html
*
*/
-public class Phone extends AbstractGadgetData {
+public class Phone {
public static enum Field {
NUMBER("number"),
@@ -52,7 +49,6 @@
this.type = type;
}
- @Mandatory
public String getNumber() {
return number;
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Url.java Fri May 9 05:07:19 2008
@@ -17,13 +17,11 @@
*/
package org.apache.shindig.social.opensocial.model;
-import org.apache.shindig.social.AbstractGadgetData;
-
/**
* see
* http://code.google.com/apis/opensocial/docs/0.7/reference/opensocial.Url.Field.html
*/
-public class Url extends AbstractGadgetData {
+public class Url {
public static enum Field {
ADDRESS("address"),
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java Fri May 9 05:07:19 2008
@@ -164,16 +164,4 @@
assertEquals("2", jsonMap.getJSONObject("item2").getString("value"));
}
- public void testMandatoryFields() throws Exception {
- Person noIdMan = new Person(null, new Name("noIdMan"));
- try {
- noIdMan.toJson();
- fail("Expected a person without an id to throw an exception");
- } catch (Exception e) {
- // The exception should be thrown
- assertEquals("id is a mandory value, it should not be null",
- e.getMessage());
- }
- }
-
}
Modified: incubator/shindig/trunk/javascript/samplecontainer/examples/SocialActivitiesWorld.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/javascript/samplecontainer/examples/SocialActivitiesWorld.xml?rev=654775&r1=654774&r2=654775&view=diff
==============================================================================
--- incubator/shindig/trunk/javascript/samplecontainer/examples/SocialActivitiesWorld.xml (original)
+++ incubator/shindig/trunk/javascript/samplecontainer/examples/SocialActivitiesWorld.xml Fri May 9 05:07:19 2008
@@ -153,7 +153,7 @@
var mediaItems = activities[i].getField('mediaItems');
if (mediaItems) {
for (var j = 0; j < mediaItems.length; j++) {
- if (mediaItems[j].getField('type') == 'IMAGE') {
+ if (mediaItems[j].getField('type') == 'image') {
html += '<img height="150px" style="padding-right:.5em;" src="' + mediaItems[j].getField('url') + '"/>';
}
}