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/05/20 10:17:19 UTC
svn commit: r658156 - in /incubator/shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java
test/java/org/apache/shindig/gadgets/GadgetTestFixture.java
Author: etnu
Date: Tue May 20 01:17:18 2008
New Revision: 658156
URL: http://svn.apache.org/viewvc?rev=658156&view=rev
Log:
Improved guice integration for BasicGadgetSpecFactory -- uses a real boolean and won't create unnecessary instances.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java?rev=658156&r1=658155&r2=658156&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSpecFactory.java Tue May 20 01:17:18 2008
@@ -18,9 +18,6 @@
*/
package org.apache.shindig.gadgets;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-
import org.apache.shindig.gadgets.http.HttpFetcher;
import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.http.HttpResponse;
@@ -29,11 +26,16 @@
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.View;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
+
import java.net.URI;
/**
* Basic implementation of a gadget spec factory
*/
+@Singleton
public class BasicGadgetSpecFactory implements GadgetSpecFactory {
private final HttpFetcher specFetcher;
@@ -72,9 +74,9 @@
@Inject
public BasicGadgetSpecFactory(HttpFetcher specFetcher,
ContentRewriter rewriter,
- @Named("content-rewrite.enabled") String defaultEnableRewrite) {
+ @Named("content-rewrite.enabled") boolean defaultEnableRewrite) {
this.specFetcher = specFetcher;
this.rewriter = rewriter;
- this.enableRewrite = Boolean.parseBoolean(defaultEnableRewrite);
+ this.enableRewrite = defaultEnableRewrite;
}
}
\ No newline at end of file
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java?rev=658156&r1=658155&r2=658156&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java Tue May 20 01:17:18 2008
@@ -40,7 +40,7 @@
public final HttpFetcher fetcher = mock(HttpFetcher.class);
public final GadgetBlacklist blacklist = mock(GadgetBlacklist.class);
public final GadgetSpecFactory specFactory =
- new BasicGadgetSpecFactory(fetcher, new NoOpContentRewriter(), "true");
+ new BasicGadgetSpecFactory(fetcher, new NoOpContentRewriter(), true);
public final MessageBundleFactory bundleFactory =
new BasicMessageBundleFactory(fetcher);
public GadgetFeatureRegistry registry;