You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by et...@apache.org on 2008/09/27 01:21:59 UTC
svn commit: r699531 - in /incubator/shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/ test/java/org/apache/shindig/gadgets/
test/java/org/apache/shindig/gadgets/rewrite/
Author: etnu
Date: Fri Sep 26 16:21:59 2008
New Revision: 699531
URL: http://svn.apache.org/viewvc?rev=699531&view=rev
Log:
Removed last dependencies on old Gadget ctor. Gadget is now just a simple data object again.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultUrlGeneratorTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java?rev=699531&r1=699530&r2=699531&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java Fri Sep 26 16:21:59 2008
@@ -17,24 +17,11 @@
*/
package org.apache.shindig.gadgets;
-import org.apache.shindig.common.ContainerConfig;
-import org.apache.shindig.gadgets.http.HttpResponse;
-import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
import org.apache.shindig.gadgets.preload.Preloads;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.LocaleSpec;
-import org.apache.shindig.gadgets.spec.Preload;
import org.apache.shindig.gadgets.spec.View;
-import com.google.common.collect.Maps;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.Future;
-
/**
* Intermediary representation of all state associated with processing
* of a single gadget request.
@@ -46,34 +33,6 @@
private View currentView;
private String content;
- @Deprecated
- private Collection<JsLibrary> jsLibraries;
-
- @Deprecated
- private Map<Preload, Future<HttpResponse>> preloadMap;
-
- public Gadget() { }
-
- /**
- * @deprecated Use default ctor and setter methods instead.
- *
- * TODO: Remove this entirely. The only code paths using it should be for the old rendering
- * pipeline, so this can be removed once that's gone.
- */
- @Deprecated
- public Gadget(GadgetContext context, GadgetSpec spec,
- Collection<JsLibrary> jsLibraries, ContainerConfig containerConfig,
- GadgetHtmlParser contentParser) {
- this.preloadMap = Maps.newHashMap();
- this.context = context;
- this.spec = spec;
- this.jsLibraries = jsLibraries;
- currentView = getView(containerConfig);
- if (currentView != null) {
- content = currentView.getContent();
- }
- }
-
/**
* @param context The request that the gadget is being processed for.
*/
@@ -144,54 +103,4 @@
public LocaleSpec getLocale() {
return spec.getModulePrefs().getLocale(context.getLocale());
}
-
- /**
- * @return A mutable collection of JsLibrary objects attached to this Gadget.
- */
- @Deprecated
- public Collection<JsLibrary> getJsLibraries() {
- return jsLibraries;
- }
-
- /**
- * @return A mutable map of preloads.
- */
- @Deprecated
- public Map<Preload, Future<HttpResponse>> getPreloadMap() {
- return preloadMap;
- }
-
- /**
- * Attempts to extract the "current" view for this gadget.
- *
- * @param config The container configuration; used to look for any view name
- * aliases for the container specified in the context.
- */
- @Deprecated
- View getView(ContainerConfig config) {
- String viewName = context.getView();
- View view = spec.getView(viewName);
- if (view == null) {
- JSONArray aliases = config.getJsonArray(context.getContainer(),
- "gadgets.features/views/" + viewName + "/aliases");
- if (aliases != null) {
- try {
- for (int i = 0, j = aliases.length(); i < j; ++i) {
- viewName = aliases.getString(i);
- view = spec.getView(viewName);
- if (view != null) {
- break;
- }
- }
- } catch (JSONException e) {
- view = null;
- }
- }
-
- if (view == null) {
- view = spec.getView(GadgetSpec.DEFAULT_VIEW);
- }
- }
- return view;
- }
}
\ No newline at end of file
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultUrlGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultUrlGeneratorTest.java?rev=699531&r1=699530&r2=699531&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultUrlGeneratorTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultUrlGeneratorTest.java Fri Sep 26 16:21:59 2008
@@ -26,15 +26,14 @@
import org.apache.commons.lang.StringEscapeUtils;
-import junitx.framework.StringAssert;
-
import java.net.URI;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import junitx.framework.StringAssert;
+
/**
* Tests for DefaultUrlGenerator.
*/
@@ -126,7 +125,11 @@
"</Module>";
GadgetSpec spec = new GadgetSpec(URI.create(SPEC_URL), xml);
replay();
- Gadget gadget = new Gadget(context, spec, Collections.<JsLibrary>emptyList(), containerConfig, null);
+
+ Gadget gadget = new Gadget()
+ .setContext(context)
+ .setSpec(spec)
+ .setCurrentView(spec.getView("default"));
URI iframeUrl = URI.create(realUrlGenerator.getIframeUrl(gadget));
@@ -146,7 +149,10 @@
"</Module>";
GadgetSpec spec = new GadgetSpec(URI.create(SPEC_URL), xml);
replay();
- Gadget gadget = new Gadget(context, spec, Collections.<JsLibrary>emptyList(), containerConfig, null);
+ Gadget gadget = new Gadget()
+ .setContext(context)
+ .setSpec(spec)
+ .setCurrentView(spec.getView("default"));
URI iframeUrl = URI.create(realUrlGenerator.getIframeUrl(gadget));
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java?rev=699531&r1=699530&r2=699531&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java Fri Sep 26 16:21:59 2008
@@ -18,28 +18,14 @@
*/
package org.apache.shindig.gadgets;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.replay;
import static org.junit.Assert.assertEquals;
-import org.apache.shindig.common.ContainerConfig;
-import org.apache.shindig.gadgets.http.HttpResponse;
-import org.apache.shindig.gadgets.parse.caja.CajaHtmlParser;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.LocaleSpec;
-import org.apache.shindig.gadgets.spec.Preload;
-import org.apache.shindig.gadgets.spec.View;
-import org.easymock.classextension.EasyMock;
-import org.json.JSONArray;
-import org.junit.Before;
import org.junit.Test;
import java.net.URI;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
/**
* Tests for Gadget
@@ -59,92 +45,18 @@
"<Content view='two' type='html'>VIEW TWO</Content>" +
"</Module>";
- private final ContainerConfig config
- = EasyMock.createNiceMock(ContainerConfig.class);
private final DummyContext context = new DummyContext();
- private GadgetSpec spec;
- private Gadget gadget;
- private List<JsLibrary> libraries;
-
- @Before
- public void setUp() throws Exception {
- JsLibrary lib
- = JsLibrary.create(JsLibrary.Type.INLINE, "var foo='bar';", "core", null);
-
- spec = new GadgetSpec(URI.create(SPEC_URL), SPEC_XML);
- libraries = Arrays.asList(lib);
- gadget = new Gadget(context, spec, libraries, config, new CajaHtmlParser());
- }
-
- @Test
- public void getView() {
- context.view = "two";
-
- replay(config);
- View view = gadget.getView(config);
-
- assertEquals("VIEW TWO", view.getContent());
- }
-
- @Test
- public void getDefaultView() {
- context.view = "unknown";
-
- replay(config);
- View view = gadget.getView(config);
-
- assertEquals("DEFAULT VIEW", view.getContent());
- }
-
@Test
- public void getAliasedView() {
- context.view = "unknown";
- context.container = "foo";
+ public void getLocale() throws Exception {
+ Gadget gadget = new Gadget()
+ .setContext(context)
+ .setSpec(new GadgetSpec(URI.create(SPEC_URL), SPEC_XML));
- String aliasStr = "gadgets.features/views/unknown/aliases";
- JSONArray aliases = new JSONArray().put("blah").put("one");
-
- expect(config.getJsonArray(context.container, aliasStr)).andReturn(aliases);
- replay(config);
-
- View view = gadget.getView(config);
-
- assertEquals("VIEW ONE", view.getContent());
- }
-
- @Test
- public void getLocale() {
LocaleSpec localeSpec = gadget.getLocale();
assertEquals("VALUE", localeSpec.getMessageBundle().getMessages().get("name"));
}
- @Test
- public void contextIsAPassThrough() {
- assertEquals(context, gadget.getContext());
- }
-
- @Test
- public void getJsLibrariesNotAltered() {
- assertEquals(libraries, gadget.getJsLibraries());
- }
-
- @Test
- public void getSpecNotAltered() {
- assertEquals(spec.toString(), gadget.getSpec().toString());
- }
-
- @Test
- public void preloadMapIsJustADummyMap() throws Exception {
- HttpResponse response = HttpResponse.error();
-
- Preload preload = spec.getModulePrefs().getPreloads().get(0);
-
- gadget.getPreloadMap().put(preload, new DummyFuture<HttpResponse>(response));
-
- assertEquals(response, gadget.getPreloadMap().get(preload).get());
- }
-
private static class DummyContext extends GadgetContext {
public String view = super.getView();
public String container = super.getContainer();
@@ -159,33 +71,4 @@
return container;
}
}
-
- private static class DummyFuture<T> implements Future<T> {
-
- private final T value;
-
- public T get() {
- return value;
- }
-
- public T get(long timeout, TimeUnit unit) {
- return value;
- }
-
- public boolean isDone() {
- return true;
- }
-
- public boolean isCancelled() {
- return false;
- }
-
- public boolean cancel(boolean ignore) {
- return false;
- }
-
- public DummyFuture(T value) {
- this.value = value;
- }
- }
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java?rev=699531&r1=699530&r2=699531&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriterRegistryTest.java Fri Sep 26 16:21:59 2008
@@ -20,23 +20,18 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import org.apache.shindig.common.ContainerConfig;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetContext;
-import org.apache.shindig.gadgets.JsLibrary;
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import com.google.common.collect.Lists;
-import org.easymock.classextension.EasyMock;
-import org.easymock.classextension.IMocksControl;
import org.junit.Test;
import java.net.URI;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -47,8 +42,6 @@
= Lists.<ContentRewriter>newArrayList(rewriters);
private final ContentRewriterRegistry registry
= new DefaultContentRewriterRegistry(contentRewriters, null);
- private final IMocksControl control = EasyMock.createNiceControl();
- private final ContainerConfig config = control.createMock(ContainerConfig.class);
@Test
public void rewriteGadget() throws Exception {
@@ -56,9 +49,10 @@
String xml = "<Module><ModulePrefs title=''/><Content>" + body + "</Content></Module>";
GadgetSpec spec = new GadgetSpec(URI.create("#"), xml);
GadgetContext context = new GadgetContext();
- Gadget gadget = new Gadget(context, spec, new ArrayList<JsLibrary>(), config, null);
-
- control.replay();
+ Gadget gadget = new Gadget()
+ .setContext(context)
+ .setSpec(spec)
+ .setContent(spec.getView("default").getContent());
registry.rewriteGadget(gadget);