Author: doll
Date: Tue Sep 9 16:37:25 2008
New Revision: 693655
URL: http://svn.apache.org/viewvc?rev=693655&view=rev
Log:
SHINDIG-583
Patch from Bob Evans. Adds the servlet request as a parameter to handleRequest
so that containers can use the param when extending the servlet.
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java?rev=693655&r1=693654&r2=693655&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java
Tue Sep 9 16:37:25 2008
@@ -82,7 +82,7 @@
/**
* Delivers a request item to the appropriate DataRequestHandler.
*/
- protected Future<?> handleRequestItem(RequestItem requestItem) {
+ protected Future<?> handleRequestItem(RequestItem requestItem,
HttpServletRequest servletRequest) {
Class<? extends DataRequestHandler> handlerClass =
handlers.get(requestItem.getService());
if (handlerClass == null) {
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java?rev=693655&r1=693654&r2=693655&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/DataServiceServlet.java
Tue Sep 9 16:37:25 2008
@@ -26,7 +26,6 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.logging.Logger;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -97,7 +96,7 @@
HttpServletResponse servletResponse, SecurityToken token,
BeanConverter converter) throws IOException {
RestfulRequestItem requestItem = new RestfulRequestItem(servletRequest,
token, converter);
- ResponseItem responseItem =
getResponseItem(handleRequestItem(requestItem));
+ ResponseItem responseItem = getResponseItem(handleRequestItem(requestItem,
servletRequest));
if (responseItem.getError() == null) {
PrintWriter writer = servletResponse.getWriter();
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java?rev=693655&r1=693654&r2=693655&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/JsonRpcServlet.java
Tue Sep 9 16:37:25 2008
@@ -24,7 +24,6 @@
import org.apache.shindig.social.opensocial.spi.RestfulCollection;
import com.google.common.collect.Lists;
-
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.json.JSONArray;
@@ -34,7 +33,6 @@
import java.io.IOException;
import java.util.List;
import java.util.concurrent.Future;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -102,7 +100,7 @@
for (int i = 0; i < batch.length(); i++) {
JSONObject batchObj = batch.getJSONObject(i);
RpcRequestItem requestItem = new RpcRequestItem(batchObj, token,
jsonConverter);
- responses.add(handleRequestItem(requestItem));
+ responses.add(handleRequestItem(requestItem, servletRequest));
}
// Resolve each Future into a response.
@@ -129,7 +127,7 @@
// Resolve each Future into a response.
// TODO: should use shared deadline across each request
- ResponseItem response = getResponseItem(handleRequestItem(requestItem));
+ ResponseItem response = getResponseItem(handleRequestItem(requestItem,
servletRequest));
JSONObject result = getJSONResponse(key, response);
servletResponse.getWriter().write(result.toString());
}
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java?rev=693655&r1=693654&r2=693655&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
Tue Sep 9 16:37:25 2008
@@ -18,6 +18,7 @@
package org.apache.shindig.social.opensocial.service;
import org.apache.shindig.common.testing.FakeGadgetToken;
+import org.apache.shindig.common.testing.FakeHttpServletRequest;
import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.social.ResponseError;
import org.apache.shindig.social.SocialApiTestsGuiceModule;
@@ -182,7 +183,7 @@
RestfulRequestItem requestItem = new RestfulRequestItem("/ahhh!", "GET",
null,
FAKE_GADGET_TOKEN, jsonConverter);
try {
- servlet.handleRequestItem(requestItem).get();
+ servlet.handleRequestItem(requestItem, new
FakeHttpServletRequest()).get();
fail();
} catch (ExecutionException ee) {
assertTrue(ee.getCause() instanceof SocialSpiException);
