You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by ss...@apache.org on 2012/02/27 00:43:33 UTC
svn commit: r1293966 [12/12] - in /shindig/trunk:
extras/src/main/java/org/apache/shindig/extras/
java/common/src/main/java/org/apache/shindig/auth/
java/common/src/main/java/org/apache/shindig/common/
java/common/src/main/java/org/apache/shindig/commo...
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityEntry.java Sun Feb 26 23:43:20 2012
@@ -31,7 +31,7 @@ import com.google.inject.ImplementedBy;
@ImplementedBy(ActivityEntryImpl.class)
@Exportablebean
public interface ActivityEntry extends Comparable<ActivityEntry>, ExtendableBean {
-
+
/**
* Fields that represent the JSON elements.
*/
@@ -50,29 +50,29 @@ public interface ActivityEntry extends C
URL("url"),
VERB("verb"),
OPENSOCIAL("openSocial");
-
+
// The name of the JSON element
private final String jsonString;
-
+
/**
* Constructs the field base for the JSON element.
- *
+ *
* @param jsonString the name of the element
*/
private Field(String jsonString) {
this.jsonString = jsonString;
}
-
+
/**
* Returns the name of the JSON element.
- *
+ *
* @return String the name of the JSON element
*/
public String toString() {
return jsonString;
}
}
-
+
/**
* <p>getActor</p>
*
@@ -100,7 +100,7 @@ public interface ActivityEntry extends C
* @param content a {@link java.lang.String} object.
*/
void setContent(String content);
-
+
/**
* <p>getGenerator</p>
*
@@ -114,7 +114,7 @@ public interface ActivityEntry extends C
* @param generator a {@link org.apache.shindig.social.opensocial.model.ActivityObject} object.
*/
void setGenerator(ActivityObject generator);
-
+
/**
* <p>getIcon</p>
*
@@ -128,7 +128,7 @@ public interface ActivityEntry extends C
* @param icon a {@link org.apache.shindig.extras.as.opensocial.model.MediaLink} object.
*/
void setIcon(MediaLink icon);
-
+
/**
* <p>getId</p>
*
@@ -170,7 +170,7 @@ public interface ActivityEntry extends C
* @param published a {@link java.lang.String} object.
*/
void setPublished(String published);
-
+
/**
* <p>getProvider</p>
*
@@ -184,14 +184,14 @@ public interface ActivityEntry extends C
* @param provider a {@link org.apache.shindig.social.opensocial.model.ActivityObject} object.
*/
void setProvider(ActivityObject provider);
-
+
/**
* <p>getTarget</p>
*
* @return a {@link org.apache.shindig.social.opensocial.model.ActivityObject} object.
*/
ActivityObject getTarget();
-
+
/**
* <p>setTarget</p>
*
@@ -212,7 +212,7 @@ public interface ActivityEntry extends C
* @param title a {@link java.lang.String} object.
*/
void setTitle(String title);
-
+
/**
* <p>getUpdated</p>
*
@@ -226,7 +226,7 @@ public interface ActivityEntry extends C
* @param updated a {@link java.lang.String} object.
*/
void setUpdated(String updated);
-
+
/**
* <p>getUrl</p>
*
@@ -254,31 +254,31 @@ public interface ActivityEntry extends C
* @param verb a {@link java.lang.String} object.
*/
void setVerb(String verb);
-
+
/**
* <p>getOpenSocial</p>
- *
+ *
* @return a {@link org.apache.shindig.protocol.model.ExtendableBean} object
*/
ExtendableBean getOpenSocial();
-
+
/**
* <p>setOpenSocial</p>
- *
+ *
* @return a {@link org.apache.shindig.protocol.model.ExtendableBean} object
*/
void setOpenSocial(ExtendableBean opensocial);
-
+
/**
* <p>getExtensions</p>
- *
+ *
* @return a {@link org.apache.shindig.protocol.model.ExtendableBean} object
*/
ExtendableBean getExtensions();
-
+
/**
* <p>setOpenSocial</p>
- *
+ *
* @return a {@link org.apache.shindig.protocol.model.ExtendableBean} object
*/
void setExtensions(ExtendableBean extensions);
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityObject.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityObject.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityObject.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ActivityObject.java Sun Feb 26 23:43:20 2012
@@ -28,7 +28,7 @@ import com.google.inject.ImplementedBy;
/**
* A representation of an Activity's object.
- *
+ *
* Note that an Activity's object may contain fields from an Activity when
* the objectType is of type 'activity'. As such, ActivityObject becomes
* a superset of Activity. Refer to the Activity Streams spec.
@@ -36,7 +36,7 @@ import com.google.inject.ImplementedBy;
@ImplementedBy(ActivityObjectImpl.class)
@Exportablebean
public interface ActivityObject extends ExtendableBean {
-
+
/**
* Fields that represent the JSON elements.
*/
@@ -56,22 +56,22 @@ public interface ActivityObject extends
UPSTREAM_DUPLICATES("upstreamDuplicates"),
URL("url"),
OPENSOCIAL("openSocial");
-
+
// The name of the JSON element
private final String jsonString;
-
+
/**
* Constructs the field base for the JSON element.
- *
+ *
* @param jsonString the name of the element
*/
private Field(String jsonString) {
this.jsonString = jsonString;
}
-
+
/**
* Returns the name of the JSON element.
- *
+ *
* @return String the name of the JSON element
*/
public String toString() {
@@ -106,7 +106,7 @@ public interface ActivityObject extends
* @param author a {@link org.apache.shindig.social.opensocial.model.ActivityObject} object
*/
void setAuthor(ActivityObject author);
-
+
/**
* <p>getContent</p>
*
@@ -148,7 +148,7 @@ public interface ActivityObject extends
* @param downstreamDuplicates a list of {@link java.lang.String} objects
*/
void setDownstreamDuplicates(List<String> downstreamDuplicates);
-
+
/**
* <p>getId</p>
*
@@ -190,7 +190,7 @@ public interface ActivityObject extends
* @param objectType a {@link java.lang.String} object
*/
void setObjectType(String objectType);
-
+
/**
* <p>getPublished</p>
*
@@ -218,7 +218,7 @@ public interface ActivityObject extends
* @param summary a {@link java.lang.String} object
*/
void setSummary(String summary);
-
+
/**
* <p>getUpdated</p>
*
@@ -246,7 +246,7 @@ public interface ActivityObject extends
* @param upstreamDuplicates a list of {@link java.lang.String} objects
*/
void setUpstreamDuplicates(List<String> upstreamDuplicates);
-
+
/**
* <p>getUrl</p>
*
@@ -260,17 +260,17 @@ public interface ActivityObject extends
* @param url a {@link java.lang.String} object.
*/
void setUrl(String url);
-
+
/**
* <p>getOpenSocial</p>
- *
+ *
* @return a {@link org.apache.shindig.protocol.model.ExtendableBean} object
*/
ExtendableBean getOpenSocial();
-
+
/**
* <p>setOpenSocial</p>
- *
+ *
* @return a {@link org.apache.shindig.protocol.model.ExtendableBean} object
*/
void setOpenSocial(ExtendableBean opensocial);
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java Sun Feb 26 23:43:20 2012
@@ -62,7 +62,7 @@ public interface Address {
/** the field name for primary. */
PRIMARY("primary");
- private static final Map<String, Field> LOOKUP = Maps.uniqueIndex(EnumSet.allOf(Field.class),
+ private static final Map<String, Field> LOOKUP = Maps.uniqueIndex(EnumSet.allOf(Field.class),
Functions.toStringFunction());
/**
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EmbeddedExperience.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EmbeddedExperience.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EmbeddedExperience.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EmbeddedExperience.java Sun Feb 26 23:43:20 2012
@@ -25,7 +25,7 @@ import com.google.inject.ImplementedBy;
/**
* Represents an embedded experience that may be inlined.
- *
+ *
*/
@ImplementedBy(EmbeddedExperienceImpl.class)
@Exportablebean
@@ -44,7 +44,7 @@ public interface EmbeddedExperience {
/**
* Constructs the field base for the JSON element.
- *
+ *
* @param jsonString
* the name of the element
*/
@@ -54,7 +54,7 @@ public interface EmbeddedExperience {
/**
* Returns the name of the JSON element.
- *
+ *
* @return String the name of the JSON element
*/
public String toString() {
@@ -64,14 +64,14 @@ public interface EmbeddedExperience {
/**
* Gets the URL to the gadget definition for this embedded experience
- *
+ *
* @return the URL to the gadget definintion for this embedded experience
*/
String getGadget();
/**
* Sets the URL to the gadget definition for this embedded experience
- *
+ *
* @param gadget
* the URL to the gadget definition for this embedded experience
*/
@@ -79,14 +79,14 @@ public interface EmbeddedExperience {
/**
* Gets the contextual data for this embedded experience
- *
+ *
* @return the contextual data for this embedded experience
*/
Object getContext();
/**
* Sets the contextual data for the embedded experience
- *
+ *
* @param context
* the contextual data for this embedded experience
*/
@@ -95,7 +95,7 @@ public interface EmbeddedExperience {
/**
* Gets the URL to an image that may act as a preview for this embedded
* experience
- *
+ *
* @return the URL to an image that may act as a preview for this embedded
* experiece
*/
@@ -104,7 +104,7 @@ public interface EmbeddedExperience {
/**
* Set the URL to an image that may act as a preview for this embedded
* experience
- *
+ *
* @param previewImage
* the URL to an image that may act as a preview for this embedded
* experience
@@ -113,14 +113,14 @@ public interface EmbeddedExperience {
/**
* Gets the URL that may be used as an embedded experience
- *
+ *
* @return the URL that may be used as an embedded experience
*/
String getUrl();
/**
* Sets the URL that may be used as an embedded experience
- *
+ *
* @param url
* the URL that may be used as an embedded experience
*/
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=1293966&r1=1293965&r2=1293966&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 Sun Feb 26 23:43:20 2012
@@ -218,7 +218,7 @@ public interface MediaItem {
void setFileSize(String fileSize);
/**
- * Get the MediaItem's id
+ * Get the MediaItem's id
* @return id
*/
String getId();
@@ -248,7 +248,7 @@ public interface MediaItem {
String getLastUpdated();
/**
- * Set the update time associated with the media item
+ * Set the update time associated with the media item
* @param lastUpdated
*/
void setLastUpdated(String lastUpdated);
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaLink.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaLink.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaLink.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/MediaLink.java Sun Feb 26 23:43:20 2012
@@ -39,29 +39,29 @@ public interface MediaLink extends Exten
URL("url"),
WIDTH("width"),
OPENSOCIAL("openSocial");
-
+
// The name of the JSON element
private final String jsonString;
-
+
/**
* Constructs the field base for the JSON element.
- *
+ *
* @param jsonString the name of the element
*/
private Field(String jsonString) {
this.jsonString = jsonString;
}
-
+
/**
* Returns the name of the JSON element.
- *
+ *
* @return String the name of the JSON element
*/
public String toString() {
return jsonString;
}
}
-
+
/**
* Returns the duration of this media.
*
@@ -117,17 +117,17 @@ public interface MediaLink extends Exten
* @param width is the target's width
*/
void setWidth(Integer width);
-
+
/**
* <p>getOpenSocial</p>
- *
+ *
* @return a {@link org.apache.shindig.protocol.model.ExtendableBean} object
*/
ExtendableBean getOpenSocial();
-
+
/**
* <p>setOpenSocial</p>
- *
+ *
* @return a {@link org.apache.shindig.protocol.model.ExtendableBean} object
*/
void setOpenSocial(ExtendableBean opensocial);
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Person.java Sun Feb 26 23:43:20 2012
@@ -209,7 +209,7 @@ public interface Person {
* a Map to convert json string to Field representations.
*/
- private static final Map<String,Field> LOOKUP = Maps.uniqueIndex(EnumSet.allOf(Field.class),
+ private static final Map<String,Field> LOOKUP = Maps.uniqueIndex(EnumSet.allOf(Field.class),
Functions.toStringFunction());
/**
@@ -339,15 +339,15 @@ public interface Person {
/**
* Get app data for the person.
- *
+ *
* @return the app data, possibly a subset.
*/
Map<String, ?> getAppData();
-
+
/**
* Sets app data for the person.
- *
- * @param appData the app data, possibly a subset
+ *
+ * @param appData the app data, possibly a subset
*/
void setAppData(Map<String, ?> appData);
@@ -891,17 +891,17 @@ public interface Person {
* @param politicalViews the Person's political views
*/
void setPoliticalViews(String politicalViews);
-
+
/**
* Get the Person's preferred username, specified as a string. Container support for this field is OPTIONAL
- *
+ *
* @return the Person's preferred username
*/
String getPreferredUsername();
-
+
/**
* Set the Person's preferred username, specified as a string. Container support for this field is OPTIONAL
- *
+ *
* @param preferredString the Person's preferred username
*/
void setPreferredUsername(String preferredString);
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java Sun Feb 26 23:43:20 2012
@@ -106,14 +106,14 @@ public interface OAuthDataStore {
/**
* Mark a token DISABLED and store it.
- *
+ *
* @param entry A valid OAuthEntry
*/
void disableToken(OAuthEntry entry);
/**
* Remove a token
- *
+ *
* @param entry A valid OAuthEntry
*/
void removeToken(OAuthEntry entry);
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandler.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandler.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandler.java Sun Feb 26 23:43:20 2012
@@ -77,7 +77,7 @@ public class ActivityStreamHandler {
HandlerPreconditions.requireNotEmpty(userIds, "No userId specified");
HandlerPreconditions.requireSingular(userIds, "Multiple userIds not supported");
HandlerPreconditions.requireNotEmpty(activityIds, "At least one activity ID must be specified");
-
+
return service.deleteActivityEntries(Iterables.getOnlyElement(userIds), request.getGroup(),
request.getAppId(), activityIds, request.getToken());
}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MessageHandler.java Sun Feb 26 23:43:20 2012
@@ -62,7 +62,7 @@ public class MessageHandler {
throw new ProtocolException(HttpServletResponse.SC_BAD_REQUEST,
"A message collection is required");
}
-
+
HandlerPreconditions.requireNotEmpty(messageIds, "No message IDs specified");
UserId user = request.getUsers().iterator().next();
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java Sun Feb 26 23:43:20 2012
@@ -42,7 +42,7 @@ public class SocialRequestItem extends B
private static final String USER_ID = "userId";
private static final String GROUP_ID = "groupId";
- public SocialRequestItem(Map<String, String[]> parameters,
+ public SocialRequestItem(Map<String, String[]> parameters,
SecurityToken token, BeanConverter converter, BeanJsonConverter jsonConverter) {
super(parameters, token, converter, jsonConverter);
}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityStreamService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityStreamService.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityStreamService.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/ActivityStreamService.java Sun Feb 26 23:43:20 2012
@@ -96,10 +96,10 @@ public interface ActivityStreamService {
*/
Future<Void> deleteActivityEntries(UserId userId, GroupId groupId, String appId,
Set<String> activityIds, SecurityToken token) throws ProtocolException;
-
+
/**
* Updates the specified Activity.
- *
+ *
* @param userId The id of the person to update the activity for
* @param groupId The group
* @param appId The app id
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java Sun Feb 26 23:43:20 2012
@@ -165,7 +165,7 @@ public class CollectionOptions {
if (o == this) {
return true;
}
-
+
if (!(o instanceof CollectionOptions)) {
return false;
}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java Sun Feb 26 23:43:20 2012
@@ -82,7 +82,7 @@ public class GroupId {
if (o == this) {
return true;
}
-
+
if (!(o instanceof GroupId)) {
return false;
}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupService.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupService.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupService.java Sun Feb 26 23:43:20 2012
@@ -28,7 +28,7 @@ import org.apache.shindig.social.opensoc
/**
* A service for gathering group information for specific users.
- *
+ *
* @since 2.0.0
*/
public interface GroupService {
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MessageService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MessageService.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MessageService.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MessageService.java Sun Feb 26 23:43:20 2012
@@ -49,11 +49,11 @@ public interface MessageService {
* @throws ProtocolException when invalid parameters are given
*/
Future<RestfulCollection<MessageCollection>> getMessageCollections(UserId userId,
- Set<String> fields, CollectionOptions options, SecurityToken token) throws ProtocolException;
+ Set<String> fields, CollectionOptions options, SecurityToken token) throws ProtocolException;
/**
* Creates a new message collection for the given arguments
- *
+ *
* @param userId The userId to create the message collection for
* @param msgCollection A message collection that is to be created
* @param token A security token for this request
@@ -65,7 +65,7 @@ public interface MessageService {
/**
* Modifies/Updates a message collection for the given arguments
- *
+ *
* @param userId The userId to modify the message collection for
* @param msgCollection Data for the message collection to be modified
* @param token A security token for this request
@@ -77,7 +77,7 @@ public interface MessageService {
/**
* Deletes a message collection for the given arguments
- *
+ *
* @param userId The userId to create the message collection for
* @param msgCollId Data for the message collection to be modified
* @param token A security token for this request
@@ -137,7 +137,7 @@ public interface MessageService {
* Modifies/Updates a specific message with new data
* @param userId The User to modify for
* @param msgCollId The Message Collection ID to modify from, default @all
- * @param messageId The messageId to modify
+ * @param messageId The messageId to modify
* @param message The message details to modify
* @param token Given Security Token for this request
* @return Future<Void>
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java Sun Feb 26 23:43:20 2012
@@ -92,7 +92,7 @@ public class UserId {
if (o == this) {
return true;
}
-
+
if (!(o instanceof UserId)) {
return false;
}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java Sun Feb 26 23:43:20 2012
@@ -49,10 +49,10 @@ public class SampleOAuthDataStore implem
// value before they exceed the maximum number of attempts, they can complete a session fixation
// attack against a user.
private static final int CALLBACK_TOKEN_LENGTH = 6;
-
+
// We limit the number of trials before disabling the request token.
private static final int CALLBACK_TOKEN_ATTEMPTS = 5;
-
+
// used to get samplecontainer data from canonicaldb.json
private final JsonDbOpensocialService service;
private final OAuthServiceProvider SERVICE_PROVIDER;
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java Sun Feb 26 23:43:20 2012
@@ -188,7 +188,7 @@ public class SampleOAuthServlet extends
} else {
// Use internal forward to a jsp page
servletRequest.setAttribute("OAUTH_DATASTORE", dataStore);
-
+
servletRequest.setAttribute("OAUTH_ENTRY", entry);
servletRequest.setAttribute("CALLBACK", callback);
@@ -207,7 +207,7 @@ public class SampleOAuthServlet extends
// consumer did not specify a callback
servletResponse.setContentType("text/plain");
PrintWriter out = servletResponse.getWriter();
- out.write("Token successfully authorized.\n");
+ out.write("Token successfully authorized.\n");
if (entry.getCallbackToken() != null) {
// Usability fail.
out.write("Please enter code " + entry.getCallbackToken() + " at the consumer.");
@@ -246,7 +246,7 @@ public class SampleOAuthServlet extends
}
} else if (!entry.isAuthorized()) {
// Old protocol. Catch consumers trying to convert a token to one that's not authorized
- dataStore.disableToken(entry);
+ dataStore.disableToken(entry);
servletResponse.sendError(HttpServletResponse.SC_FORBIDDEN, "This token is not authorized");
return;
}
@@ -289,7 +289,7 @@ public class SampleOAuthServlet extends
OAuthConsumer consumer = dataStore.getConsumer(consumerKey);
if (consumer == null)
throw new OAuthProblemException(OAuth.Problems.CONSUMER_KEY_UNKNOWN);
-
+
OAuthAccessor accessor = new OAuthAccessor(consumer);
accessor.requestToken = entry.getToken();
accessor.tokenSecret = entry.getTokenSecret();
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java Sun Feb 26 23:43:20 2012
@@ -86,7 +86,7 @@ public class SocialApiTestsGuiceModule e
bindConstant().annotatedWith(Names.named("shindig.host")).to("localhost");
bindConstant().annotatedWith(Names.named("shindig.contextroot")).to("");
bind(ContainerConfig.class).to(JsonContainerConfig.class);
-
+
bind(Integer.class).annotatedWith(
Names.named("shindig.cache.lru.default.capacity"))
.toInstance(10);
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthCodeFlowTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthCodeFlowTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthCodeFlowTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2AuthCodeFlowTest.java Sun Feb 26 23:43:20 2012
@@ -61,7 +61,7 @@ public class OAuth2AuthCodeFlowTest exte
/**
* Test retrieving an access token using a public client
- *
+ *
* @throws Exception
*/
@Test
@@ -98,7 +98,7 @@ public class OAuth2AuthCodeFlowTest exte
/**
* Test retrieving an authorization code using a public client
- *
+ *
* @throws Exception
*/
@Test
@@ -137,7 +137,7 @@ public class OAuth2AuthCodeFlowTest exte
/**
* Test retrieving an authorization code using a public client that preserves
* state
- *
+ *
* @throws Exception
*/
@Test
@@ -172,10 +172,10 @@ public class OAuth2AuthCodeFlowTest exte
/**
* Test retrieving an authorization code using a confidential client
- *
+ *
* Client authentication is not required for confidential clients accessing
* the authorization endpoint
- *
+ *
* @throws Exception
*/
@Test
@@ -211,10 +211,10 @@ public class OAuth2AuthCodeFlowTest exte
/**
* Test retrieving an authorization code using a confidential client without
* setting redirect URI
- *
+ *
* The redirect URI is registered with this client, so omitting it should
* still generate a response using the registered redirect URI.
- *
+ *
* @throws Exception
*/
@Test
@@ -251,15 +251,15 @@ public class OAuth2AuthCodeFlowTest exte
/**
* Test retrieving an authorization code using a confidential client with a
* bad redirect URI
- *
+ *
* The redirect URI is registered with this client, so passing a redirect that
* doesn't match the registered value should generate an error per the OAuth
* 2.0 spec.
- *
+ *
* See Section 3.1.2.3 under
* http://tools.ietf.org/html/draft-ietf-oauth-v2-20#section-3.1.2
- *
- *
+ *
+ *
* @throws Exception
*/
@Test
@@ -288,7 +288,7 @@ public class OAuth2AuthCodeFlowTest exte
/**
* Test retrieving an auth code and using it to generate an access token
- *
+ *
* @throws Exception
*/
@Test
@@ -353,7 +353,7 @@ public class OAuth2AuthCodeFlowTest exte
/**
* Test using URL parameter to pass client secret to authenticate client
- *
+ *
* @throws Exception
*/
@Test
@@ -387,7 +387,7 @@ public class OAuth2AuthCodeFlowTest exte
/**
* Test using basic authentication scheme for client authentication
- *
+ *
* @throws Exception
*/
@Test
@@ -427,7 +427,7 @@ public class OAuth2AuthCodeFlowTest exte
/**
* Incorrect client ID used in Basic Authorization header
- *
+ *
* @throws Exception
*/
@Test
@@ -495,7 +495,7 @@ public class OAuth2AuthCodeFlowTest exte
/**
* Test attempting to get an access token with an unregistered client ID
- *
+ *
* @throws Exception
*/
@Test
@@ -527,7 +527,7 @@ public class OAuth2AuthCodeFlowTest exte
/**
* Test attempting to get an access token with a bad grant type
- *
+ *
* @throws Exception
*/
@Test
@@ -559,7 +559,7 @@ public class OAuth2AuthCodeFlowTest exte
/**
* Test attempting to get an access token with an invalid authorization code
- *
+ *
* @throws Exception
*/
@Test
@@ -617,9 +617,9 @@ public class OAuth2AuthCodeFlowTest exte
UUID id = UUID.fromString(code);
assertTrue(id != null);
System.out.println("Retrieved authorization code: " + code);
-
+
reset();
-
+
// use authorization code to get access token
req = new FakeHttpServletRequest("http://localhost:8080","/oauth2", "client_id=" + CONF_CLIENT_ID + "&grant_type=authorization_code&redirect_uri=" + URLEncoder.encode(REDIRECT_URI,"UTF-8") + "&code=" + code + "&client_secret=" + CONF_CLIENT_SECRET);
req.setMethod("GET");
@@ -641,18 +641,18 @@ public class OAuth2AuthCodeFlowTest exte
verify();
String accessToken = tokenResponse.getString("access_token");
System.out.println("Retrieved access token: " + accessToken);
-
+
reset();
-
+
// ensure access token can get security token for accessing resources
OAuth2AuthenticationHandler handler = injector.getInstance(OAuth2AuthenticationHandler.class);
req = new FakeHttpServletRequest("http://localhost:8080","/social/rest/activitystreams/john.doe/@self/1/object1", "access_token=" + accessToken);
req.setMethod("GET");
SecurityToken token = handler.getSecurityTokenFromRequest(req);
assertNotNull(token);
-
+
reset();
-
+
// attempt to re-use authorization code to get new access token
req = new FakeHttpServletRequest("http://localhost:8080","/oauth2", "client_id=" + CONF_CLIENT_ID + "&grant_type=authorization_code&redirect_uri=" + URLEncoder.encode(REDIRECT_URI,"UTF-8") + "&code=" + code + "&client_secret=" + CONF_CLIENT_SECRET);
req.setMethod("GET");
@@ -671,7 +671,7 @@ public class OAuth2AuthCodeFlowTest exte
System.out.println("Rejection response: " + tokenResponse.toString());
assertEquals("invalid_grant",tokenResponse.getString("error"));
verify();
-
+
// use (revoked) access token to get a resource
req = new FakeHttpServletRequest("http://localhost:8080","/social/rest/activitystreams/john.doe/@self/1/object1", "access_token=" + accessToken);
req.setMethod("GET");
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ClientCredentialFlowTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ClientCredentialFlowTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ClientCredentialFlowTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ClientCredentialFlowTest.java Sun Feb 26 23:43:20 2012
@@ -47,7 +47,7 @@ public class OAuth2ClientCredentialFlowT
/**
* Test using basic authentication scheme for client cred flow
- *
+ *
* @throws Exception
*/
@Test
@@ -76,7 +76,7 @@ public class OAuth2ClientCredentialFlowT
/**
* Test using basic authentication scheme for client cred flow
- *
+ *
* @throws Exception
*/
@Test
@@ -109,7 +109,7 @@ public class OAuth2ClientCredentialFlowT
/**
* Test using basic authentication scheme for client cred flow
- *
+ *
* @throws Exception
*/
@Test
@@ -146,7 +146,7 @@ public class OAuth2ClientCredentialFlowT
/**
* Test using URL parameter with client cred flow
- *
+ *
* @throws Exception
*/
@Test
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ImplicitFlowTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ImplicitFlowTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ImplicitFlowTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/OAuth2ImplicitFlowTest.java Sun Feb 26 23:43:20 2012
@@ -49,7 +49,7 @@ public class OAuth2ImplicitFlowTest exte
/**
* Test retrieving an access token using a public client with a redirect uri
- *
+ *
* @throws Exception
*/
@Test
@@ -87,7 +87,7 @@ public class OAuth2ImplicitFlowTest exte
/**
* Test retrieving an access token using a public client with redirect uri
- *
+ *
* @throws Exception
*/
@Test
@@ -121,7 +121,7 @@ public class OAuth2ImplicitFlowTest exte
/**
* Test attempting to retrieve an access token using a bad redirect URI
- *
+ *
* @throws Exception
*/
@Test
@@ -155,7 +155,7 @@ public class OAuth2ImplicitFlowTest exte
/**
* Test attempting to retrieve an access token using a bad client id
- *
+ *
* @throws Exception
*/
@Test
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulAtomActivityEntryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulAtomActivityEntryTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulAtomActivityEntryTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulAtomActivityEntryTest.java Sun Feb 26 23:43:20 2012
@@ -24,23 +24,23 @@ import org.junit.Test;
* Tests the ATOM serialization of ActivityStreams.
*/
public class RestfulAtomActivityEntryTest extends AbstractLargeRestfulTests{
-
+
private static final String FIXTURE_LOC = "src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/";
-
+
@Test
public void testGetActivityEntryAtomById() throws Exception {
String resp = getResponse("/activitystreams/john.doe/@self/1/activity2", "GET", "atom", ContentTypes.OUTPUT_ATOM_CONTENT_TYPE);
String expected = TestUtils.loadTestFixture(FIXTURE_LOC + "ActivityEntryAtomId.xml");
assertTrue(TestUtils.xmlsEqual(expected, resp));
}
-
+
@Test
public void testGetActivityEntryAtomByIds() throws Exception {
String resp = getResponse("/activitystreams/john.doe/@self/1/activity1,activity2", "GET", "atom", ContentTypes.OUTPUT_ATOM_CONTENT_TYPE);
String expected = TestUtils.loadTestFixture(FIXTURE_LOC + "ActivityEntryAtomIds.xml");
assertTrue(TestUtils.xmlsEqual(expected, resp));
}
-
+
@Test
public void testCreateActivityEntryAtom() throws Exception {
// TODO: Creating activity from ATOM not fully supported
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityEntryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityEntryTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityEntryTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityEntryTest.java Sun Feb 26 23:43:20 2012
@@ -23,41 +23,41 @@ import org.junit.Test;
/**
* Tests the ActivityStreams REST API by comparing test fixtures to actual
* server responses.
- *
+ *
* TODO: naming consistency with activity & activityEntry
* TODO: test server errors with invalid requests e.g. "400 Activity not found: objectXYZ"
*/
public class RestfulJsonActivityEntryTest extends AbstractLargeRestfulTests{
-
+
private static final String FIXTURE_LOC = "src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/";
-
+
@Test
public void testGetActivityEntryJsonById() throws Exception {
String resp = getResponse("/activitystreams/john.doe/@self/1/activity1", "GET", null, ContentTypes.OUTPUT_JSON_CONTENT_TYPE);
String expected = TestUtils.loadTestFixture(FIXTURE_LOC + "ActivityEntryJsonId.json");
assertTrue(TestUtils.jsonsEqual(expected, resp));
}
-
+
@Test
public void testGetActivityEntryJsonByIds() throws Exception {
String resp = getResponse("/activitystreams/john.doe/@self/1/activity1,activity2", "GET", null, ContentTypes.OUTPUT_JSON_CONTENT_TYPE);
String expected = TestUtils.loadTestFixture(FIXTURE_LOC + "ActivityEntryJsonIds.json");
assertTrue(TestUtils.jsonsEqual(expected, resp));
}
-
+
@Test
public void testGetActivityEntryJsonByGroup() throws Exception {
String expected = TestUtils.loadTestFixture(FIXTURE_LOC + "ActivityEntryJsonGroup.json");
-
+
// Test @self
String resp = getResponse("/activitystreams/john.doe/@self/1", "GET", null, ContentTypes.OUTPUT_JSON_CONTENT_TYPE);
assertTrue(TestUtils.jsonsEqual(expected, resp));
-
+
// Test @friends with multiple people
resp = getResponse("/activitystreams/jane.doe,canonical/@friends", "GET", null, ContentTypes.OUTPUT_JSON_CONTENT_TYPE);
assertTrue(TestUtils.jsonsEqual(expected, resp)); // same two activities returned
}
-
+
@Test
public void testDeleteActivityEntryJson() throws Exception {
// First delete activity1, then retrieve & test
@@ -66,35 +66,35 @@ public class RestfulJsonActivityEntryTes
String expected = TestUtils.loadTestFixture(FIXTURE_LOC + "ActivityEntryJsonDelete.json");;
assertTrue(TestUtils.jsonsEqual(expected, resp));
}
-
+
@Test
public void testUpdateActivityEntryJson() throws Exception {
String expected = TestUtils.loadTestFixture(FIXTURE_LOC + "ActivityEntryJsonUpdated.json");
-
+
// Update activity
String postData = "{id: 'activity2', title : 'Super Updated Activity', actor: {id: 'john.doe'}, object : {id: 'object2'}}";
String putResp = getResponse("/activitystreams/john.doe/@self/1/activity2", "PUT", postData, null, ContentTypes.OUTPUT_JSON_CONTENT_TYPE);
assertTrue(TestUtils.jsonsEqual(expected, putResp));
-
+
// Retrieve updated activity & test
String getResp = getResponse("/activitystreams/john.doe/@self/1/activity2", "GET", null, ContentTypes.OUTPUT_JSON_CONTENT_TYPE);
assertTrue(TestUtils.jsonsEqual(expected, getResp));
}
-
+
@Test
public void testCreateActivityEntryJson() throws Exception {
String expected = TestUtils.loadTestFixture(FIXTURE_LOC + "ActivityEntryJsonCreated.json");
-
+
// Create activity
String postData = "{id: 'activityCreated', title : 'Super Created Activity', actor: {id: 'john.doe'}, object : {id: 'objectCreated'}}";
String postResp = getResponse("/activitystreams/john.doe/@self/1", "POST", postData, null, ContentTypes.OUTPUT_JSON_CONTENT_TYPE);
assertTrue(TestUtils.jsonsEqual(expected, postResp));
-
+
// Retrieve created activity & test
String getResp = getResponse("/activitystreams/john.doe/@self/1/activityCreated", "GET", null, ContentTypes.OUTPUT_JSON_CONTENT_TYPE);
assertTrue(TestUtils.jsonsEqual(expected, getResp));
}
-
+
@Test
public void testActivityEntryExtensionJson() throws Exception {
String expected = TestUtils.loadTestFixture(FIXTURE_LOC + "ActivityEntryJsonExtension.json");
@@ -108,7 +108,7 @@ public class RestfulJsonActivityEntryTes
String getResp = getResponse("/activitystreams/john.doe/@self/1/activityCreated", "GET", null, ContentTypes.OUTPUT_JSON_CONTENT_TYPE);
assertTrue(TestUtils.jsonsEqual(expected, getResp));
}
-
+
@Test
public void testGetActivityEntrySupportedFields() throws Exception {
String resp = getResponse("/activitystreams/@supportedFields", "GET", null, ContentTypes.OUTPUT_JSON_CONTENT_TYPE);
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityEntryTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityEntryTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityEntryTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityEntryTest.java Sun Feb 26 23:43:20 2012
@@ -24,23 +24,23 @@ import org.junit.Test;
* Tests the XML serialization of ActivityStreams.
*/
public class RestfulXmlActivityEntryTest extends AbstractLargeRestfulTests{
-
+
private static final String FIXTURE_LOC = "src/test/java/org/apache/shindig/social/dataservice/integration/fixtures/";
-
+
@Test
public void testGetActivityEntryXmlById() throws Exception {
String resp = getResponse("/activitystreams/john.doe/@self/1/activity2", "GET", "xml", ContentTypes.OUTPUT_XML_CONTENT_TYPE);
String expected = TestUtils.loadTestFixture(FIXTURE_LOC + "ActivityEntryXmlId.xml");
assertTrue(TestUtils.xmlsEqual(expected, resp));
}
-
+
@Test
public void testGetActivityEntryXmlByIds() throws Exception {
String resp = getResponse("/activitystreams/john.doe/@self/1/activity1,activity2", "GET", "xml", ContentTypes.OUTPUT_XML_CONTENT_TYPE);
String expected = TestUtils.loadTestFixture(FIXTURE_LOC + "ActivityEntryXmlIds.xml");
assertTrue(TestUtils.xmlsEqual(expected, resp));
}
-
+
@Test
public void testCreateActivityEntryXml() throws Exception {
// TODO: Creating activity from XML not fully supported
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlActivityTest.java Sun Feb 26 23:43:20 2012
@@ -42,7 +42,7 @@ public class RestfulXmlActivityTest exte
/**
* Expected response for an activity in xml:
- *
+ *
* <pre>
* <response>
* <activity>
@@ -53,7 +53,7 @@ public class RestfulXmlActivityTest exte
* </activity>
* </response>
* </pre>
- *
+ *
* @throws Exception
* if test encounters an error
*/
@@ -63,7 +63,7 @@ public class RestfulXmlActivityTest exte
"xml", "application/xml");
XSDValidator.validateOpenSocial(resp);
-
+
NodeList result = xp.getMatchingNodes("/:response/:activity", XMLUnit.buildTestDocument(resp));
assertEquals(1, result.getLength());
@@ -77,7 +77,7 @@ public class RestfulXmlActivityTest exte
/**
* Expected response for a list of activities in json:
- *
+ *
* <pre>
* <response xmlns="http://ns.opensocial.org/2008/opensocial"
* xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -111,7 +111,7 @@ public class RestfulXmlActivityTest exte
* </activity>
* </response>
* </pre>
- *
+ *
* @throws Exception
* if test encounters an error
*/
@@ -120,7 +120,7 @@ public class RestfulXmlActivityTest exte
String resp = getResponse("/activities/john.doe/@self", "GET", "xml",
"application/xml");
XSDValidator.validateOpenSocial(resp);
-
+
assertEquals("0", xp.evaluate("/:response/:startIndex", XMLUnit.buildTestDocument(resp)));
assertEquals("1", xp.evaluate("/:response/:totalResults", XMLUnit.buildTestDocument(resp)));
@@ -133,8 +133,8 @@ public class RestfulXmlActivityTest exte
/**
* Expected response for a list of activities in json:
- *
- *
+ *
+ *
* <pre>
* <?xml version="1.0" encoding="UTF-8"?>
* <response xmlns="http://ns.opensocial.org/2008/opensocial"
@@ -169,8 +169,8 @@ public class RestfulXmlActivityTest exte
* </activity>
* </response>
* </pre>
- *
- *
+ *
+ *
* @throws Exception
* if test encounters an error
*/
@@ -180,7 +180,7 @@ public class RestfulXmlActivityTest exte
"application/xml");
XSDValidator.validateOpenSocial(resp);
-
+
assertEquals("0", xp.evaluate("/:response/:startIndex", XMLUnit.buildTestDocument(resp)));
assertEquals("2", xp.evaluate("/:response/:totalResults", XMLUnit.buildTestDocument(resp)));
NodeList nl = xp.getMatchingNodes("/:response/:entry", XMLUnit.buildTestDocument(resp));
@@ -206,10 +206,10 @@ public class RestfulXmlActivityTest exte
String resp = getResponse("/activities/john.doe/@self", "GET", "xml",
"application/xml");
-
+
XSDValidator.validateOpenSocial(resp);
-
+
assertEquals("0", xp.evaluate("/:response/:startIndex", XMLUnit.buildTestDocument(resp)));
assertEquals("2", xp.evaluate("/:response/:totalResults", XMLUnit.buildTestDocument(resp)));
NodeList nl = xp.getMatchingNodes("/:response/:entry/:activity", XMLUnit.buildTestDocument(resp));
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlDataTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlDataTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlDataTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulXmlDataTest.java Sun Feb 26 23:43:20 2012
@@ -49,7 +49,7 @@ public class RestfulXmlDataTest extends
Map<String, String> extraParams = ImmutableMap.of("fields", "count");
String resp = getResponse("/appdata/john.doe/@friends/app", "GET",
extraParams, "xml", "application/xml");
-
+
XSDValidator.validateOpenSocial(resp);
// /*[local-name()="TestSchema" and namespace-uri()='http://MapTest.TestSchema']/*[local-name()="A"]
@@ -88,7 +88,7 @@ public class RestfulXmlDataTest extends
extraParams.put("fields", null);
String resp = getResponse("/appdata/john.doe/@self/app", "GET",
extraParams, "xml", "application/xml");
-
+
XSDValidator.validateOpenSocial(resp);
NodeList result = xp.getMatchingNodes("/:appdata/:entry", XMLUnit.buildTestDocument(resp));
@@ -197,7 +197,7 @@ public class RestfulXmlDataTest extends
String postData = XSDValidator.XMLDEC + "<map><entry><key>count</key><value>5</value></entry></map>";
String resp = getResponse("/appdata/john.doe/@self/app", "POST", extraParams, postData,
"xml", "application/xml");
-
+
XSDValidator.validateOpenSocial(resp);
@@ -207,7 +207,7 @@ public class RestfulXmlDataTest extends
private void assertCount(String expectedCount) throws Exception {
String resp = getResponse("/appdata/john.doe/@self/app", "GET", "xml",
"application/xml");
-
+
XSDValidator.validateOpenSocial(resp);
NodeList result = xp.getMatchingNodes("/:appdata/:entry", XMLUnit.buildTestDocument(resp));
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/TestUtils.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/TestUtils.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/TestUtils.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/TestUtils.java Sun Feb 26 23:43:20 2012
@@ -44,13 +44,13 @@ import org.xml.sax.InputSource;
* Collection of utilities to assist in testing.
*/
public class TestUtils {
-
+
/**
* Loads the contents of the test fixture specified at the given path.
- *
+ *
* @param path specifies the file to load the contents of
* @return String is the file contents
- * @throws IOException
+ * @throws IOException
*/
public static String loadTestFixture(String path) throws IOException {
BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(path)));
@@ -61,10 +61,10 @@ public class TestUtils {
}
return sb.toString();
}
-
+
/**
* Tests two JSON strings for equality by performing a deep comparison.
- *
+ *
* @param json1 represents a JSON object to compare with json2
* @param json2 represents a JSON object to compare with json1
* @return true if the JSON objects are equal, false otherwise
@@ -74,38 +74,38 @@ public class TestUtils {
Object obj2Converted = convertJsonElement(new JSONObject(json2));
return obj1Converted.equals(obj2Converted);
}
-
+
/**
* Tests the DOMs represented by two XML strings for equality by performing
* a deep comparison.
- *
+ *
* @param xml1 represents the XML DOM to compare with xml2
* @param xml2 represents the XML DOM to compare with xml1
- *
+ *
* return true if the represented DOMs are equal, false otherwise
*/
public static boolean xmlsEqual(String xml1, String xml2) throws Exception {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder();
-
+
Document doc1 = db.parse(new InputSource(new StringReader(xml1)));
Document doc2 = db.parse(new InputSource(new StringReader(xml2)));
-
+
Set<Object> childSet1 = getChildSet(doc1.getDocumentElement(), "");
Set<Object> childSet2 = getChildSet(doc2.getDocumentElement(), "");
-
+
return childSet1.equals(childSet2); // comparing sets does all the hard work :)
}
-
+
// ---------------------------- PRIVATE HELPERS -----------------------------
-
+
/*
* Recursive utility to convert a JSONObject to an Object composed of Sets,
* Maps, and the target types (e.g. Integer, String, Double). Used to do a
* deep comparison of two JSON objects.
- *
+ *
* @param Object is the JSON element to convert (JSONObject, JSONArray, or target type)
- *
+ *
* @return an Object representing the appropriate JSON element
*/
@SuppressWarnings("unchecked")
@@ -130,13 +130,13 @@ public class TestUtils {
return elem;
}
}
-
+
/*
* Recursive utility to represent an XML Document as a Set.
- *
+ *
* @param node is the root node to map to a Set
* @param basePath is the path to the root node
- *
+ *
* @return Set<Object> represents the XML Document as a Set
*/
private static Set<Object> getChildSet(Node node, String basePath) {
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java Sun Feb 26 23:43:20 2012
@@ -63,7 +63,7 @@ public class ActivityHandlerTest extends
private FakeGadgetToken token;
- private static final Set<UserId> JOHN_DOE =
+ private static final Set<UserId> JOHN_DOE =
ImmutableSet.of(new UserId(UserId.Type.userId, "john.doe"));
protected HandlerRegistry registry;
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandlerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandlerTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandlerTest.java Sun Feb 26 23:43:20 2012
@@ -57,21 +57,21 @@ import com.google.common.collect.Sets;
* Tests the ActivityStreamsHandler.
*/
public class ActivityStreamHandlerTest extends EasyMockTestCase {
-
+
private BeanJsonConverter converter;
-
+
private ActivityStreamService service;
-
+
private ActivityStreamHandler handler;
-
+
private FakeGadgetToken token;
-
+
private static final Set<UserId> JOHN_DOE = ImmutableSet.of(new UserId(
UserId.Type.userId, "john.doe"));
-
+
protected HandlerRegistry registry;
protected ContainerConfig containerConfig;
-
+
@Before
public void setUp() throws Exception {
token = new FakeGadgetToken();
@@ -92,7 +92,7 @@ public class ActivityStreamHandlerTest e
new HandlerExecutionListener.NoOpHandler());
registry.addHandlers(ImmutableSet.<Object>of(handler));
}
-
+
/* Helper for retrieving groups. */
private void assertHandleGetForGroup(GroupId.Type group) throws Exception {
String path = "/activitystreams/john.doe/@" + group.toString();
@@ -111,7 +111,7 @@ public class ActivityStreamHandlerTest e
verify();
reset();
}
-
+
@Test
public void testHandleGetAll() throws Exception {
assertHandleGetForGroup(GroupId.Type.all);
@@ -126,7 +126,7 @@ public class ActivityStreamHandlerTest e
public void testHandleGetSelf() throws Exception {
assertHandleGetForGroup(GroupId.Type.self);
}
-
+
@Test
public void testHandleGetPlural() throws Exception {
String path = "/activitystreams/john.doe,jane.doe/@self/@app";
@@ -147,7 +147,7 @@ public class ActivityStreamHandlerTest e
verify();
reset();
}
-
+
@Test
public void testHandleGetActivityEntryById() throws Exception {
String path = "/activitystreams/john.doe/@friends/@app/myObjectId123"; // TODO: change id=1 in DB for consistency
@@ -165,7 +165,7 @@ public class ActivityStreamHandlerTest e
verify();
reset();
}
-
+
/* Helper for testing PUT and POST */
private Future<?> setupBodyRequest(String method) throws ProtocolException {
String jsonActivityEntry = "{title: 'hi mom!', object: {id: 'testObject'}}";
@@ -185,7 +185,7 @@ public class ActivityStreamHandlerTest e
return operation.execute(Maps.<String, String[]>newHashMap(),
new StringReader(jsonActivityEntry), token, converter);
}
-
+
@Test
public void testHandlePost() throws Exception {
String jsonActivityEntry = "{title: 'hi mom!', object: {id: 'testObject'}}";
@@ -231,7 +231,7 @@ public class ActivityStreamHandlerTest e
verify();
reset();
}
-
+
@Test
public void testHandleDelete() throws Exception {
String path = "/activitystreams/john.doe/@self/@app/myObjectId123";
@@ -247,7 +247,7 @@ public class ActivityStreamHandlerTest e
verify();
reset();
}
-
+
@Test
public void testHandleGetSupportedFields() throws Exception {
String path = "/activitystreams/@supportedFields";
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java Sun Feb 26 23:43:20 2012
@@ -43,7 +43,7 @@ public class AlbumHandlerTest extends Ea
private FakeGadgetToken token;
protected HandlerRegistry registry;
private BeanJsonConverter converter;
-
+
@Before
public void setUp() throws Exception {
token = new FakeGadgetToken();
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java?rev=1293966&r1=1293965&r2=1293966&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java Sun Feb 26 23:43:20 2012
@@ -43,7 +43,7 @@ public class MediaItemHandlerTest extend
private FakeGadgetToken token;
protected HandlerRegistry registry;
private BeanJsonConverter converter;
-
+
@Before
public void setUp() throws Exception {
token = new FakeGadgetToken();