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 2013/03/14 01:33:49 UTC
svn commit: r1456294 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/common/util/
common/src/main/java/org/apache/shindig/protocol/
common/src/test/java/org/apache/shindig/common/util/
common/src/test/java/org/apache/shindig/protocol/...
Author: lindner
Date: Thu Mar 14 00:33:48 2013
New Revision: 1456294
URL: http://svn.apache.org/r1456294
Log:
Replace FutureUtil and ImmediateFuture with Futures Guava implementation
Removed:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/FutureUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ImmediateFuture.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FutureUtilTest.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/ImmediateFutureTest.java
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/TestHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
shindig/trunk/java/sample-container/src/main/java/org/apache/shindig/sample/container/SampleContainerHandler.java
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityHandlerTest.java
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/ActivityStreamHandlerTest.java
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java
shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java?rev=1456294&r1=1456293&r2=1456294&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java Thu Mar 14 00:33:48 2013
@@ -23,7 +23,6 @@ import com.google.common.base.Strings;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shindig.auth.SecurityToken;
-import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.protocol.conversion.BeanConverter;
import org.apache.shindig.protocol.conversion.BeanJsonConverter;
import org.apache.shindig.protocol.multipart.FormDataItem;
@@ -32,6 +31,7 @@ import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.Futures;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Provider;
@@ -294,14 +294,14 @@ public class DefaultHandlerRegistry impl
JSONObject params = rpc.has("params") ? (JSONObject)rpc.get("params") : new JSONObject();
item = methodCaller.getRpcRequestItem(params, formItems, token, beanJsonConverter);
} catch (Exception e) {
- return ImmediateFuture.errorInstance(e);
+ return Futures.immediateFailedFuture(e);
}
try {
listener.executing(item);
return methodCaller.call(handlerProvider.get(), item);
} catch (Exception e) {
- return ImmediateFuture.errorInstance(e);
+ return Futures.immediateFailedFuture(e);
} finally {
listener.executed(item);
}
@@ -361,16 +361,16 @@ public class DefaultHandlerRegistry impl
}
item = methodCaller.getRestRequestItem(parameters, token, converter, beanJsonConverter);
} catch (Exception e) {
- return ImmediateFuture.errorInstance(e);
+ return Futures.immediateFailedFuture(e);
}
try {
listener.executing(item);
return methodCaller.call(handlerProvider.get(), item);
} catch (Exception e) {
- return ImmediateFuture.errorInstance(e);
+ return Futures.immediateFailedFuture(e);
} finally {
- listener.executed(item);
+ listener.executed(item);
}
}
}
@@ -488,12 +488,12 @@ public class DefaultHandlerRegistry impl
if (result instanceof Future<?>) {
return (Future<?>) result;
}
- return ImmediateFuture.newInstance(result);
+ return Futures.immediateFuture(result);
} catch (IllegalAccessException e) {
- return ImmediateFuture.errorInstance(e);
+ return Futures.immediateFailedFuture(e);
} catch (InvocationTargetException e) {
// Unwrap the internal exception
- return ImmediateFuture.errorInstance(e.getTargetException());
+ return Futures.immediateFailedFuture(e.getTargetException());
}
}
}
@@ -511,7 +511,7 @@ public class DefaultHandlerRegistry impl
public Future<?> execute(Map<String, String[]> parameters, Reader body,
SecurityToken token, BeanConverter converter) {
- return ImmediateFuture.errorInstance(error);
+ return Futures.immediateFailedFuture(error);
}
}
@@ -528,7 +528,7 @@ public class DefaultHandlerRegistry impl
public Future<?> execute(Map<String, FormDataItem> formItems, SecurityToken token,
BeanConverter converter) {
- return ImmediateFuture.errorInstance(error);
+ return Futures.immediateFailedFuture(error);
}
}
Modified: shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/TestHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/TestHandler.java?rev=1456294&r1=1456293&r2=1456294&view=diff
==============================================================================
--- shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/TestHandler.java (original)
+++ shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/TestHandler.java Thu Mar 14 00:33:48 2013
@@ -18,9 +18,9 @@
*/
package org.apache.shindig.protocol;
-import org.apache.shindig.common.util.ImmediateFuture;
-
import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.Futures;
+
import org.junit.Ignore;
@@ -84,7 +84,7 @@ public class TestHandler {
if (mock != null) {
return mock.create(req);
}
- return ImmediateFuture.newInstance(CREATE_RESPONSE);
+ return Futures.immediateFuture(CREATE_RESPONSE);
}
@Operation(httpMethods = "DELETE")
@@ -92,7 +92,7 @@ public class TestHandler {
if (mock != null) {
return mock.futureException(req);
}
- return ImmediateFuture.errorInstance(new ProtocolException(HttpServletResponse.SC_BAD_REQUEST,
+ return Futures.immediateFailedFuture(new ProtocolException(HttpServletResponse.SC_BAD_REQUEST,
FAILURE_MESSAGE, new Throwable()));
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java?rev=1456294&r1=1456293&r2=1456294&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java Thu Mar 14 00:33:48 2013
@@ -35,7 +35,6 @@ import org.apache.commons.lang3.StringEs
import org.apache.shindig.common.cache.Cache;
import org.apache.shindig.common.cache.CacheProvider;
import org.apache.shindig.common.util.HashUtil;
-import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.gadgets.features.ApiDirective;
import org.apache.shindig.gadgets.features.FeatureRegistry.FeatureBundle;
import org.apache.shindig.gadgets.http.HttpResponse;
@@ -49,6 +48,7 @@ import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.Futures;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
@@ -228,13 +228,13 @@ public class ClosureJsCompiler implement
compiling.put(cacheKey, future);
}
} else {
- future = ImmediateFuture.newInstance(cached);
+ future = Futures.immediateFuture(cached);
}
}
}
if (future == null) {
- future = ImmediateFuture.newInstance(new CompileResult(code.get()));
+ future = Futures.immediateFuture(new CompileResult(code.get()));
}
futures.add(future);
}
Modified: shindig/trunk/java/sample-container/src/main/java/org/apache/shindig/sample/container/SampleContainerHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/sample-container/src/main/java/org/apache/shindig/sample/container/SampleContainerHandler.java?rev=1456294&r1=1456293&r2=1456294&view=diff
==============================================================================
--- shindig/trunk/java/sample-container/src/main/java/org/apache/shindig/sample/container/SampleContainerHandler.java (original)
+++ shindig/trunk/java/sample-container/src/main/java/org/apache/shindig/sample/container/SampleContainerHandler.java Thu Mar 14 00:33:48 2013
@@ -18,7 +18,6 @@
*/
package org.apache.shindig.sample.container;
-import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.protocol.Operation;
import org.apache.shindig.protocol.ProtocolException;
@@ -38,6 +37,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
+import com.google.common.util.concurrent.Futures;
import com.google.inject.Inject;
@Service(name = "samplecontainer", path = "/{type}/{doevil}")
@@ -81,7 +81,7 @@ public class SampleContainerHandler {
"evil data has not been implemented yet");
}
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
}
/**
@@ -89,7 +89,7 @@ public class SampleContainerHandler {
*/
@Operation(httpMethods = "GET")
public Future<?> get(RequestItem request) {
- return ImmediateFuture.newInstance(service.getDb());
+ return Futures.immediateFuture(service.getDb());
}
private String fetchStateDocument(String stateFileLocation) {
Modified: shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java?rev=1456294&r1=1456293&r2=1456294&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java (original)
+++ shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/ActivityServiceDb.java Thu Mar 14 00:33:48 2013
@@ -29,7 +29,6 @@ import javax.persistence.Query;
import javax.servlet.http.HttpServletResponse;
import org.apache.shindig.auth.SecurityToken;
-import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.protocol.ProtocolException;
import org.apache.shindig.protocol.RestfulCollection;
import org.apache.shindig.social.opensocial.jpa.ActivityDb;
@@ -42,6 +41,7 @@ import org.apache.shindig.social.opensoc
import org.apache.shindig.social.opensocial.spi.UserId;
import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Futures;
import com.google.inject.Inject;
/**
@@ -197,7 +197,7 @@ public class ActivityServiceDb implement
// db wait times.
RestfulCollection<Activity> restCollection = new RestfulCollection<Activity>(
plist, options.getFirst(), totalResults.intValue(), options.getMax());
- return ImmediateFuture.newInstance(restCollection);
+ return Futures.immediateFuture(restCollection);
}
/* (non-Javadoc)
@@ -207,7 +207,7 @@ public class ActivityServiceDb implement
GroupId groupId, String appId, Set<String> fields,
CollectionOptions options, Set<String> activityIds, SecurityToken token)
throws ProtocolException {
- return ImmediateFuture.newInstance(new RestfulCollection<Activity>(getActivities(userId, activityIds, token)));
+ return Futures.immediateFuture(new RestfulCollection<Activity>(getActivities(userId, activityIds, token)));
}
/* (non-Javadoc)
@@ -217,7 +217,7 @@ public class ActivityServiceDb implement
Set<String> fields, String activityId, SecurityToken token) throws ProtocolException {
Activity activity = getActivities(userId, activityId, token);
if ( activity != null ) {
- return ImmediateFuture.newInstance(activity);
+ return Futures.immediateFuture(activity);
}
throw new ProtocolException(HttpServletResponse.SC_BAD_REQUEST,"Cant find activity");
}
Modified: shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java?rev=1456294&r1=1456293&r2=1456294&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java (original)
+++ shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/AppDataServiceDb.java Thu Mar 14 00:33:48 2013
@@ -27,7 +27,6 @@ import java.util.concurrent.Future;
import javax.persistence.EntityManager;
import org.apache.shindig.auth.SecurityToken;
-import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.protocol.DataCollection;
import org.apache.shindig.protocol.ProtocolException;
import org.apache.shindig.social.opensocial.jpa.ApplicationDataMapDb;
@@ -37,6 +36,7 @@ import org.apache.shindig.social.opensoc
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.Futures;
import com.google.inject.Inject;
/**
@@ -71,7 +71,7 @@ public class AppDataServiceDb implements
entityManager.flush();
entityManager.getTransaction().commit();
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
}
/**
@@ -188,7 +188,7 @@ public class AppDataServiceDb implements
}
}
DataCollection dc = new DataCollection(results);
- return ImmediateFuture.newInstance(dc);
+ return Futures.immediateFuture(dc);
}
/**
@@ -211,7 +211,7 @@ public class AppDataServiceDb implements
entityManager.flush();
entityManager.getTransaction().commit();
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
}
}
Modified: shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java?rev=1456294&r1=1456293&r2=1456294&view=diff
==============================================================================
--- shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java (original)
+++ shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/spi/PersonServiceDb.java Thu Mar 14 00:33:48 2013
@@ -27,7 +27,6 @@ import javax.persistence.Query;
import javax.servlet.http.HttpServletResponse;
import org.apache.shindig.auth.SecurityToken;
-import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.protocol.ProtocolException;
import org.apache.shindig.protocol.RestfulCollection;
import org.apache.shindig.social.opensocial.jpa.PersonDb;
@@ -40,6 +39,7 @@ import org.apache.shindig.social.opensoc
import org.apache.shindig.social.opensocial.spi.UserId;
import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.Futures;
import com.google.inject.Inject;
/**
@@ -147,7 +147,7 @@ public class PersonServiceDb implements
// db wait times.
RestfulCollection<Person> restCollection = new RestfulCollection<Person>(
plist, collectionOptions.getFirst(), totalResults.intValue(), collectionOptions.getMax());
- return ImmediateFuture.newInstance(restCollection);
+ return Futures.immediateFuture(restCollection);
}
@@ -166,7 +166,7 @@ public class PersonServiceDb implements
if (plist != null && !plist.isEmpty()) {
person = (Person) plist.get(0);
}
- return ImmediateFuture.newInstance(person);
+ return Futures.immediateFuture(person);
}
/**
@@ -227,7 +227,7 @@ public class PersonServiceDb implements
entiyManager.getTransaction().commit();
// send personDb data back
- return ImmediateFuture.newInstance((Person) personDb);
+ return Futures.immediateFuture((Person) personDb);
}
/** Check if a viewer is allowed to update the given person record. **/
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java?rev=1456294&r1=1456293&r2=1456294&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java Thu Mar 14 00:33:48 2013
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.Future;
-import org.apache.shindig.common.util.FutureUtil;
+
import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.protocol.HandlerPreconditions;
import org.apache.shindig.protocol.Operation;
@@ -37,8 +37,11 @@ import org.apache.shindig.social.opensoc
import org.apache.shindig.social.opensocial.spi.UserId;
import com.google.common.base.Objects;
+import com.google.common.base.Function;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
+import com.google.common.util.concurrent.Futures;
+
import com.google.inject.Inject;
/**
@@ -49,6 +52,21 @@ public class PersonHandler {
private final PersonService personService;
private final ContainerConfig config;
+
+ // Return a future for the first item of a collection
+ private static <T> Future<T> firstItem(Future<RestfulCollection<T>> collection) {
+ Function<RestfulCollection<T>, T> firstItem = new Function<RestfulCollection<T>, T>() {
+ @Override
+ public T apply(RestfulCollection<T> c) {
+ if (c != null && c.getTotalResults() > 0) {
+ return c.getList().get(0);
+ }
+ return null;
+ };
+ };
+ return Futures.lazyTransform(collection, firstItem);
+ }
+
@Inject
public PersonHandler(PersonService personService, ContainerConfig config) {
this.personService = personService;
@@ -82,7 +100,7 @@ public class PersonHandler {
if (options.getFilter() != null) {
Future<RestfulCollection<Person>> people = personService.getPeople(
userIds, groupId, options, fields, request.getToken());
- return FutureUtil.getFirstFromCollection(people);
+ return firstItem(people);
} else {
return personService.getPerson(userIds.iterator().next(), fields, request.getToken());
}
@@ -97,7 +115,7 @@ public class PersonHandler {
Future<RestfulCollection<Person>> people = personService.getPeople(
optionalUserIds, new GroupId(GroupId.Type.self, null),
options, fields, request.getToken());
- return FutureUtil.getFirstFromCollection(people);
+ return firstItem(people);
} else {
ImmutableSet.Builder<UserId> personIds = ImmutableSet.builder();
for (String pid : optionalPersonId) {
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java?rev=1456294&r1=1456293&r2=1456294&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java Thu Mar 14 00:33:48 2013
@@ -32,7 +32,6 @@ import org.apache.commons.io.IOUtils;
import org.apache.shindig.auth.AnonymousSecurityToken;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.common.servlet.Authority;
-import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.common.util.ResourceLoader;
import org.apache.shindig.protocol.DataCollection;
import org.apache.shindig.protocol.ProtocolException;
@@ -68,6 +67,7 @@ import com.google.common.collect.Immutab
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.Futures;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
@@ -218,7 +218,7 @@ public class JsonDbOpensocialService imp
}
}
}
- return ImmediateFuture.newInstance(new RestfulCollection<Activity>(result));
+ return Futures.immediateFuture(new RestfulCollection<Activity>(result));
} catch (JSONException je) {
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(),
je);
@@ -242,7 +242,7 @@ public class JsonDbOpensocialService imp
}
}
}
- return ImmediateFuture.newInstance(new RestfulCollection<Activity>(result));
+ return Futures.immediateFuture(new RestfulCollection<Activity>(result));
} catch (JSONException je) {
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(),
je);
@@ -260,7 +260,7 @@ public class JsonDbOpensocialService imp
JSONObject activity = activities.getJSONObject(i);
if (activity.get(Activity.Field.USER_ID.toString()).equals(user)
&& activity.get(Activity.Field.ID.toString()).equals(activityId)) {
- return ImmediateFuture.newInstance(filterFields(activity, fields, Activity.class));
+ return Futures.immediateFuture(filterFields(activity, fields, Activity.class));
}
}
}
@@ -296,7 +296,7 @@ public class JsonDbOpensocialService imp
}
}
// What is the appropriate response here??
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
} catch (JSONException je) {
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(),
je);
@@ -320,7 +320,7 @@ public class JsonDbOpensocialService imp
}
// TODO (woodser): if used with PUT, duplicate activity would be created?
jsonArray.put(jsonObject);
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
} catch (JSONException je) {
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(),
je);
@@ -371,7 +371,7 @@ public class JsonDbOpensocialService imp
int last = options.getFirst() + options.getMax();
result = result.subList(options.getFirst(), Math.min(last, totalSize));
- return ImmediateFuture.newInstance(new RestfulCollection<Person>(result, options.getFirst(), totalSize, options.getMax()));
+ return Futures.immediateFuture(new RestfulCollection<Person>(result, options.getFirst(), totalSize, options.getMax()));
} catch (JSONException je) {
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(),
je);
@@ -386,7 +386,7 @@ public class JsonDbOpensocialService imp
anonymous.setId(AnonymousSecurityToken.ANONYMOUS_ID);
anonymous.setName(new NameImpl(ANONYMOUS_NAME));
anonymous.setNickname(ANONYMOUS_NAME);
- return ImmediateFuture.newInstance(anonymous);
+ return Futures.immediateFuture(anonymous);
}
try {
JSONArray people = db.getJSONArray(PEOPLE_TABLE);
@@ -399,7 +399,7 @@ public class JsonDbOpensocialService imp
.toString()), fields);
personObj.setAppData(appData);
- return ImmediateFuture.newInstance(personObj);
+ return Futures.immediateFuture(personObj);
}
}
throw new ProtocolException(HttpServletResponse.SC_BAD_REQUEST, "Person '" + id.getUserId(token) + "' not found");
@@ -435,7 +435,7 @@ public class JsonDbOpensocialService imp
}
people.put(i,curPerson);
- return ImmediateFuture.newInstance(converter.convertToObject(curPerson.toString(), Person.class));
+ return Futures.immediateFuture(converter.convertToObject(curPerson.toString(), Person.class));
}
}
@@ -525,7 +525,7 @@ public class JsonDbOpensocialService imp
}
idToData.put(id, data);
}
- return ImmediateFuture.newInstance(new DataCollection(idToData));
+ return Futures.immediateFuture(new DataCollection(idToData));
} catch (JSONException je) {
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(),
je);
@@ -553,7 +553,7 @@ public class JsonDbOpensocialService imp
}
}
db.getJSONObject(DATA_TABLE).put(user, newPersonData);
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
} catch (JSONException je) {
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(),
je);
@@ -580,7 +580,7 @@ public class JsonDbOpensocialService imp
for (Map.Entry<String, String> entry : values.entrySet()) {
personData.put(entry.getKey(), entry.getValue());
}
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
} catch (JSONException je) {
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(),
je);
@@ -606,7 +606,7 @@ public class JsonDbOpensocialService imp
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(), je);
}
- return ImmediateFuture.newInstance(new RestfulCollection<Group>(result));
+ return Futures.immediateFuture(new RestfulCollection<Group>(result));
}
/**
@@ -631,7 +631,7 @@ public class JsonDbOpensocialService imp
}
}
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
}
/** {@inheritDoc} */
@@ -651,7 +651,7 @@ public class JsonDbOpensocialService imp
result.add(filterFields(msgColl, fields, MessageCollection.class));
}
- return ImmediateFuture.newInstance(new RestfulCollection<MessageCollection>(result));
+ return Futures.immediateFuture(new RestfulCollection<MessageCollection>(result));
} catch (JSONException je) {
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(),
je);
@@ -691,7 +691,7 @@ public class JsonDbOpensocialService imp
result.add(filterFields(msg, fields, Message.class));
}
- return ImmediateFuture.newInstance(new RestfulCollection<Message>(result));
+ return Futures.immediateFuture(new RestfulCollection<Message>(result));
} catch (JSONException je) {
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(),
@@ -811,7 +811,7 @@ public class JsonDbOpensocialService imp
album = userAlbums.getJSONObject(i);
if (album.getString(Album.Field.ID.toString()).equals(albumId) &&
album.getString(Album.Field.OWNER_ID.toString()).equals(user)) {
- return ImmediateFuture.newInstance(filterFields(album, fields, Album.class));
+ return Futures.immediateFuture(filterFields(album, fields, Album.class));
}
}
}
@@ -864,7 +864,7 @@ public class JsonDbOpensocialService imp
}
// Return found albums
- return ImmediateFuture.newInstance(new RestfulCollection<Album>(result));
+ return Futures.immediateFuture(new RestfulCollection<Album>(result));
}
// Album table doesn't exist for user
@@ -899,7 +899,7 @@ public class JsonDbOpensocialService imp
}
}
}
- return ImmediateFuture.newInstance(new RestfulCollection<Album>(result));
+ return Futures.immediateFuture(new RestfulCollection<Album>(result));
} catch (JSONException je) {
throw new ProtocolException(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
@@ -937,7 +937,7 @@ public class JsonDbOpensocialService imp
// Overwrite user's albums with updated list if album found
if (targetFound) {
db.getJSONObject(ALBUMS_TABLE).put(user, newAlbums);
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
} else {
throw new ProtocolException(HttpServletResponse.SC_BAD_REQUEST, "Album ID " + albumId + " does not exist");
}
@@ -974,7 +974,7 @@ public class JsonDbOpensocialService imp
// Insert new album into table
userAlbums.put(jsonAlbum);
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
} catch (JSONException je) {
throw new ProtocolException(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
@@ -1003,7 +1003,7 @@ public class JsonDbOpensocialService imp
JSONObject curAlbum = userAlbums.getJSONObject(i);
if (curAlbum.getString(Album.Field.ID.toString()).equals(albumId)) {
userAlbums.put(i, jsonAlbum);
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
}
}
}
@@ -1036,7 +1036,7 @@ public class JsonDbOpensocialService imp
mediaItem = userMediaItems.getJSONObject(i);
if (mediaItem.getString(MediaItem.Field.ID.toString()).equals(mediaItemId) &&
mediaItem.getString(MediaItem.Field.ALBUM_ID.toString()).equals(albumId)) {
- return ImmediateFuture.newInstance(filterFields(mediaItem, fields, MediaItem.class));
+ return Futures.immediateFuture(filterFields(mediaItem, fields, MediaItem.class));
}
}
}
@@ -1090,7 +1090,7 @@ public class JsonDbOpensocialService imp
}
// Return found MediaItems
- return ImmediateFuture.newInstance(new RestfulCollection<MediaItem>(result));
+ return Futures.immediateFuture(new RestfulCollection<MediaItem>(result));
}
// Table doesn't exist for user
@@ -1129,7 +1129,7 @@ public class JsonDbOpensocialService imp
}
// Return found MediaItems
- return ImmediateFuture.newInstance(new RestfulCollection<MediaItem>(result));
+ return Futures.immediateFuture(new RestfulCollection<MediaItem>(result));
}
// Album wasn't found
@@ -1161,7 +1161,7 @@ public class JsonDbOpensocialService imp
}
}
}
- return ImmediateFuture.newInstance(new RestfulCollection<MediaItem>(result));
+ return Futures.immediateFuture(new RestfulCollection<MediaItem>(result));
} catch (JSONException je) {
throw new ProtocolException(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
@@ -1201,7 +1201,7 @@ public class JsonDbOpensocialService imp
// Overwrite user's MediaItems with updated list if target found
if (targetFound) {
db.getJSONObject(MEDIAITEMS_TABLE).put(user, newMediaItems);
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
} else {
throw new ProtocolException(HttpServletResponse.SC_BAD_REQUEST, "MediaItem ID " + mediaItemId + " does not exist existin within Album " + albumId);
}
@@ -1235,7 +1235,7 @@ public class JsonDbOpensocialService imp
// Insert new MediaItem into table
userMediaItems.put(jsonMediaItem);
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
} catch (JSONException je) {
throw new ProtocolException(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
@@ -1267,7 +1267,7 @@ public class JsonDbOpensocialService imp
if (curMediaItem.getString(MediaItem.Field.ID.toString()).equals(mediaItemId) &&
curMediaItem.getString(MediaItem.Field.ALBUM_ID.toString()).equals(albumId)) {
userMediaItems.put(i, jsonMediaItem);
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
}
}
}
@@ -1309,7 +1309,7 @@ public class JsonDbOpensocialService imp
JSONObject entry = jsonArray.getJSONObject(i);
if (entry.getString(ActivityEntry.Field.ID.toString()).equals(activityId)) {
jsonArray.put(i, jsonEntry);
- return ImmediateFuture.newInstance(filterFields(jsonEntry, fields, ActivityEntry.class));
+ return Futures.immediateFuture(filterFields(jsonEntry, fields, ActivityEntry.class));
}
}
throw new ProtocolException(HttpServletResponse.SC_BAD_REQUEST, "Activity not found: " + activityId);
@@ -1345,7 +1345,7 @@ public class JsonDbOpensocialService imp
}
}
jsonArray.put(jsonEntry);
- return ImmediateFuture.newInstance(filterFields(jsonEntry, fields, ActivityEntry.class));
+ return Futures.immediateFuture(filterFields(jsonEntry, fields, ActivityEntry.class));
} catch (JSONException je) {
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(), je);
}
@@ -1371,7 +1371,7 @@ public class JsonDbOpensocialService imp
db.getJSONObject(ACTIVITYSTREAMS_TABLE).put(user, newList);
}
}
- return ImmediateFuture.newInstance(null);
+ return Futures.immediateFuture(null);
} catch (JSONException je) {
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(), je);
}
@@ -1388,7 +1388,7 @@ public class JsonDbOpensocialService imp
for (int i = 0; i < activityEntries.length(); i++) {
JSONObject activityEntry = activityEntries.getJSONObject(i);
if (activityEntry.getString(ActivityEntry.Field.ID.toString()).equals(activityId)) {
- return ImmediateFuture.newInstance(filterFields(activityEntry, fields, ActivityEntry.class));
+ return Futures.immediateFuture(filterFields(activityEntry, fields, ActivityEntry.class));
}
}
}
@@ -1418,7 +1418,7 @@ public class JsonDbOpensocialService imp
}
}
Collections.sort(result, Collections.reverseOrder());
- return ImmediateFuture.newInstance(new RestfulCollection<ActivityEntry>(result));
+ return Futures.immediateFuture(new RestfulCollection<ActivityEntry>(result));
} catch (JSONException je) {
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(), je);
}
@@ -1450,7 +1450,7 @@ public class JsonDbOpensocialService imp
}
}
Collections.sort(result, Collections.reverseOrder());
- return ImmediateFuture.newInstance(new RestfulCollection<ActivityEntry>(result));
+ return Futures.immediateFuture(new RestfulCollection<ActivityEntry>(result));
} catch (JSONException je) {
throw new ProtocolException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, je.getMessage(), je);
}
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=1456294&r1=1456293&r2=1456294&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 Thu Mar 14 00:33:48 2013
@@ -20,7 +20,6 @@ package org.apache.shindig.social.openso
import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.common.testing.FakeGadgetToken;
-import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.config.JsonContainerConfig;
import org.apache.shindig.expressions.Expressions;
@@ -42,6 +41,7 @@ import com.google.common.collect.Immutab
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.Futures;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.isNull;
@@ -100,7 +100,7 @@ public class ActivityHandlerTest extends
org.easymock.EasyMock.expect(activityService.getActivities(eq(JOHN_DOE),
eq(new GroupId(group, null)), (String)isNull(), eq(ImmutableSet.<String>of()),
org.easymock.EasyMock.isA(CollectionOptions.class), eq(token))).
- andReturn(ImmediateFuture.newInstance(data));
+ andReturn(Futures.immediateFuture(data));
replay();
assertEquals(data, operation.execute(Maps.<String, String[]>newHashMap(),
@@ -136,7 +136,7 @@ public class ActivityHandlerTest extends
org.easymock.EasyMock.expect(activityService.getActivities(eq(userIdSet),
eq(new GroupId(GroupId.Type.self, null)), eq("appId"),eq(ImmutableSet.<String>of()),
org.easymock.EasyMock.isA((CollectionOptions.class)), eq(token))).andReturn(
- ImmediateFuture.newInstance(data));
+ Futures.immediateFuture(data));
replay();
assertEquals(data, operation.execute(Maps.<String, String[]>newHashMap(),
@@ -154,7 +154,7 @@ public class ActivityHandlerTest extends
org.easymock.EasyMock.expect(activityService.getActivity(eq(JOHN_DOE.iterator().next()),
eq(new GroupId(GroupId.Type.friends, null)),
eq("appId"), eq(ImmutableSet.<String>of()), eq("1"), eq(token))).andReturn(
- ImmediateFuture.newInstance(activity));
+ Futures.immediateFuture(activity));
replay();
assertEquals(activity, operation.execute(Maps.<String, String[]>newHashMap(),
@@ -175,7 +175,7 @@ public class ActivityHandlerTest extends
org.easymock.EasyMock.expect(activityService.createActivity(eq(JOHN_DOE.iterator().next()),
eq(new GroupId(GroupId.Type.self, null)), eq("appId"), eq(ImmutableSet.<String>of()),
- eq(activity), eq(token))).andReturn(ImmediateFuture.newInstance((Void) null));
+ eq(activity), eq(token))).andReturn(Futures.immediateFuture((Void) null));
replay();
return operation.execute(Maps.<String, String[]>newHashMap(),
@@ -206,7 +206,7 @@ public class ActivityHandlerTest extends
org.easymock.EasyMock.expect(activityService.deleteActivities(eq(JOHN_DOE.iterator().next()),
eq(new GroupId(GroupId.Type.self, null)), eq("appId"), eq(ImmutableSet.of("1")),
- eq(token))).andReturn(ImmediateFuture.newInstance((Void) null));
+ eq(token))).andReturn(Futures.immediateFuture((Void) null));
replay();
assertNull(operation.execute(Maps.<String, String[]>newHashMap(), null,
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=1456294&r1=1456293&r2=1456294&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 Thu Mar 14 00:33:48 2013
@@ -28,7 +28,6 @@ import java.util.concurrent.Future;
import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.common.testing.FakeGadgetToken;
-import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.config.JsonContainerConfig;
import org.apache.shindig.expressions.Expressions;
@@ -53,6 +52,7 @@ import com.google.common.collect.Immutab
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.Futures;
/**
* Tests the ActivityStreamsHandler.
@@ -104,7 +104,7 @@ public class ActivityStreamHandlerTest e
org.easymock.EasyMock.expect(service.getActivityEntries(eq(JOHN_DOE),
eq(new GroupId(group, null)), (String)isNull(), eq(ImmutableSet.<String>of()),
org.easymock.EasyMock.isA(CollectionOptions.class), eq(token))).
- andReturn(ImmediateFuture.newInstance(data));
+ andReturn(Futures.immediateFuture(data));
replay();
assertEquals(data, operation.execute(Maps.<String, String[]>newHashMap(),
@@ -140,7 +140,7 @@ public class ActivityStreamHandlerTest e
org.easymock.EasyMock.expect(service.getActivityEntries(eq(userIdSet),
eq(new GroupId(GroupId.Type.self, null)), eq("appId"),eq(ImmutableSet.<String>of()),
org.easymock.EasyMock.isA((CollectionOptions.class)), eq(token))).andReturn(
- ImmediateFuture.newInstance(data));
+ Futures.immediateFuture(data));
replay();
assertEquals(data, operation.execute(Maps.<String, String[]>newHashMap(),
@@ -158,7 +158,7 @@ public class ActivityStreamHandlerTest e
org.easymock.EasyMock.expect(service.getActivityEntry(eq(JOHN_DOE.iterator().next()),
eq(new GroupId(GroupId.Type.friends, null)),
eq("appId"), eq(ImmutableSet.<String>of()), eq("myObjectId123"), eq(token))).andReturn(
- ImmediateFuture.newInstance(entry));
+ Futures.immediateFuture(entry));
replay();
assertEquals(entry, operation.execute(Maps.<String, String[]>newHashMap(),
@@ -180,7 +180,7 @@ public class ActivityStreamHandlerTest e
org.easymock.EasyMock.expect(service.createActivityEntry(eq(JOHN_DOE.iterator().next()),
eq(new GroupId(GroupId.Type.self, null)), eq("appId"), eq(ImmutableSet.<String>of()),
- eq(entry), eq(token))).andReturn(ImmediateFuture.newInstance((ActivityEntry) null));
+ eq(entry), eq(token))).andReturn(Futures.immediateFuture((ActivityEntry) null));
replay();
return operation.execute(Maps.<String, String[]>newHashMap(),
@@ -200,7 +200,7 @@ public class ActivityStreamHandlerTest e
org.easymock.EasyMock.expect(service.createActivityEntry(eq(JOHN_DOE.iterator().next()),
eq(new GroupId(GroupId.Type.self, null)), eq("appId"), eq(ImmutableSet.<String>of()),
- eq(entry), eq(token))).andReturn(ImmediateFuture.newInstance((ActivityEntry) null));
+ eq(entry), eq(token))).andReturn(Futures.immediateFuture((ActivityEntry) null));
replay();
Future<?> future = operation.execute(Maps.<String, String[]>newHashMap(),
@@ -223,7 +223,7 @@ public class ActivityStreamHandlerTest e
org.easymock.EasyMock.expect(service.updateActivityEntry(eq(JOHN_DOE.iterator().next()),
eq(new GroupId(GroupId.Type.self, null)), eq("appId"), eq(ImmutableSet.<String>of()),
- eq(entry), eq("testObject"), eq(token))).andReturn(ImmediateFuture.newInstance((ActivityEntry) null));
+ eq(entry), eq("testObject"), eq(token))).andReturn(Futures.immediateFuture((ActivityEntry) null));
replay();
Future<?> future = operation.execute(Maps.<String, String[]>newHashMap(),
@@ -240,7 +240,7 @@ public class ActivityStreamHandlerTest e
org.easymock.EasyMock.expect(service.deleteActivityEntries(eq(JOHN_DOE.iterator().next()),
eq(new GroupId(GroupId.Type.self, null)), eq("appId"), eq(ImmutableSet.of("myObjectId123")),
- eq(token))).andReturn(ImmediateFuture.newInstance((Void) null));
+ eq(token))).andReturn(Futures.immediateFuture((Void) null));
replay();
assertNull(operation.execute(Maps.<String, String[]>newHashMap(), null,
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java?rev=1456294&r1=1456293&r2=1456294&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java Thu Mar 14 00:33:48 2013
@@ -22,7 +22,6 @@ import static org.easymock.EasyMock.eq;
import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.common.testing.FakeGadgetToken;
-import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.protocol.DataCollection;
import org.apache.shindig.protocol.DefaultHandlerRegistry;
import org.apache.shindig.protocol.HandlerExecutionListener;
@@ -48,6 +47,7 @@ import javax.servlet.http.HttpServletRes
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.Futures;
import org.junit.Before;
import org.junit.Test;
@@ -85,7 +85,7 @@ public class AppDataHandlerTest extends
org.easymock.EasyMock.expect(appDataService.getPersonData(eq(JOHN_DOE),
eq(new GroupId(group, null)),
eq("appId"), eq(ImmutableSet.<String>of()), eq(token)))
- .andReturn(ImmediateFuture.newInstance(data));
+ .andReturn(Futures.immediateFuture(data));
replay();
assertEquals(data, operation.execute(Maps.<String, String[]>newHashMap(),
@@ -119,7 +119,7 @@ public class AppDataHandlerTest extends
org.easymock.EasyMock.expect(appDataService.getPersonData(eq(userIdSet),
eq(new GroupId(GroupId.Type.self, null)),
eq("appId"), eq(ImmutableSet.<String>of()), eq(token)))
- .andReturn(ImmediateFuture.newInstance(data));
+ .andReturn(Futures.immediateFuture(data));
replay();
assertEquals(data, operation.execute(Maps.<String, String[]>newHashMap(),
@@ -139,7 +139,7 @@ public class AppDataHandlerTest extends
org.easymock.EasyMock.expect(appDataService.getPersonData(eq(JOHN_DOE),
eq(new GroupId(GroupId.Type.friends, null)),
eq("appId"), eq(ImmutableSet.of("pandas")), eq(token)))
- .andReturn(ImmediateFuture.newInstance(data));
+ .andReturn(Futures.immediateFuture(data));
replay();
assertEquals(data, operation.execute(params, null, token, converter).get());
@@ -162,7 +162,7 @@ public class AppDataHandlerTest extends
org.easymock.EasyMock.expect(appDataService.updatePersonData(eq(JOHN_DOE.iterator().next()),
eq(new GroupId(GroupId.Type.self, null)),
eq("appId"), eq(ImmutableSet.of("pandas")), eq(values), eq(token)))
- .andReturn(ImmediateFuture.newInstance((Void) null));
+ .andReturn(Futures.immediateFuture((Void) null));
replay();
return operation.execute(params, new StringReader(jsonAppData), token, converter);
}
@@ -252,7 +252,7 @@ public class AppDataHandlerTest extends
EasyMock.expect(appDataService.deletePersonData(eq(JOHN_DOE.iterator().next()),
eq(new GroupId(GroupId.Type.self, null)),
eq("appId"), eq(ImmutableSet.of("pandas")), eq(token)))
- .andReturn(ImmediateFuture.newInstance((Void) null));
+ .andReturn(Futures.immediateFuture((Void) null));
replay();
assertNull(operation.execute(params, null, token, converter).get());
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java?rev=1456294&r1=1456293&r2=1456294&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java Thu Mar 14 00:33:48 2013
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import org.apache.shindig.common.testing.FakeGadgetToken;
-import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.protocol.DefaultHandlerRegistry;
import org.apache.shindig.protocol.HandlerExecutionListener;
import org.apache.shindig.protocol.HandlerRegistry;
@@ -42,6 +41,7 @@ import org.junit.Test;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.Futures;
public class MessageHandlerTest extends Assert {
@@ -77,7 +77,7 @@ public class MessageHandlerTest extends
EasyMock.expect(converter.convertToObject(null, Message.class)).andReturn(message);
EasyMock.expect(messageService.createMessage(sender, "messageHandlerTest", "@outbox", message,
- token)).andReturn(ImmediateFuture.newInstance((Void) null));
+ token)).andReturn(Futures.immediateFuture((Void) null));
EasyMock.replay(messageService, converter);
Modified: shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java?rev=1456294&r1=1456293&r2=1456294&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java (original)
+++ shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/PersonHandlerTest.java Thu Mar 14 00:33:48 2013
@@ -21,7 +21,6 @@ package org.apache.shindig.social.openso
import org.apache.shindig.auth.AnonymousSecurityToken;
import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.common.testing.FakeGadgetToken;
-import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.config.ContainerConfig;
import org.apache.shindig.config.JsonContainerConfig;
import org.apache.shindig.expressions.Expressions;
@@ -46,6 +45,7 @@ import com.google.common.collect.Immutab
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import com.google.common.util.concurrent.Futures;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
@@ -118,7 +118,7 @@ public class PersonHandlerTest extends E
eq(DEFAULT_OPTIONS),
eq(DEFAULT_FIELDS),
eq(token)))
- .andReturn(ImmediateFuture.newInstance(data));
+ .andReturn(Futures.immediateFuture(data));
replay();
assertEquals(data, operation.execute(Maps.<String, String[]>newHashMap(), null,
@@ -139,7 +139,7 @@ public class PersonHandlerTest extends E
eq(DEFAULT_OPTIONS),
eq(DEFAULT_FIELDS),
eq(token)))
- .andReturn(ImmediateFuture.newInstance(data));
+ .andReturn(Futures.immediateFuture(data));
replay();
assertEquals(data, operation.execute(Maps.<String, String[]>newHashMap(),
@@ -178,7 +178,7 @@ public class PersonHandlerTest extends E
eq(JOHN_DOE),
eq(new GroupId(GroupId.Type.friends, null)), eq(options),
eq(ImmutableSortedSet.of("money", "fame", "fortune")), eq(token)))
- .andReturn(ImmediateFuture.newInstance(data));
+ .andReturn(Futures.immediateFuture(data));
replay();
assertEquals(data, operation.execute(params, null, token, converter).get());
@@ -198,7 +198,7 @@ public class PersonHandlerTest extends E
eq(ImmutableSet.of(new UserId(UserId.Type.userId, "jane.doe"))),
eq(new GroupId(GroupId.Type.self, null)), eq(DEFAULT_OPTIONS),
eq(DEFAULT_FIELDS), eq(token)))
- .andReturn(ImmediateFuture.newInstance(data));
+ .andReturn(Futures.immediateFuture(data));
replay();
assertEquals(person, operation.execute(Maps.<String, String[]>newHashMap(),
@@ -213,7 +213,7 @@ public class PersonHandlerTest extends E
Person data = new PersonImpl();
expect(personService.getPerson(eq(JOHN_DOE.iterator().next()),
- eq(DEFAULT_FIELDS), eq(token))).andReturn(ImmediateFuture.newInstance(data));
+ eq(DEFAULT_FIELDS), eq(token))).andReturn(Futures.immediateFuture(data));
replay();
assertEquals(data, operation.execute(Maps.<String, String[]>newHashMap(),
@@ -228,7 +228,7 @@ public class PersonHandlerTest extends E
Person data = new PersonImpl();
expect(personService.getPerson(eq(ANONYMOUS),
- eq(DEFAULT_FIELDS), eq(token))).andReturn(ImmediateFuture.newInstance(data));
+ eq(DEFAULT_FIELDS), eq(token))).andReturn(Futures.immediateFuture(data));
replay();
assertEquals(data, operation.execute(Maps.<String, String[]>newHashMap(),
@@ -249,7 +249,7 @@ public class PersonHandlerTest extends E
eq(new GroupId(GroupId.Type.self, null)),
eq(DEFAULT_OPTIONS),
eq(DEFAULT_FIELDS),
- eq(token))).andReturn(ImmediateFuture.newInstance(data));
+ eq(token))).andReturn(Futures.immediateFuture(data));
replay();
assertEquals(data, operation.execute(Maps.<String, String[]>newHashMap(),
@@ -270,7 +270,7 @@ public class PersonHandlerTest extends E
expect(personService.updatePerson(eq(JOHN_DOE.iterator().next()),
eq(person),
- eq(token))).andReturn(ImmediateFuture.newInstance(person));
+ eq(token))).andReturn(Futures.immediateFuture(person));
replay();
assertEquals(person, operation.execute(Maps.<String, String[]>newHashMap(),