Author: johnh
Date: Wed Jul 14 20:23:15 2010
New Revision: 964180
URL: http://svn.apache.org/viewvc?rev=964180&view=rev
Log:
Cleaning up underlying impl of accel-related logic, now that Accel is better
encapsulated as its own handler using ResponseRewriterRegistry.
Patch provided by Gagan Singh.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java?rev=964180&r1=964179&r2=964180&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
Wed Jul 14 20:23:15 2010
@@ -66,10 +66,6 @@ public class DefaultGadgetSpecFactory ex
try
{
Uri uri = RAW_GADGET_URI;
- // For accelerate page, pass in page url instead of fake one:
- if (HtmlAccelServlet.isAccel(context)) {
- uri = context.getUrl();
- }
return new GadgetSpec(uri, XmlUtil.parse(rawxml), rawxml);
} catch (XmlException e) {
throw new SpecParserException(e);
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java?rev=964180&r1=964179&r2=964180&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/GadgetRewritersProvider.java
Wed Jul 14 20:23:15 2010
@@ -34,23 +34,15 @@ import java.util.List;
*
*/
public class GadgetRewritersProvider {
-
private final List<GadgetRewriter> renderRewriters;
- private final List<GadgetRewriter> accelRewriters;
-
+
@Inject
public GadgetRewritersProvider(
- @Named("shindig.rewriters.gadget") List<GadgetRewriter> renderRewriters,
- @Named("shindig.rewriters.accelerate") List<GadgetRewriter>
accelRewriters) {
+ @Named("shindig.rewriters.gadget") List<GadgetRewriter> renderRewriters)
{
this.renderRewriters = renderRewriters;
- this.accelRewriters = accelRewriters;
}
public List<GadgetRewriter> getRewriters(GadgetContext context) {
- if (HtmlAccelServlet.isAccel(context)) {
- return accelRewriters;
- }
return renderRewriters;
}
-
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java?rev=964180&r1=964179&r2=964180&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
Wed Jul 14 20:23:15 2010
@@ -18,33 +18,25 @@
package org.apache.shindig.gadgets.servlet;
import com.google.inject.Inject;
-
import org.apache.shindig.common.servlet.InjectedServlet;
-import org.apache.shindig.gadgets.GadgetContext;
-
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
/**
* Handles requests for accel servlet.
* The objective is to accelerate web pages.
*/
public class HtmlAccelServlet extends InjectedServlet {
-
private static final long serialVersionUID = -424353123863813052L;
private static final Logger logger = Logger.getLogger(
HtmlAccelServlet.class.getName());
-
- public static final String ACCEL_GADGET_PARAM_NAME = "accelGadget";
- public static final String ACCEL_GADGET_PARAM_VALUE = "true";
-
private transient AccelHandler accelHandler;
private transient boolean initialized;
@@ -66,13 +58,8 @@ public class HtmlAccelServlet extends In
protected void doGet(HttpServletRequest request, HttpServletResponse
response)
throws IOException {
if (logger.isLoggable(Level.FINE)) {
- logger.fine("accel request = " + request.toString());
+ logger.fine("Accel request = " + request.toString());
}
accelHandler.fetch(request, response);
}
-
- public static boolean isAccel(GadgetContext context) {
- return context.getParameter(HtmlAccelServlet.ACCEL_GADGET_PARAM_NAME) ==
- HtmlAccelServlet.ACCEL_GADGET_PARAM_VALUE;
- }
}
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java?rev=964180&r1=964179&r2=964180&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/HtmlRendererTest.java
Wed Jul 14 20:23:15 2010
@@ -32,7 +32,6 @@ import org.apache.shindig.gadgets.preloa
import org.apache.shindig.gadgets.preload.PreloaderService;
import org.apache.shindig.gadgets.rewrite.CaptureRewriter;
import org.apache.shindig.gadgets.rewrite.GadgetRewriter;
-import org.apache.shindig.gadgets.servlet.HtmlAccelServlet;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.View;
import org.junit.Before;
@@ -59,20 +58,9 @@ public class HtmlRendererTest {
}
};
- private static final GadgetContext ACCEL_CONTEXT = new GadgetContext() {
- @Override
- public String getParameter(String name) {
- if (name == HtmlAccelServlet.ACCEL_GADGET_PARAM_NAME) {
- return HtmlAccelServlet.ACCEL_GADGET_PARAM_VALUE;
- }
- return super.getParameter(name);
- }
- };
-
private final FakePreloaderService preloaderService = new
FakePreloaderService();
private final FakeProxyRenderer proxyRenderer = new FakeProxyRenderer();
private final CaptureRewriter captureRewriter = new CaptureRewriter();
- private final CaptureRewriter accelRewriter = new CaptureRewriter();
private HtmlRenderer renderer;
private Gadget makeGadget(String content) throws GadgetException {
@@ -96,8 +84,7 @@ public class HtmlRendererTest {
@Before
public void setUp() throws Exception {
renderer = new HtmlRenderer(preloaderService, proxyRenderer,
- new GadgetRewritersProvider(ImmutableList.of((GadgetRewriter)
captureRewriter),
- ImmutableList.of((GadgetRewriter) accelRewriter)),
+ new GadgetRewritersProvider(ImmutableList.of((GadgetRewriter)
captureRewriter)),
null);
}
@@ -126,13 +113,6 @@ public class HtmlRendererTest {
assertTrue("Rewriting not performed.", captureRewriter.viewWasRewritten());
}
- @Test
- public void doAccelRewriting() throws Exception {
- renderer.render(makeGadget(BASIC_HTML_CONTENT).setContext(ACCEL_CONTEXT));
- assertTrue("Rewriting should not be not performed.",
!captureRewriter.viewWasRewritten());
- assertTrue("Rewriting not performed.", accelRewriter.viewWasRewritten());
- }
-
private static class FakeProxyRenderer extends ProxyRenderer {
public FakeProxyRenderer() {
super(null, null, null);
Modified:
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java?rev=964180&r1=964179&r2=964180&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java
(original)
+++
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java
Wed Jul 14 20:23:15 2010
@@ -19,7 +19,6 @@
package org.apache.shindig.gadgets.servlet;
import com.google.common.collect.ImmutableMap;
-
import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.config.AbstractContainerConfig;
@@ -33,13 +32,14 @@ import org.apache.shindig.gadgets.rewrit
import org.apache.shindig.gadgets.uri.AccelUriManager;
import org.apache.shindig.gadgets.uri.DefaultAccelUriManager;
import org.apache.shindig.gadgets.uri.DefaultProxyUriManager;
-import static org.easymock.EasyMock.expect;
import org.junit.Before;
import org.junit.Test;
import java.util.Arrays;
import java.util.Map;
+import static org.easymock.EasyMock.expect;
+
public class HtmlAccelServletTest extends ServletTestFixture {
private static class FakeContainerConfig extends AbstractContainerConfig {
@@ -75,7 +75,6 @@ public class HtmlAccelServletTest extend
@Before
public void setUp() throws Exception {
- servlet = new HtmlAccelServlet();
ContainerConfig config = new FakeContainerConfig();
AccelUriManager accelUriManager = new DefaultAccelUriManager(
config, new DefaultProxyUriManager(config, null));
@@ -83,8 +82,9 @@ public class HtmlAccelServletTest extend
rewriter = new FakeCaptureRewriter();
rewriterRegistry = new DefaultResponseRewriterRegistry(
Arrays.<ResponseRewriter>asList(rewriter), null);
+ servlet = new HtmlAccelServlet();
servlet.setHandler(new AccelHandler(pipeline, rewriterRegistry,
- accelUriManager));
+ accelUriManager));
}
@Test
