Author: evan
Date: Wed Aug 27 09:33:27 2008
New Revision: 689516
URL: http://svn.apache.org/viewvc?rev=689516&view=rev
Log:
SecurityToken and authType are now set as request attributes.
This replaces wrapping servlets using HttpServletWrapper subclass that has a
getToken() and getAuthType() method.
(note: in preparation for other auth handler changes)
Added:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthInfo.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthInfoTest.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/ApiServlet.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/DataServiceServletTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
Added:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthInfo.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthInfo.java?rev=689516&view=auto
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthInfo.java
(added)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthInfo.java
Wed Aug 27 09:33:27 2008
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.apache.shindig.social.core.oauth;
+
+
+import org.apache.shindig.common.SecurityToken;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Class to get/set authorization information on a servlet request.
+ * Used by auth filters.
+ */
+public class AuthInfo {
+
+ /**
+ * Constants for request attribute keys
+ */
+ enum Attribute {
+ /** The security token */
+ SECURITY_TOKEN,
+ /** The named auth type */
+ AUTH_TYPE;
+
+ public String getId() {
+ return Attribute.class.getName() + "." + this.name();
+ }
+ }
+
+ /**
+ * Get the security token for this request.
+ *
+ * @param req The request
+ * @return The security token
+ */
+ public static SecurityToken getSecurityToken(HttpServletRequest req) {
+ return getRequestAttribute(req, Attribute.SECURITY_TOKEN);
+ }
+
+ /**
+ * Get the hosted domain for this request.
+ *
+ * @param req The request
+ * @return The domain, or [EMAIL PROTECTED] null} if no domain was found
+ */
+ public static String getAuthType(HttpServletRequest req) {
+ return getRequestAttribute(req, Attribute.AUTH_TYPE);
+ }
+
+ /**
+ * Set the security token for the request.
+ *
+ * @param req The request
+ * @param token The security token
+ */
+ public static void setSecurityToken(HttpServletRequest req, SecurityToken
token) {
+ setRequestAttribute(req, Attribute.SECURITY_TOKEN, token);
+ }
+
+ /**
+ * Set the auth type for the request.
+ *
+ * @param req The request
+ * @param authType The named auth type
+ */
+ public static void setAuthType(HttpServletRequest req, String authType) {
+ setRequestAttribute(req, Attribute.AUTH_TYPE, authType);
+ }
+
+ /**
+ * Set a standard request attribute.
+ *
+ * @param req The request
+ * @param att The attribute
+ * @param value The value
+ */
+ private static<T> void setRequestAttribute(HttpServletRequest req,
+ Attribute att, T value) {
+ req.setAttribute(att.getId(), value);
+ }
+
+ /**
+ * Get a standard attribute
+ *
+ * @param req The request
+ * @param att The attribute
+ * @return The value
+ */
+ @SuppressWarnings("unchecked")
+ private static<T> T getRequestAttribute(HttpServletRequest req,
+ Attribute att) {
+ return (T)req.getAttribute(att.getId());
+ }
+}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java?rev=689516&r1=689515&r2=689516&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/AuthenticationServletFilter.java
Wed Aug 27 09:33:27 2008
@@ -33,7 +33,6 @@
import javax.servlet.ServletResponse;
import javax.servlet.UnavailableException;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
import java.io.IOException;
import java.util.List;
@@ -86,32 +85,14 @@
for (AuthenticationHandler handler : handlers) {
SecurityToken token = handler.getSecurityTokenFromRequest(req);
if (token != null) {
- chain.doFilter(new SecurityTokenRequest(req, token,
handler.getName()), response);
+ AuthInfo.setAuthType(req, handler.getName());
+ AuthInfo.setSecurityToken(req, token);
+ chain.doFilter(req, response);
return;
}
}
// We did not find a security token so we will just pass null
- chain.doFilter(new SecurityTokenRequest(req, null, null), response);
- }
-
- public static class SecurityTokenRequest extends HttpServletRequestWrapper {
- private final SecurityToken token;
- private final String authType;
-
- public SecurityTokenRequest(HttpServletRequest request, SecurityToken
token, String authType) {
- super(request);
- this.token = token;
- this.authType = authType;
- }
-
- public SecurityToken getToken() {
- return token;
- }
-
- @Override
- public String getAuthType() {
- return authType;
- }
+ chain.doFilter(req, response);
}
}
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=689516&r1=689515&r2=689516&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
Wed Aug 27 09:33:27 2008
@@ -22,7 +22,7 @@
import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.social.ResponseError;
import org.apache.shindig.social.ResponseItem;
-import org.apache.shindig.social.core.oauth.AuthenticationServletFilter;
+import org.apache.shindig.social.core.oauth.AuthInfo;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import com.google.inject.Inject;
@@ -63,7 +63,7 @@
}
protected SecurityToken getSecurityToken(HttpServletRequest servletRequest) {
- return ((AuthenticationServletFilter.SecurityTokenRequest)
servletRequest).getToken();
+ return AuthInfo.getSecurityToken(servletRequest);
}
/**
Added:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthInfoTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthInfoTest.java?rev=689516&view=auto
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthInfoTest.java
(added)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/core/oauth/AuthInfoTest.java
Wed Aug 27 09:33:27 2008
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.apache.shindig.social.core.oauth;
+
+import junit.framework.TestCase;
+
+import org.apache.shindig.common.SecurityToken;
+import org.apache.shindig.common.testing.FakeGadgetToken;
+import org.apache.shindig.common.testing.FakeHttpServletRequest;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class AuthInfoTest extends TestCase {
+
+ public void testToken() throws Exception {
+ HttpServletRequest req = new FakeHttpServletRequest();
+ SecurityToken token = new FakeGadgetToken();
+ AuthInfo.setSecurityToken(req, token);
+ assertEquals(token, AuthInfo.getSecurityToken(req));
+ }
+
+ public void testAuthType() throws Exception {
+ HttpServletRequest req = new FakeHttpServletRequest();
+ AuthInfo.setAuthType(req, "FakeAuth");
+ assertEquals("FakeAuth", AuthInfo.getAuthType(req));
+ }
+}
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java?rev=689516&r1=689515&r2=689516&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
Wed Aug 27 09:33:27 2008
@@ -19,7 +19,6 @@
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.social.SocialApiTestsGuiceModule;
-import org.apache.shindig.social.core.oauth.AuthenticationServletFilter;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanXmlConverter;
import org.apache.shindig.social.opensocial.service.ActivityHandler;
@@ -46,6 +45,7 @@
import java.util.Vector;
import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
@@ -54,7 +54,7 @@
public abstract class AbstractLargeRestfulTests extends TestCase {
- private AuthenticationServletFilter.SecurityTokenRequest req;
+ private HttpServletRequest req;
private HttpServletResponse res;
@@ -76,7 +76,7 @@
servlet.setBeanConverters(new BeanJsonConverter(
Guice.createInjector(new SocialApiTestsGuiceModule())), new
BeanXmlConverter());
- req =
EasyMock.createMock(AuthenticationServletFilter.SecurityTokenRequest.class);
+ req = EasyMock.createMock(HttpServletRequest.class);
res = EasyMock.createMock(HttpServletResponse.class);
}
@@ -102,7 +102,7 @@
EasyMock.expect(req.getParameter("format")).andStubReturn(null);
EasyMock.expect(req.getParameter("X-HTTP-Method-Override")).andStubReturn(method);
- EasyMock.expect(req.getToken()).andStubReturn(FAKE_GADGET_TOKEN);
+
EasyMock.expect(req.getAttribute(EasyMock.isA(String.class))).andReturn(FAKE_GADGET_TOKEN);
Vector<String> vector = new Vector<String>(extraParams.keySet());
EasyMock.expect(req.getParameterNames()).andStubReturn(vector.elements());
@@ -123,7 +123,7 @@
final InputStream stream = new ByteArrayInputStream(postData.getBytes());
ServletInputStream servletStream = new ServletInputStream() {
- public int read() throws IOException {
+ @Override public int read() throws IOException {
return stream.read();
}
};
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=689516&r1=689515&r2=689516&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
Wed Aug 27 09:33:27 2008
@@ -17,23 +17,19 @@
*/
package org.apache.shindig.social.opensocial.service;
-import org.apache.shindig.common.SecurityTokenException;
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.social.ResponseError;
import org.apache.shindig.social.ResponseItem;
import org.apache.shindig.social.SocialApiTestsGuiceModule;
-import org.apache.shindig.social.core.oauth.AuthenticationServletFilter;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanXmlConverter;
import org.apache.shindig.social.opensocial.spi.RestfulItem;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import com.google.common.collect.Maps;
import junit.framework.TestCase;
import org.easymock.classextension.EasyMock;
-import org.json.JSONObject;
import java.io.IOException;
import java.io.PrintWriter;
@@ -41,8 +37,8 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
public class DataServiceServletTest extends TestCase {
@@ -50,7 +46,7 @@
private static final FakeGadgetToken FAKE_GADGET_TOKEN = new
FakeGadgetToken()
.setOwnerId("john.doe").setViewerId("john.doe");
- private AuthenticationServletFilter.SecurityTokenRequest req;
+ private HttpServletRequest req;
private HttpServletResponse res;
private DataServiceServlet servlet;
private PersonHandler peopleHandler;
@@ -61,14 +57,14 @@
private BeanXmlConverter xmlConverter;
private final ServletInputStream dummyPostData = new ServletInputStream() {
- public int read() throws IOException {
+ @Override public int read() {
return -1;
}
};
- protected void setUp() throws Exception {
+ @Override protected void setUp() throws Exception {
servlet = new DataServiceServlet();
- req =
EasyMock.createMock(AuthenticationServletFilter.SecurityTokenRequest.class);
+ req = EasyMock.createMock(HttpServletRequest.class);
res = EasyMock.createMock(HttpServletResponse.class);
jsonConverter = EasyMock.createMock(BeanJsonConverter.class);
xmlConverter = EasyMock.createMock(BeanXmlConverter.class);
@@ -169,7 +165,7 @@
}
private void setupRequest(String pathInfo, String actualMethod, String
overrideMethod)
- throws IOException, SecurityTokenException {
+ throws IOException {
req.setCharacterEncoding("UTF-8");
EasyMock.expect(req.getInputStream()).andStubReturn(dummyPostData);
@@ -180,7 +176,7 @@
overrideMethod);
EasyMock.expect(req.getParameter(DataServiceServlet.FORMAT_PARAM)).andReturn(null);
- EasyMock.expect(req.getToken()).andReturn(FAKE_GADGET_TOKEN);
+
EasyMock.expect(req.getAttribute(EasyMock.isA(String.class))).andReturn(FAKE_GADGET_TOKEN);
}
public void testInvalidRoute() throws Exception {
@@ -227,12 +223,11 @@
return true;
}
- public ResponseItem get() throws InterruptedException, ExecutionException {
+ public ResponseItem get() throws ExecutionException {
throw new ExecutionException(new RuntimeException("FAILED"));
}
- public ResponseItem get(long timeout, TimeUnit unit)
- throws InterruptedException, ExecutionException, TimeoutException {
+ public ResponseItem get(long timeout, TimeUnit unit) {
return null;
}
}
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java?rev=689516&r1=689515&r2=689516&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/JsonRpcServletTest.java
Wed Aug 27 09:33:27 2008
@@ -17,11 +17,9 @@
*/
package org.apache.shindig.social.opensocial.service;
-import org.apache.shindig.common.SecurityTokenException;
import org.apache.shindig.common.testing.FakeGadgetToken;
import org.apache.shindig.common.util.ImmediateFuture;
import org.apache.shindig.social.ResponseItem;
-import org.apache.shindig.social.core.oauth.AuthenticationServletFilter;
import org.apache.shindig.social.core.util.BeanJsonConverter;
import org.apache.shindig.social.core.util.BeanXmlConverter;
import org.apache.shindig.social.opensocial.spi.RestfulItem;
@@ -40,7 +38,8 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
@@ -51,7 +50,7 @@
private static final FakeGadgetToken FAKE_GADGET_TOKEN = new
FakeGadgetToken()
.setOwnerId("john.doe").setViewerId("john.doe");
- private AuthenticationServletFilter.SecurityTokenRequest req;
+ private HttpServletRequest req;
private HttpServletResponse res;
private JsonRpcServlet servlet;
@@ -64,9 +63,9 @@
private BeanJsonConverter jsonConverter;
private BeanXmlConverter xmlConverter;
- protected void setUp() throws Exception {
+ @Override protected void setUp() throws Exception {
servlet = new JsonRpcServlet();
- req =
EasyMock.createMock(AuthenticationServletFilter.SecurityTokenRequest.class);
+ req = EasyMock.createMock(HttpServletRequest.class);
res = EasyMock.createMock(HttpServletResponse.class);
jsonConverter = EasyMock.createMock(BeanJsonConverter.class);
xmlConverter = EasyMock.createMock(BeanXmlConverter.class);
@@ -185,7 +184,7 @@
setupInjector();
String resultObject = "my lovely json";
- RestfulItem response = new RestfulItem<String>(resultObject);
+ RestfulItem<String> response = new RestfulItem<String>(resultObject);
Future<? extends ResponseItem> responseItemFuture =
ImmediateFuture.newInstance(response);
EasyMock.expect(peopleHandler.handleItem(EasyMock.isA(RequestItem.class)));
@@ -213,11 +212,11 @@
EasyMock.expect(req.getParameterMap()).andStubReturn(
Maps.immutableMap("method",new String[]{"people.get"},"id", new
String[]{"1"}));
EasyMock.expect(req.getMethod()).andStubReturn("GET");
- EasyMock.expect(req.getToken()).andReturn(FAKE_GADGET_TOKEN);
+
EasyMock.expect(req.getAttribute(EasyMock.isA(String.class))).andReturn(FAKE_GADGET_TOKEN);
setupInjector();
String resultObject = "my lovely json";
- RestfulItem response = new RestfulItem<String>(resultObject);
+ RestfulItem<String> response = new RestfulItem<String>(resultObject);
Future<? extends ResponseItem> responseItemFuture =
ImmediateFuture.newInstance(response);
EasyMock.expect(peopleHandler.handleItem(EasyMock.isA(RequestItem.class)));
@@ -239,10 +238,10 @@
}
private void setupRequest(String json)
- throws IOException, SecurityTokenException {
+ throws IOException {
EasyMock.expect(req.getReader()).andStubReturn(new BufferedReader(new
StringReader(json)));
EasyMock.expect(req.getMethod()).andStubReturn("POST");
- EasyMock.expect(req.getToken()).andReturn(FAKE_GADGET_TOKEN);
+
EasyMock.expect(req.getAttribute(EasyMock.isA(String.class))).andReturn(FAKE_GADGET_TOKEN);
}
/**
@@ -262,12 +261,11 @@
return true;
}
- public ResponseItem get() throws InterruptedException, ExecutionException {
+ public ResponseItem get() throws ExecutionException {
throw new ExecutionException(new RuntimeException("FAILED"));
}
- public ResponseItem get(long timeout, TimeUnit unit)
- throws InterruptedException, ExecutionException, TimeoutException {
+ public ResponseItem get(long timeout, TimeUnit unit) {
return null;
}
}
Modified:
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java?rev=689516&r1=689515&r2=689516&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/RestfulRequestItemTest.java
Wed Aug 27 09:33:27 2008
@@ -18,7 +18,6 @@
package org.apache.shindig.social.opensocial.service;
import org.apache.shindig.common.testing.FakeGadgetToken;
-import org.apache.shindig.social.core.oauth.AuthenticationServletFilter;
import org.apache.shindig.social.opensocial.spi.GroupId;
import org.apache.shindig.social.opensocial.spi.PersonService;
import org.apache.shindig.social.opensocial.spi.UserId;
@@ -32,6 +31,8 @@
import java.util.Collections;
+import javax.servlet.http.HttpServletRequest;
+
public class RestfulRequestItemTest extends TestCase {
private static final FakeGadgetToken FAKE_TOKEN = new FakeGadgetToken();
@@ -40,7 +41,7 @@
private RestfulRequestItem request;
- protected void setUp() throws Exception {
+ @Override protected void setUp() throws Exception {
super.setUp();
request = new RestfulRequestItem(
DEFAULT_PATH + "?fields=huey,dewey,louie", "GET",
@@ -59,8 +60,7 @@
}
public void testGetHttpMethodFromParameter() throws Exception {
- AuthenticationServletFilter.SecurityTokenRequest overridden =
-
EasyMock.createMock(AuthenticationServletFilter.SecurityTokenRequest.class);
+ HttpServletRequest overridden =
EasyMock.createMock(HttpServletRequest.class);
EasyMock.expect(overridden.getParameter(RestfulRequestItem.X_HTTP_METHOD_OVERRIDE))
.andReturn("DELETE");
EasyMock.replay(overridden);
