You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by zh...@apache.org on 2010/12/11 00:26:16 UTC
svn commit: r1044534 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/servlet/
test/java/org/apache/shindig/gadgets/servlet/
Author: zhoresh
Date: Fri Dec 10 23:26:16 2010
New Revision: 1044534
URL: http://svn.apache.org/viewvc?rev=1044534&view=rev
Log:
http://codereview.appspot.com/3574041/
GadgetsHandlerApi cleanups
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java?rev=1044534&r1=1044533&r2=1044534&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandler.java Fri Dec 10 23:26:16 2010
@@ -31,6 +31,7 @@ import org.apache.shindig.gadgets.http.H
import org.apache.shindig.gadgets.process.ProcessingException;
import org.apache.shindig.gadgets.servlet.GadgetsHandlerApi.RenderingContext;
import org.apache.shindig.gadgets.spec.GadgetSpec;
+import org.apache.shindig.gadgets.uri.UriCommon;
import org.apache.shindig.protocol.BaseRequestItem;
import org.apache.shindig.protocol.Operation;
import org.apache.shindig.protocol.ProtocolException;
@@ -81,9 +82,44 @@ public class GadgetsHandler {
private static final List<String> DEFAULT_CAJA_FIELDS = ImmutableList.of("*");
private static final List<String> DEFAULT_JS_FIELDS = ImmutableList.of("jsUrl");
-
+
private static final Logger LOG = Logger.getLogger(GadgetsHandler.class.getName());
+ /**
+ * Enum to list the used JSON/JSONP request parameters
+ * It mostly reference the UriCommon fields for consistency,
+ * This enum defined the API names, Do not change the names!
+ */
+ enum Param {
+ IDS("ids"),
+ CONTAINER(UriCommon.Param.CONTAINER.getKey()),
+ FIELDS("fields"),
+ DEBUG(UriCommon.Param.DEBUG),
+ NO_CACHE(UriCommon.Param.NO_CACHE),
+ REFRESH(UriCommon.Param.REFRESH),
+ LANG(UriCommon.Param.LANG),
+ COUNTRY(UriCommon.Param.COUNTRY),
+ VIEW(UriCommon.Param.VIEW),
+ RENDER_TYPE("render"),
+ SANITIZE(UriCommon.Param.SANITIZE),
+ GADGET(UriCommon.Param.GADGET),
+ FALLBACK_URL(UriCommon.Param.FALLBACK_URL_PARAM),
+ REWRITE_MIME(UriCommon.Param.REWRITE_MIME_TYPE),
+ NO_EXPAND(UriCommon.Param.NO_EXPAND),
+ RESIZE_HEIGHT(UriCommon.Param.RESIZE_HEIGHT),
+ RESIZE_WIDTH(UriCommon.Param.RESIZE_WIDTH),
+ RESIZE_QUALITY(UriCommon.Param.RESIZE_QUALITY),
+ FEATURES("features"),
+ CONTAINER_MODE(UriCommon.Param.CONTAINER_MODE),
+ ONLOAD(UriCommon.Param.ONLOAD),
+ MIME_TYPE("mime_type");
+
+ private final String name;
+ Param(String name) { this.name = name; }
+ Param(UriCommon.Param param) { this.name = param.getKey(); }
+ String getName() { return name; }
+ }
+
protected final ExecutorService executor;
protected final GadgetsHandlerService handlerService;
@@ -213,12 +249,12 @@ public class GadgetsHandler {
private abstract class AbstractExecutor {
public Map<String, GadgetsHandlerApi.BaseResponse> execute(BaseRequestItem request) {
- Set<String> gadgetUrls = ImmutableSet.copyOf(request.getListParameter("ids"));
+ Set<String> gadgetUrls = ImmutableSet.copyOf(request.getListParameter(Param.IDS.getName()));
if (gadgetUrls.isEmpty()) {
return ImmutableMap.of();
}
- if (Strings.isNullOrEmpty(request.getParameter("container"))) {
+ if (Strings.isNullOrEmpty(request.getParameter(Param.CONTAINER.getName()))) {
throw new ProtocolException(HttpServletResponse.SC_BAD_REQUEST,
"Missing container for request.");
}
@@ -343,21 +379,33 @@ public class GadgetsHandler {
throw new ProcessingException("Bad url - " + url, HttpServletResponse.SC_BAD_REQUEST);
}
this.request = request;
- this.container = request.getParameter("container");
+ this.container = request.getParameter(Param.CONTAINER.getName());
this.fields = processFields(request, defaultFields);
}
- protected Boolean getBooleanParam(BaseRequestItem request, String field) {
- String val = request.getParameter(field);
+ protected String getParam(BaseRequestItem request, Param field) {
+ return request.getParameter(field.getName());
+ }
+
+ protected String getParam(BaseRequestItem request, Param field, String defaultValue) {
+ return request.getParameter(field.getName(), defaultValue);
+ }
+
+ protected List<String> getListParam(BaseRequestItem request, Param field) {
+ return request.getListParameter(field.getName());
+ }
+
+ protected Boolean getBooleanParam(BaseRequestItem request, Param field) {
+ String val = request.getParameter(field.getName());
if (val != null) {
return "1".equals(val) || Boolean.valueOf(val);
}
return false;
}
- protected Integer getIntegerParam(BaseRequestItem request, String field)
+ protected Integer getIntegerParam(BaseRequestItem request, Param field)
throws ProcessingException {
- String val = request.getParameter(field);
+ String val = request.getParameter(field.getName());
Integer intVal = null;
if (val != null) {
try {
@@ -399,14 +447,13 @@ public class GadgetsHandler {
public JsRequestData(BaseRequestItem request) throws ProcessingException {
super(null, request, DEFAULT_JS_FIELDS);
- this.ignoreCache = getBooleanParam(request, "ignoreCache");
- this.debug = getBooleanParam(request, "debug");
- this.refresh = getIntegerParam(request, "refresh");
- this.features = request.getListParameter("features");
- this.context = (getBooleanParam(request, "c") ?
- RenderingContext.CONTAINER : RenderingContext.GADGET);
- this.onload = request.getParameter("onload");
- this.gadget = request.getParameter("gadget");
+ this.ignoreCache = getBooleanParam(request, Param.NO_CACHE);
+ this.debug = getBooleanParam(request, Param.DEBUG);
+ this.refresh = getIntegerParam(request, Param.REFRESH);
+ this.features = getListParam(request, Param.FEATURES);
+ this.context = getRenderingContext(getParam(request, Param.CONTAINER_MODE));
+ this.onload = getParam(request, Param.ONLOAD);
+ this.gadget = getParam(request, Param.GADGET);
}
public RenderingContext getContext() { return context; }
@@ -418,6 +465,16 @@ public class GadgetsHandler {
public String getGadget() { return gadget; }
}
+ private RenderingContext getRenderingContext(String param) {
+ RenderingContext context = RenderingContext.GADGET;
+ if ("1".equals(param)) {
+ context = RenderingContext.CONTAINER;
+ } else if ("2".equals(param)) {
+ context = RenderingContext.CONFIGURED_GADGET;
+ }
+ return context;
+ }
+
protected class ProxyRequestData extends AbstractRequest
implements GadgetsHandlerApi.ProxyRequest {
@@ -428,29 +485,27 @@ public class GadgetsHandler {
private final String fallbackUrl;
private final String mimetype;
private final boolean sanitize;
- private final boolean cajole;
private final GadgetsHandlerApi.ImageParams imageParams;
public ProxyRequestData(String url, BaseRequestItem request) throws ProcessingException {
super(url, request, DEFAULT_PROXY_FIELDS);
- this.ignoreCache = getBooleanParam(request, "ignoreCache");
- this.debug = getBooleanParam(request, "debug");
- this.sanitize = getBooleanParam(request, "sanitize");
- this.cajole = getBooleanParam(request, "cajole");
- this.gadget = request.getParameter("gadget");
- this.fallbackUrl = request.getParameter("fallback_url");
- this.mimetype = request.getParameter("rewriteMime");
- this.refresh = getIntegerParam(request, "refresh");
+ this.ignoreCache = getBooleanParam(request, Param.NO_CACHE);
+ this.debug = getBooleanParam(request, Param.DEBUG);
+ this.sanitize = getBooleanParam(request, Param.SANITIZE);
+ this.gadget = getParam(request, Param.GADGET);
+ this.fallbackUrl = getParam(request, Param.FALLBACK_URL);
+ this.mimetype = getParam(request, Param.REWRITE_MIME);
+ this.refresh = getIntegerParam(request, Param.REFRESH);
imageParams = getImageParams(request);
}
private GadgetsHandlerApi.ImageParams getImageParams(BaseRequestItem request)
throws ProcessingException {
GadgetsHandlerApi.ImageParams params = null;
- Boolean doNotExpand = getBooleanParam(request, "no_expand");
- Integer height = getIntegerParam(request, "resize_h");
- Integer width = getIntegerParam(request, "resize_w");
- Integer quality = getIntegerParam(request, "resize_q");
+ Boolean doNotExpand = getBooleanParam(request, Param.NO_EXPAND);
+ Integer height = getIntegerParam(request, Param.RESIZE_HEIGHT);
+ Integer width = getIntegerParam(request, Param.RESIZE_WIDTH);
+ Integer quality = getIntegerParam(request, Param.RESIZE_QUALITY);
if (height != null || width != null) {
return beanDelegator.createDelegator(null, GadgetsHandlerApi.ImageParams.class,
@@ -491,10 +546,6 @@ public class GadgetsHandler {
return sanitize;
}
- public boolean getCajole() {
- return cajole;
- }
-
public String getGadget() {
return gadget;
}
@@ -508,9 +559,9 @@ public class GadgetsHandler {
super(url, request, DEFAULT_TOKEN_FIELDS);
}
- public GadgetsHandlerApi.TokenData getToken() {
+ public GadgetsHandlerApi.AuthContext getAuthContext() {
return beanDelegator.createDelegator(
- request.getToken(), GadgetsHandlerApi.TokenData.class);
+ request.getToken(), GadgetsHandlerApi.AuthContext.class);
}
}
@@ -533,12 +584,12 @@ public class GadgetsHandler {
implements GadgetsHandlerApi.CajaRequest {
private final String mimeType;
private final boolean debug;
-
+
public CajaRequestData(String url, BaseRequestItem request)
throws ProcessingException {
super(url, request, DEFAULT_CAJA_FIELDS);
- this.mimeType = request.getParameter("mime-type", "text/html");
- this.debug = getBooleanParam(request, "debug");
+ this.mimeType = getParam(request, Param.MIME_TYPE, "text/html");
+ this.debug = getBooleanParam(request, Param.DEBUG);
}
public String getMimeType() {
@@ -565,9 +616,9 @@ public class GadgetsHandler {
this.locale =
(lang != null && country != null) ? new Locale(lang, country) : (lang != null)
? new Locale(lang) : GadgetSpec.DEFAULT_LOCALE;
- this.ignoreCache = getBooleanParam(request, "ignoreCache");
- this.debug = getBooleanParam(request, "debug");
- this.renderingType = GadgetsHandler.getRenderingType(request.getParameter("render"));
+ this.ignoreCache = getBooleanParam(request, Param.NO_CACHE);
+ this.debug = getBooleanParam(request, Param.DEBUG);
+ this.renderingType = GadgetsHandler.getRenderingType(getParam(request, Param.RENDER_TYPE));
}
public int getModuleId() {
@@ -587,12 +638,12 @@ public class GadgetsHandler {
}
public String getView() {
- return request.getParameter("view", "default");
+ return getParam(request, Param.VIEW, "default");
}
- public GadgetsHandlerApi.TokenData getToken() {
+ public GadgetsHandlerApi.AuthContext getAuthContext() {
return beanDelegator.createDelegator(
- request.getToken(), GadgetsHandlerApi.TokenData.class);
+ request.getToken(), GadgetsHandlerApi.AuthContext.class);
}
public GadgetsHandlerApi.RenderingType getRenderingType() {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java?rev=1044534&r1=1044533&r2=1044534&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerApi.java Fri Dec 10 23:26:16 2010
@@ -66,7 +66,7 @@ public class GadgetsHandlerApi {
public boolean getIgnoreCache();
public boolean getDebug();
public String getView();
- public TokenData getToken();
+ public AuthContext getAuthContext();
public RenderingType getRenderingType();
}
@@ -77,7 +77,7 @@ public class GadgetsHandlerApi {
IFRAME_CAJOLED
}
- public interface TokenData {
+ public interface AuthContext {
public String getOwnerId();
public String getViewerId();
public String getDomain();
@@ -173,7 +173,7 @@ public class GadgetsHandlerApi {
}
public interface TokenRequest extends BaseRequest {
- public TokenData getToken();
+ public AuthContext getAuthContext();
// TODO: Consider support container controlled token duration
// public Long getDurationSeconds();
}
@@ -193,13 +193,13 @@ public class GadgetsHandlerApi {
public String getJs();
public List<Message> getMessages();
}
-
+
public interface Message {
public MessageLevel getLevel();
public String getName();
public String getMessage();
}
-
+
public enum MessageLevel {
UNKNOWN,
// Fine grained info about internal progress
@@ -228,7 +228,6 @@ public class GadgetsHandlerApi {
public String getFallbackUrl();
public String getRewriteMimeType();
public boolean getSanitize();
- public boolean getCajole();
public ImageParams getImageParams();
}
@@ -267,7 +266,7 @@ public class GadgetsHandlerApi {
}
public enum RenderingContext {
- GADGET, CONTAINER
+ GADGET, CONTAINER, CONFIGURED_GADGET
}
public interface JsResponse extends BaseResponse {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java?rev=1044534&r1=1044533&r2=1044534&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java Fri Dec 10 23:26:16 2010
@@ -187,7 +187,7 @@ public class GadgetsHandlerService {
verifyBaseParams(request, true);
Set<String> fields = beanFilter.processBeanFields(request.getFields());
- SecurityToken tokenData = convertToken(request.getToken(), request.getContainer(),
+ SecurityToken tokenData = convertAuthContext(request.getAuthContext(), request.getContainer(),
request.getUrl().toString());
String token = securityTokenCodec.encodeToken(tokenData);
Long expiryTimeMs = securityTokenCodec.getTokenExpiration(tokenData);
@@ -251,7 +251,7 @@ public class GadgetsHandlerService {
HttpResponse.SC_INTERNAL_SERVER_ERROR);
}
}
-
+
/**
* Convert message level to Shindig's serializable message type
*/
@@ -284,38 +284,33 @@ public class GadgetsHandlerService {
verifyBaseParams(request, true);
Set<String> fields = beanFilter.processBeanFields(request.getFields());
- try {
- MessageContext mc = new MessageContext();
- CajoledResult result =
- cajaContentRewriter.rewrite(request.getUrl(), request.getContainer(),
- request.getMimeType(), true /* only support es53 */, request.getDebug());
- String html = null;
- String js = null;
- if (!result.hasErrors && null != result.html) {
- html = Nodes.render(result.html);
- }
-
- if (!result.hasErrors && null != result.js) {
- StringBuilder builder = new StringBuilder();
- TokenConsumer tc = request.getDebug() ?
- new JsPrettyPrinter(new Concatenator(builder))
- : new JsMinimalPrinter(new Concatenator(builder));
- RenderContext rc = new RenderContext(tc)
- .withAsciiOnly(true)
- .withEmbeddable(true);
- result.js.render(rc);
- rc.getOut().noMoreTokens();
- js = builder.toString();
- }
-
- // TODO(jasvir): Improve Caja responses expiration handling
- return createCajaResponse(request.getUrl(),
- html, js, convertMessages(result.messages, mc), fields,
- timeSource.currentTimeMillis() + specRefreshInterval);
- } catch (IOException e) {
- LOG.log(Level.WARNING, "Error creating cajoled response", e);
- throw new ProcessingException("Error getting response content", HttpResponse.SC_INTERNAL_SERVER_ERROR);
- }
+ MessageContext mc = new MessageContext();
+ CajoledResult result =
+ cajaContentRewriter.rewrite(request.getUrl(), request.getContainer(),
+ request.getMimeType(), true /* only support es53 */, request.getDebug());
+ String html = null;
+ String js = null;
+ if (!result.hasErrors && null != result.html) {
+ html = Nodes.render(result.html);
+ }
+
+ if (!result.hasErrors && null != result.js) {
+ StringBuilder builder = new StringBuilder();
+ TokenConsumer tc = request.getDebug() ?
+ new JsPrettyPrinter(new Concatenator(builder))
+ : new JsMinimalPrinter(new Concatenator(builder));
+ RenderContext rc = new RenderContext(tc)
+ .withAsciiOnly(true)
+ .withEmbeddable(true);
+ result.js.render(rc);
+ rc.getOut().noMoreTokens();
+ js = builder.toString();
+ }
+
+ // TODO(jasvir): Improve Caja responses expiration handling
+ return createCajaResponse(request.getUrl(),
+ html, js, convertMessages(result.messages, mc), fields,
+ timeSource.currentTimeMillis() + specRefreshInterval);
}
/**
@@ -350,12 +345,12 @@ public class GadgetsHandlerService {
protected class MetadataGadgetContext extends GadgetContext {
private final GadgetsHandlerApi.MetadataRequest request;
- private final SecurityToken token;
+ private final SecurityToken authContext;
public MetadataGadgetContext(GadgetsHandlerApi.MetadataRequest request) {
this.request = request;
- this.token = convertToken(
- request.getToken(), request.getContainer(), request.getUrl().toString());
+ this.authContext = convertAuthContext(
+ request.getAuthContext(), request.getContainer(), request.getUrl().toString());
}
@Override
@@ -400,7 +395,7 @@ public class GadgetsHandlerService {
@Override
public SecurityToken getToken() {
- return token;
+ return authContext;
}
@Override
@@ -409,12 +404,12 @@ public class GadgetsHandlerService {
}
}
- private SecurityToken convertToken(GadgetsHandlerApi.TokenData token,
+ private SecurityToken convertAuthContext(GadgetsHandlerApi.AuthContext authContext,
String container, String url) {
- if (token == null) {
+ if (authContext == null) {
return null;
}
- return beanDelegator.createDelegator(token, SecurityToken.class,
+ return beanDelegator.createDelegator(authContext, SecurityToken.class,
ImmutableMap.<String, Object>of("container", container,
"appid", url, "appurl", url));
}
@@ -504,8 +499,7 @@ public class GadgetsHandlerService {
proxyUri.setFallbackUrl(request.getFallbackUrl())
.setRewriteMimeType(request.getRewriteMimeType())
- .setSanitizeContent(request.getSanitize())
- .setCajoleContent(request.getCajole());
+ .setSanitizeContent(request.getSanitize());
GadgetsHandlerApi.ImageParams image = request.getImageParams();
if (image != null) {
@@ -559,17 +553,17 @@ public class GadgetsHandlerService {
.build()),
fields);
}
-
+
@VisibleForTesting
GadgetsHandlerApi.CajaResponse createCajaResponse(Uri uri,
- String html, String js, List<GadgetsHandlerApi.Message> messages,
- Set<String> fields, Long expireMs) throws IOException {
+ String html, String js, List<GadgetsHandlerApi.Message> messages,
+ Set<String> fields, Long expireMs) {
ImmutableList.Builder<GadgetsHandlerApi.Message> msgBuilder =
ImmutableList.builder();
for (final GadgetsHandlerApi.Message m : messages) {
msgBuilder.add(
beanDelegator.createDelegator(null, GadgetsHandlerApi.Message.class,
- ImmutableMap.<String, Object>of("name", m.getName(),
+ ImmutableMap.<String, Object>of("name", m.getName(),
"level", m.getLevel(), "message", m.getMessage())));
}
@@ -586,18 +580,18 @@ public class GadgetsHandlerService {
.build()),
fields);
}
-
+
private class MessageImpl implements GadgetsHandlerApi.Message {
- private GadgetsHandlerApi.MessageLevel level;
- private String message;
- private String name;
-
+ private final GadgetsHandlerApi.MessageLevel level;
+ private final String message;
+ private final String name;
+
public MessageImpl(String name, String message, GadgetsHandlerApi.MessageLevel level) {
this.name = name;
this.message = message;
this.level = level;
}
-
+
public GadgetsHandlerApi.MessageLevel getLevel() {
return level;
}
@@ -609,6 +603,6 @@ public class GadgetsHandlerService {
public String getName() {
return name;
}
-
+
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java?rev=1044534&r1=1044533&r2=1044534&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java Fri Dec 10 23:26:16 2010
@@ -40,8 +40,6 @@ import org.apache.shindig.gadgets.featur
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.http.HttpResponseBuilder;
import org.apache.shindig.gadgets.process.ProcessingException;
-import org.apache.shindig.gadgets.servlet.GadgetsHandlerApi.Message;
-import org.apache.shindig.gadgets.servlet.GadgetsHandlerApi.MessageLevel;
import org.apache.shindig.gadgets.uri.JsUriManager;
import org.apache.shindig.gadgets.uri.ProxyUriManager;
import org.apache.shindig.gadgets.uri.JsUriManager.JsUri;
@@ -108,7 +106,7 @@ public class GadgetsHandlerServiceTest e
public void testGetMetadata() throws Exception {
GadgetsHandlerApi.MetadataRequest request = createMetadataRequest(
FakeProcessor.SPEC_URL, CONTAINER, "view",
- createTokenData(null, null), ImmutableList.of("*"));
+ createAuthContext(null, null), ImmutableList.of("*"));
EasyMock.expect(mockRegistry.getFeatures(EasyMock.isA(List.class)))
.andReturn(Lists.newArrayList("auth-refresh"));
replay();
@@ -135,7 +133,7 @@ public class GadgetsHandlerServiceTest e
public void testGetMetadataOnlyView() throws Exception {
GadgetsHandlerApi.MetadataRequest request = createMetadataRequest(
FakeProcessor.SPEC_URL, CONTAINER, null,
- createTokenData(null, null), ImmutableList.of("views.*"));
+ createAuthContext(null, null), ImmutableList.of("views.*"));
replay();
GadgetsHandlerApi.MetadataResponse response =
gadgetHandler.getMetadata(request);
@@ -152,7 +150,7 @@ public class GadgetsHandlerServiceTest e
public void testGetMetadataNoContainer() throws Exception {
GadgetsHandlerApi.MetadataRequest request = createMetadataRequest(
FakeProcessor.SPEC_URL, null, null,
- createTokenData(null, null), ImmutableList.of("*"));
+ createAuthContext(null, null), ImmutableList.of("*"));
replay();
GadgetsHandlerApi.BaseResponse response = gadgetHandler.getMetadata(request);
}
@@ -161,7 +159,7 @@ public class GadgetsHandlerServiceTest e
public void testGetMetadataNoUrl() throws Exception {
GadgetsHandlerApi.MetadataRequest request = createMetadataRequest(
null, CONTAINER, null,
- createTokenData(null, null), ImmutableList.of("*"));
+ createAuthContext(null, null), ImmutableList.of("*"));
replay();
GadgetsHandlerApi.MetadataResponse response =
gadgetHandler.getMetadata(request);
@@ -171,7 +169,7 @@ public class GadgetsHandlerServiceTest e
public void testGetMetadataNoFields() throws Exception {
GadgetsHandlerApi.MetadataRequest request = createMetadataRequest(
FakeProcessor.SPEC_URL, CONTAINER, null,
- createTokenData(null, null), null);
+ createAuthContext(null, null), null);
replay();
GadgetsHandlerApi.MetadataResponse response = gadgetHandler.getMetadata(request);
}
@@ -180,7 +178,7 @@ public class GadgetsHandlerServiceTest e
public void testGetMetadataBadGadget() throws Exception {
GadgetsHandlerApi.MetadataRequest request = createMetadataRequest(
Uri.parse("unknown"), CONTAINER, null,
- createTokenData(null, null), null);
+ createAuthContext(null, null), null);
replay();
GadgetsHandlerApi.MetadataResponse response = gadgetHandler.getMetadata(request);
}
@@ -202,7 +200,7 @@ public class GadgetsHandlerServiceTest e
public void testGetToken() throws Exception {
GadgetsHandlerApi.TokenRequest request = createTokenRequest(
FakeProcessor.SPEC_URL, CONTAINER,
- createTokenData(OWNER, VIEWER), ImmutableList.of("*"));
+ createAuthContext(OWNER, VIEWER), ImmutableList.of("*"));
replay();
tokenCodec.encodedToken = TOKEN;
tokenCodec.tokenExpiryTimeMs = TOKEN_EXPIRY_TIME_MS;
@@ -210,9 +208,9 @@ public class GadgetsHandlerServiceTest e
assertEquals(TOKEN, response.getToken());
assertEquals(CURRENT_TIME_MS, response.getResponseTimeMs());
assertEquals(TOKEN_EXPIRY_TIME_MS, response.getExpireTimeMs());
- assertEquals(OWNER, tokenCodec.inputToken.getOwnerId());
- assertEquals(VIEWER, tokenCodec.inputToken.getViewerId());
- assertEquals(CONTAINER, tokenCodec.inputToken.getContainer());
+ assertEquals(OWNER, tokenCodec.authContext.getOwnerId());
+ assertEquals(VIEWER, tokenCodec.authContext.getViewerId());
+ assertEquals(CONTAINER, tokenCodec.authContext.getContainer());
verify();
}
@@ -220,7 +218,7 @@ public class GadgetsHandlerServiceTest e
public void testGetTokenNoContainer() throws Exception {
GadgetsHandlerApi.TokenRequest request = createTokenRequest(
FakeProcessor.SPEC_URL, null,
- createTokenData(OWNER, VIEWER), ImmutableList.of("*"));
+ createAuthContext(OWNER, VIEWER), ImmutableList.of("*"));
replay();
GadgetsHandlerApi.TokenResponse response = gadgetHandler.getToken(request);
}
@@ -229,7 +227,7 @@ public class GadgetsHandlerServiceTest e
public void testGetTokenNoUrl() throws Exception {
GadgetsHandlerApi.TokenRequest request = createTokenRequest(
null, CONTAINER,
- createTokenData(OWNER, VIEWER), ImmutableList.of("*"));
+ createAuthContext(OWNER, VIEWER), ImmutableList.of("*"));
replay();
GadgetsHandlerApi.TokenResponse response = gadgetHandler.getToken(request);
}
@@ -238,7 +236,7 @@ public class GadgetsHandlerServiceTest e
public void testGetTokenNoFields() throws Exception {
GadgetsHandlerApi.TokenRequest request = createTokenRequest(
FakeProcessor.SPEC_URL, CONTAINER,
- createTokenData(OWNER, VIEWER), null);
+ createAuthContext(OWNER, VIEWER), null);
replay();
GadgetsHandlerApi.TokenResponse response = gadgetHandler.getToken(request);
}
@@ -247,7 +245,7 @@ public class GadgetsHandlerServiceTest e
public void testGetTokenException() throws Exception {
GadgetsHandlerApi.TokenRequest request = createTokenRequest(
FakeProcessor.SPEC_URL, CONTAINER,
- createTokenData(OWNER, VIEWER), ImmutableList.of("*"));
+ createAuthContext(OWNER, VIEWER), ImmutableList.of("*"));
replay();
tokenCodec.exc = new SecurityTokenException("bad data");
GadgetsHandlerApi.TokenResponse response = gadgetHandler.getToken(request);
@@ -262,7 +260,7 @@ public class GadgetsHandlerServiceTest e
tokenCodec.encodedToken = TOKEN;
GadgetsHandlerApi.TokenResponse response = gadgetHandler.getToken(request);
assertEquals(TOKEN, response.getToken());
- assertNull(CONTAINER, tokenCodec.inputToken);
+ assertNull(CONTAINER, tokenCodec.authContext);
verify();
}
@@ -343,7 +341,6 @@ public class GadgetsHandlerServiceTest e
GadgetsHandlerApi.ProxyRequest request = mock(GadgetsHandlerApi.ProxyRequest.class);
expect(request.getContainer()).andStubReturn(CONTAINER);
expect(request.getUrl()).andStubReturn(RESOURCE);
- expect(request.getCajole()).andStubReturn(true);
expect(request.getRefresh()).andStubReturn(new Integer(333));
expect(request.getDebug()).andStubReturn(true);
expect(request.getFallbackUrl()).andStubReturn(FALLBACK);
@@ -357,7 +354,7 @@ public class GadgetsHandlerServiceTest e
ProxyUri expectedUri = new ProxyUri(333, true, true, CONTAINER,
FakeProcessor.SPEC_URL.toString(), RESOURCE);
- expectedUri.setCajoleContent(true).setRewriteMimeType("image/png").setSanitizeContent(true);
+ expectedUri.setRewriteMimeType("image/png").setSanitizeContent(true);
expectedUri.setResize(210, 120, 77, true).setFallbackUrl(FALLBACK);
assertEquals(pUri, expectedUri);
verify();
@@ -496,30 +493,30 @@ public class GadgetsHandlerServiceTest e
replay();
GadgetsHandlerApi.ProxyResponse response = gadgetHandler.getProxy(request);
}
-
+
@Test
public void testCreateCajaResponse() throws Exception {
String goldenEntries[][] = {{"name1", "LINT", "msg1"}, {"name2", "LINT", "msg2"}};
- List<Message> goldenMessages = Lists.newArrayList();
-
+ List<GadgetsHandlerApi.Message> goldenMessages = Lists.newArrayList();
+
for (String[] goldenEntry : goldenEntries) {
- Message m = mock(Message.class);
+ GadgetsHandlerApi.Message m = mock(GadgetsHandlerApi.Message.class);
expect(m.getName()).andReturn(goldenEntry[0]);
- expect(m.getLevel()).andReturn(MessageLevel.valueOf(goldenEntry[1]));
+ expect(m.getLevel()).andReturn(GadgetsHandlerApi.MessageLevel.valueOf(goldenEntry[1]));
expect(m.getMessage()).andReturn(goldenEntry[2]);
goldenMessages.add(m);
}
replay();
-
+
Uri jsUri = Uri.parse("http://www.shindig.com/js");
GadgetsHandlerApi.CajaResponse jsResponse =
gadgetHandler.createCajaResponse(jsUri, "html", "js",
goldenMessages, ImmutableSet.of("*"), null);
BeanDelegator.validateDelegator(jsResponse);
-
+
assertEquals("html", jsResponse.getHtml());
assertEquals("js", jsResponse.getJs());
- List<Message> response = jsResponse.getMessages();
+ List<GadgetsHandlerApi.Message> response = jsResponse.getMessages();
assertEquals(goldenMessages.size(), response.size());
for (int i=0; i < response.size(); i++) {
assertEquals(goldenEntries[i][0], response.get(i).getName());
@@ -528,35 +525,35 @@ public class GadgetsHandlerServiceTest e
}
}
- private GadgetsHandlerApi.TokenData createTokenData(String ownerId, String viewerId) {
- GadgetsHandlerApi.TokenData token = mock(GadgetsHandlerApi.TokenData.class);
+ private GadgetsHandlerApi.AuthContext createAuthContext(String ownerId, String viewerId) {
+ GadgetsHandlerApi.AuthContext authContext = mock(GadgetsHandlerApi.AuthContext.class);
if (ownerId != null) {
- EasyMock.expect(token.getOwnerId()).andReturn(ownerId).once();
+ EasyMock.expect(authContext.getOwnerId()).andReturn(ownerId).once();
}
if (viewerId != null) {
- EasyMock.expect(token.getViewerId()).andReturn(viewerId).once();
+ EasyMock.expect(authContext.getViewerId()).andReturn(viewerId).once();
}
- return token;
+ return authContext;
}
private GadgetsHandlerApi.MetadataRequest createMetadataRequest(Uri url, String container,
- String view, GadgetsHandlerApi.TokenData token, List<String> fields) {
+ String view, GadgetsHandlerApi.AuthContext authContext, List<String> fields) {
GadgetsHandlerApi.MetadataRequest request = mock(GadgetsHandlerApi.MetadataRequest.class);
EasyMock.expect(request.getFields()).andReturn(fields).anyTimes();
EasyMock.expect(request.getView()).andReturn(view).once();
EasyMock.expect(request.getUrl()).andReturn(url).anyTimes();
EasyMock.expect(request.getContainer()).andReturn(container).anyTimes();
- EasyMock.expect(request.getToken()).andReturn(token).once();
+ EasyMock.expect(request.getAuthContext()).andReturn(authContext).once();
return request;
}
private GadgetsHandlerApi.TokenRequest createTokenRequest(Uri url, String container,
- GadgetsHandlerApi.TokenData token, List<String> fields) {
+ GadgetsHandlerApi.AuthContext authContext, List<String> fields) {
GadgetsHandlerApi.TokenRequest request = mock(GadgetsHandlerApi.TokenRequest.class);
EasyMock.expect(request.getFields()).andReturn(fields).anyTimes();
EasyMock.expect(request.getUrl()).andReturn(url).anyTimes();
EasyMock.expect(request.getContainer()).andReturn(container).anyTimes();
- EasyMock.expect(request.getToken()).andReturn(token).once();
+ EasyMock.expect(request.getAuthContext()).andReturn(authContext).once();
return request;
}
@@ -579,23 +576,14 @@ public class GadgetsHandlerServiceTest e
return request;
}
- private GadgetsHandlerApi.CajaRequest createCajaRequest(Uri url, String container,
- List<String> fields) {
- GadgetsHandlerApi.CajaRequest request = mock(GadgetsHandlerApi.CajaRequest.class);
- EasyMock.expect(request.getFields()).andStubReturn(fields);
- EasyMock.expect(request.getContainer()).andStubReturn(container);
- EasyMock.expect(request.getUrl()).andStubReturn(url);
- return request;
- }
-
private class FakeSecurityTokenCodec implements SecurityTokenCodec {
- public SecurityToken inputToken = null;
+ public SecurityToken authContext = null;
public SecurityTokenException exc = null;
public String encodedToken = null;
public Long tokenExpiryTimeMs = null;
- public String encodeToken(SecurityToken token) throws SecurityTokenException {
- inputToken = token;
+ public String encodeToken(SecurityToken authContext) throws SecurityTokenException {
+ this.authContext = authContext;
if (exc != null) {
throw exc;
}
@@ -607,11 +595,11 @@ public class GadgetsHandlerServiceTest e
if (exc != null) {
throw exc;
}
- return inputToken;
+ return authContext;
}
- public Long getTokenExpiration(SecurityToken token) throws SecurityTokenException {
- inputToken = token;
+ public Long getTokenExpiration(SecurityToken authContext) throws SecurityTokenException {
+ this.authContext = authContext;
if (exc != null) {
throw exc;
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java?rev=1044534&r1=1044533&r2=1044534&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerTest.java Fri Dec 10 23:26:16 2010
@@ -91,14 +91,14 @@ public class GadgetsHandlerTest extends
private Injector injector;
private BeanJsonConverter converter;
private HandlerRegistry registry;
- private FakeGadgetToken token;
+ private FakeGadgetToken authContext;
@Before
public void setUp() throws Exception {
injector = Guice.createInjector();
converter = new BeanJsonConverter(injector);
- token = new FakeGadgetToken();
- token.setAppUrl("http://www.example.com/gadget.xml");
+ authContext = new FakeGadgetToken();
+ authContext.setAppUrl("http://www.example.com/gadget.xml");
}
private void registerGadgetsHandler(SecurityTokenCodec codec) {
@@ -143,7 +143,7 @@ public class GadgetsHandlerTest extends
registerGadgetsHandler(null);
JSONObject request = makeMetadataRequest(null, null);
RpcHandler operation = registry.getRpcHandler(request);
- Object empty = operation.execute(emptyFormItems, token, converter).get();
+ Object empty = operation.execute(emptyFormItems, authContext, converter).get();
JsonAssert.assertJsonEquals("{}", converter.convertToString(empty));
}
@@ -153,7 +153,7 @@ public class GadgetsHandlerTest extends
JSONObject request = makeMetadataNoContainerRequest(GADGET1_URL);
RpcHandler operation = registry.getRpcHandler(request);
try {
- Object empty = operation.execute(emptyFormItems, token, converter).get();
+ Object empty = operation.execute(emptyFormItems, authContext, converter).get();
fail("Missing container");
} catch (Exception e) {
assertTrue(e.getMessage().contains("Missing container"));
@@ -165,11 +165,11 @@ public class GadgetsHandlerTest extends
JSONObject params = new JSONObject()
.put("container", CONTAINER)
.put("ids", ImmutableList.copyOf(uris));
-
+
if (null != mime) {
- params.put("mime-type", mime);
+ params.put("mime_type", mime);
}
-
+
return new JSONObject()
.put("id", "req1")
.put("method", "gadgets.cajole")
@@ -181,10 +181,10 @@ public class GadgetsHandlerTest extends
registerGadgetsHandler(null);
JSONObject request = makeCajaRequest(null);
RpcHandler operation = registry.getRpcHandler(request);
- Object empty = operation.execute(emptyFormItems, token, converter).get();
+ Object empty = operation.execute(emptyFormItems, authContext, converter).get();
JsonAssert.assertJsonEquals("{}", converter.convertToString(empty));
}
-
+
private CajoledResult cajole(Uri uri, String mime, String content) throws ParseException {
CajaContentRewriter rw = new CajaContentRewriter(null, null, null);
InputSource is = new InputSource(uri.toJavaUri());
@@ -192,18 +192,18 @@ public class GadgetsHandlerTest extends
CharProducer cp = CharProducer.Factory.create(new StringReader(content), is);
return rw.rewrite(uri, CONTAINER, rw.parse(is, cp, mime, mq), false, false);
}
-
+
@Test
public void testCajaJsRequest() throws Exception {
registerGadgetsHandler(null);
Capture<Uri> uriCapture = new Capture<Uri>();
Capture<String> containerCapture = new Capture<String>();
Capture<String> mimeCapture = new Capture<String>();
-
+
String goldenMime = "text/javascript";
-
+
CajoledResult golden = cajole(JS_URL, goldenMime, "alert('hi');");
-
+
EasyMock.expect(cajaContentRewriter.rewrite(
EasyMock.capture(uriCapture),
EasyMock.capture(containerCapture),
@@ -216,12 +216,12 @@ public class GadgetsHandlerTest extends
JSONObject request = makeCajaRequest(goldenMime, JS_URL.toString());
RpcHandler operation = registry.getRpcHandler(request);
- Object result = operation.execute(emptyFormItems, token, converter).get();
-
+ Object result = operation.execute(emptyFormItems, authContext, converter).get();
+
assertEquals(CONTAINER, containerCapture.getValue());
assertEquals(JS_URL, uriCapture.getValue());
assertTrue(mimeCapture.getValue().contains("javascript"));
-
+
JSONObject response = new JSONObject(converter.convertToString(result));
assertTrue(response.has(JS_URL.toString()));
JSONObject cajaResponse = response.getJSONObject(JS_URL.toString());
@@ -240,12 +240,12 @@ public class GadgetsHandlerTest extends
Capture<Uri> uriCapture = new Capture<Uri>();
Capture<String> containerCapture = new Capture<String>();
Capture<String> mimeCapture = new Capture<String>();
-
+
String goldenMime = "text/html";
-
+
CajoledResult golden = cajole(HTML_URL, goldenMime,
"<b>hello</b>world<script>evilFunc1()</script><div onclick='evilFunc2'></div>");
-
+
EasyMock.expect(cajaContentRewriter.rewrite(
EasyMock.capture(uriCapture),
EasyMock.capture(containerCapture),
@@ -258,12 +258,12 @@ public class GadgetsHandlerTest extends
JSONObject request = makeCajaRequest(goldenMime, HTML_URL.toString());
RpcHandler operation = registry.getRpcHandler(request);
- Object result = operation.execute(emptyFormItems, token, converter).get();
-
+ Object result = operation.execute(emptyFormItems, authContext, converter).get();
+
assertEquals(CONTAINER, containerCapture.getValue());
assertEquals(HTML_URL, uriCapture.getValue());
assertTrue(mimeCapture.getValue().contains("html"));
-
+
JSONObject response = new JSONObject(converter.convertToString(result));
assertTrue(response.has(HTML_URL.toString()));
@@ -271,7 +271,7 @@ public class GadgetsHandlerTest extends
assertTrue(cajaResponse.has("html"));
assertTrue(cajaResponse.has("js"));
assertTrue(cajaResponse.has("messages"));
-
+
// HTML is sanitized
assertTrue(cajaResponse.getString("html").contains("<b>hello</b>world"));
assertFalse(cajaResponse.getString("html").contains("evilFunc"));
@@ -284,7 +284,7 @@ public class GadgetsHandlerTest extends
registerGadgetsHandler(null);
JSONObject request = makeCajaRequest(null);
RpcHandler operation = registry.getRpcHandler(request);
- Object empty = operation.execute(emptyFormItems, token, converter).get();
+ Object empty = operation.execute(emptyFormItems, authContext, converter).get();
JsonAssert.assertJsonEquals("{}", converter.convertToString(empty));
}
@@ -308,7 +308,7 @@ public class GadgetsHandlerTest extends
registerGadgetsHandler(null);
JSONObject request = makeTokenRequest();
RpcHandler operation = registry.getRpcHandler(request);
- Object empty = operation.execute(emptyFormItems, token, converter).get();
+ Object empty = operation.execute(emptyFormItems, authContext, converter).get();
JsonAssert.assertJsonEquals("{}", converter.convertToString(empty));
}
@@ -318,7 +318,7 @@ public class GadgetsHandlerTest extends
String badUrl = "[moo]";
JSONObject request = makeMetadataRequest(null, null, badUrl);
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject response = new JSONObject(converter.convertToString(responseObj));
JSONObject gadget = response.getJSONObject(badUrl);
assertEquals("Bad url - " + badUrl, gadget.getJSONObject("error").getString("message"));
@@ -331,7 +331,7 @@ public class GadgetsHandlerTest extends
String badUrl = "[moo]";
JSONObject request = makeTokenRequest(badUrl);
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject response = new JSONObject(converter.convertToString(responseObj));
JSONObject gadget = response.getJSONObject(badUrl);
assertEquals("Bad url - " + badUrl, gadget.getJSONObject("error").getString("message"));
@@ -343,7 +343,7 @@ public class GadgetsHandlerTest extends
registerGadgetsHandler(null);
JSONObject request = makeMetadataRequest(null, null, GADGET1_URL);
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject response = new JSONObject(converter.convertToString(responseObj));
JSONObject gadget = response.getJSONObject(GADGET1_URL);
@@ -379,16 +379,16 @@ public class GadgetsHandlerTest extends
@Test
public void testTokenOneGadget() throws Exception {
SecurityTokenCodec codec = EasyMock.createMock(SecurityTokenCodec.class);
- Capture<SecurityToken> tokenCapture = new Capture<SecurityToken>();
- EasyMock.expect(codec.encodeToken(EasyMock.capture(tokenCapture))).andReturn(TOKEN).anyTimes();
- EasyMock.expect(codec.getTokenExpiration(EasyMock.capture(tokenCapture)))
+ Capture<SecurityToken> authContextCapture = new Capture<SecurityToken>();
+ EasyMock.expect(codec.encodeToken(EasyMock.capture(authContextCapture))).andReturn(TOKEN).anyTimes();
+ EasyMock.expect(codec.getTokenExpiration(EasyMock.capture(authContextCapture)))
.andReturn(EXPIRY_TIME_MS).anyTimes();
replay(codec);
registerGadgetsHandler(codec);
JSONObject request = makeTokenRequest(GADGET1_URL);
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject response = new JSONObject(converter.convertToString(responseObj));
JSONObject gadget = response.getJSONObject(GADGET1_URL);
@@ -396,11 +396,11 @@ public class GadgetsHandlerTest extends
assertFalse(gadget.has("error"));
assertFalse(gadget.has("url")); // filtered out
// next checks verify all fiels that canbe used for token generation are passed in
- assertEquals("container", tokenCapture.getValue().getContainer());
- assertEquals(GADGET1_URL, tokenCapture.getValue().getAppId());
- assertEquals(GADGET1_URL, tokenCapture.getValue().getAppUrl());
- assertSame(token.getOwnerId(), tokenCapture.getValue().getOwnerId());
- assertSame(token.getViewerId(), tokenCapture.getValue().getViewerId());
+ assertEquals("container", authContextCapture.getValue().getContainer());
+ assertEquals(GADGET1_URL, authContextCapture.getValue().getAppId());
+ assertEquals(GADGET1_URL, authContextCapture.getValue().getAppUrl());
+ assertSame(authContext.getOwnerId(), authContextCapture.getValue().getOwnerId());
+ assertSame(authContext.getViewerId(), authContextCapture.getValue().getViewerId());
}
@Test
@@ -409,7 +409,7 @@ public class GadgetsHandlerTest extends
JSONObject request = makeMetadataRequest(null, null, GADGET1_URL);
urlGenerator.throwRandomFault = true;
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject response = new JSONObject(converter.convertToString(responseObj));
JSONObject gadget = response.getJSONObject(GADGET1_URL);
@@ -428,7 +428,7 @@ public class GadgetsHandlerTest extends
registerGadgetsHandler(codec);
JSONObject request = makeTokenRequest(GADGET1_URL);
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject response = new JSONObject(converter.convertToString(responseObj));
JSONObject gadget = response.getJSONObject(GADGET1_URL);
@@ -443,7 +443,7 @@ public class GadgetsHandlerTest extends
registerGadgetsHandler(null);
JSONObject request = makeMetadataRequest("en", "US", GADGET1_URL, GADGET2_URL);
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject response = new JSONObject(converter.convertToString(responseObj));
JSONObject modulePrefs1 = response.getJSONObject(GADGET1_URL).getJSONObject("modulePrefs");
@@ -468,7 +468,7 @@ public class GadgetsHandlerTest extends
JSONObject request = makeTokenRequest(GADGET1_URL, GADGET2_URL);
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject response = new JSONObject(converter.convertToString(responseObj));
JSONObject gadget1 = response.getJSONObject(GADGET1_URL);
@@ -489,7 +489,7 @@ public class GadgetsHandlerTest extends
processor.exceptions.put(FakeProcessor.SPEC_URL2, new ProcessingException("broken",
HttpServletResponse.SC_BAD_REQUEST));
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject response = new JSONObject(converter.convertToString(responseObj));
JSONObject modulePrefs1 = response.getJSONObject(GADGET1_URL).getJSONObject("modulePrefs");
@@ -525,7 +525,7 @@ public class GadgetsHandlerTest extends
EasyMock.isNull(Integer.class))).andReturn(ImmutableList.<Uri>of(Uri.parse(proxyUri)));
replay();
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject response = new JSONObject(converter.convertToString(responseObj));
JSONObject gadget1 = response.getJSONObject(resUri);
@@ -561,7 +561,7 @@ public class GadgetsHandlerTest extends
replay();
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject results = new JSONObject(converter.convertToString(responseObj));
assertEquals(jsUri.toString(), results.getString("jsUrl"));
JsUri expectedUri = new JsUri(null, false, false, CONTAINER, GADGET1_URL,
@@ -577,7 +577,7 @@ public class GadgetsHandlerTest extends
JSONObject params = new JSONObject().put("gadget", GADGET1_URL)
.put("container", CONTAINER).put("features", features)
.put("fields", "*").put("refresh", "123").put("debug", "1")
- .put("ignoreCache", "1").put("onload",onload)
+ .put("nocache", "1").put("onload",onload)
.put("c", "1");
JSONObject request =
new JSONObject().put("method", "gadgets.js").put("id", "req1").put("params", params);
@@ -603,7 +603,7 @@ public class GadgetsHandlerTest extends
replay();
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject results = new JSONObject(converter.convertToString(responseObj));
assertEquals(jsUri.toString(), results.getString("jsUrl"));
JsUri expectedUri = new JsUri(123, true, true, CONTAINER, GADGET1_URL,
@@ -632,7 +632,7 @@ public class GadgetsHandlerTest extends
replay();
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject results = new JSONObject(converter.convertToString(responseObj));
assertFalse(results.has("jsUrl"));
assertEquals(HttpResponse.SC_NOT_FOUND, results.getJSONObject("error").getInt("code"));
@@ -655,7 +655,7 @@ public class GadgetsHandlerTest extends
replay();
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject response = new JSONObject(converter.convertToString(responseObj));
JSONObject gadget1 = response.getJSONObject(resUri);
@@ -673,8 +673,8 @@ public class GadgetsHandlerTest extends
JSONObject req =
new JSONObject().put("method", "gadgets.proxy").put("id", "req1").put("params",
new JSONObject().put("ids", ImmutableList.copyOf(uris)).put("container", CONTAINER)
- .put("ignoreCache", "1").put("debug", "1").put("sanitize", "true")
- .put("cajole", "true").put("gadget", GADGET1_URL).put("refresh", "333")
+ .put("nocache", "1").put("debug", "1").put("sanitize", "true")
+ .put("gadget", GADGET1_URL).put("refresh", "333")
.put("rewriteMime", "text/xml").put("fallback_url", uris[0])
.put("no_expand", "true").put("resize_h", "444").put("resize_w", "555")
.put("resize_q", "88")
@@ -693,14 +693,14 @@ public class GadgetsHandlerTest extends
EasyMock.isNull(Integer.class))).andReturn(ImmutableList.<Uri>of(Uri.parse(proxyUri)));
replay();
RpcHandler operation = registry.getRpcHandler(request);
- Object responseObj = operation.execute(emptyFormItems, token, converter).get();
+ Object responseObj = operation.execute(emptyFormItems, authContext, converter).get();
JSONObject response = new JSONObject(converter.convertToString(responseObj));
JSONObject gadget1 = response.getJSONObject(resUri);
assertEquals(proxyUri, gadget1.getString("proxyUrl"));
ProxyUri pUri = captureProxyUri.getValue().get(0);
ProxyUri expectedUri = new ProxyUri(333, true, true, CONTAINER, GADGET1_URL, Uri.parse(resUri));
- expectedUri.setCajoleContent(true).setRewriteMimeType("text/xml").setSanitizeContent(true);
+ expectedUri.setRewriteMimeType("text/xml").setSanitizeContent(true);
expectedUri.setFallbackUrl(resUri).setResize(555, 444, 88, true);
assertTrue(expectedUri.equals(pUri));
assertFalse(gadget1.has("error"));