You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by aw...@apache.org on 2009/02/20 23:07:19 UTC
svn commit: r746383 - in /incubator/shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/
main/java/org/apache/shindig/gadgets/oauth/
main/java/org/apache/shindig/gadgets/rewrite/
test/java/org/apache/shindig/gadgets/ test/java/org/apac...
Author: awiner
Date: Fri Feb 20 22:07:18 2009
New Revision: 746383
URL: http://svn.apache.org/viewvc?rev=746383&view=rev
Log:
Remove deprecated GadgetSpecFactory.getGadgetSpec(URI, boolean) method, eliminating all call-sites in favor of dummied-up GadgetContexts.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFactory.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureFactory.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetSpecFactory.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java?rev=746383&r1=746382&r2=746383&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactory.java Fri Feb 20 22:07:18 2009
@@ -30,18 +30,16 @@
import org.apache.shindig.gadgets.spec.ApplicationManifest;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.SpecParserException;
+import org.w3c.dom.Element;
+
+import java.util.concurrent.ExecutorService;
+import java.util.logging.Logger;
import com.google.common.base.Objects;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
-import org.w3c.dom.Element;
-
-import java.net.URI;
-import java.util.concurrent.ExecutorService;
-import java.util.logging.Logger;
-
/**
* Default implementation of a gadget spec factory.
*/
@@ -89,21 +87,6 @@
return fetchObject(Uri.fromJavaUri(context.getUrl()), context, false);
}
- public GadgetSpec getGadgetSpec(final URI gadgetUri, final boolean ignoreCache)
- throws GadgetException {
- return getGadgetSpec(new GadgetContext() {
- @Override
- public URI getUrl() {
- return gadgetUri;
- }
-
- @Override
- public boolean getIgnoreCache() {
- return ignoreCache;
- }
- });
- }
-
private GadgetSpec getSpecFromManifest(ApplicationManifest manifest, GadgetContext context)
throws GadgetException {
String version = context.getParameter(VERSION_PARAM);
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFactory.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFactory.java?rev=746383&r1=746382&r2=746383&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFactory.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetSpecFactory.java Fri Feb 20 22:07:18 2009
@@ -22,8 +22,6 @@
import com.google.inject.ImplementedBy;
-import java.net.URI;
-
/**
* Factory of gadget specs.
*/
@@ -32,13 +30,4 @@
/** Return a gadget spec for a context */
public GadgetSpec getGadgetSpec(GadgetContext context) throws GadgetException;
-
- /**
- * Return a gadget spec for a URI.
- *
- * @deprecated Use {@link #getGadgetSpec(GadgetContext)} instead.
- */
- @Deprecated
- public GadgetSpec getGadgetSpec(URI gadgetUri, boolean ignoreCache) throws GadgetException;
-
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java?rev=746383&r1=746382&r2=746383&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/GadgetOAuthTokenStore.java Fri Feb 20 22:07:18 2009
@@ -18,6 +18,8 @@
package org.apache.shindig.gadgets.oauth;
import org.apache.shindig.auth.SecurityToken;
+import org.apache.shindig.config.ContainerConfig;
+import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.GadgetSpecFactory;
import org.apache.shindig.gadgets.oauth.AccessorInfo.HttpMethod;
@@ -31,6 +33,7 @@
import org.apache.shindig.gadgets.spec.OAuthService.Location;
import org.apache.shindig.gadgets.spec.OAuthService.Method;
+import com.google.common.base.Objects;
import com.google.inject.Inject;
import net.oauth.OAuthServiceProvider;
@@ -226,12 +229,35 @@
throw responseParams.oauthRequestException(OAuthError.INVALID_REQUEST, "Unknown method " + method);
}
- private GadgetSpec findSpec(SecurityToken securityToken, OAuthArguments arguments,
+ private GadgetSpec findSpec(final SecurityToken securityToken, final OAuthArguments arguments,
OAuthResponseParams responseParams) throws OAuthRequestException {
try {
- return specFactory.getGadgetSpec(
- new URI(securityToken.getAppUrl()),
- arguments.getBypassSpecCache());
+ final URI uri = new URI(securityToken.getAppUrl());
+
+ GadgetContext context = new GadgetContext() {
+ @Override
+ public String getContainer() {
+ return Objects.firstNonNull(securityToken.getContainer(),
+ ContainerConfig.DEFAULT_CONTAINER);
+ }
+
+ @Override
+ public SecurityToken getToken() {
+ return securityToken;
+ }
+
+ @Override
+ public URI getUrl() {
+ return uri;
+ }
+
+ @Override
+ public boolean getIgnoreCache() {
+ return arguments.getBypassSpecCache();
+ }
+ };
+
+ return specFactory.getGadgetSpec(context);
} catch (URISyntaxException e) {
throw responseParams.oauthRequestException(OAuthError.UNKNOWN_PROBLEM,
"Could not fetch gadget spec, gadget URI invalid.", e);
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureFactory.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureFactory.java?rev=746383&r1=746382&r2=746383&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureFactory.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeatureFactory.java Fri Feb 20 22:07:18 2009
@@ -18,6 +18,7 @@
package org.apache.shindig.gadgets.rewrite;
import org.apache.shindig.common.uri.Uri;
+import org.apache.shindig.gadgets.GadgetContext;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.GadgetSpecFactory;
import org.apache.shindig.gadgets.http.HttpRequest;
@@ -75,9 +76,16 @@
Uri gadgetUri = request.getGadget();
GadgetSpec spec;
if (gadgetUri != null) {
- URI gadgetJavaUri = gadgetUri.toJavaUri();
+ final URI gadgetJavaUri = gadgetUri.toJavaUri();
try {
- spec = specFactory.getGadgetSpec(gadgetJavaUri, false);
+ GadgetContext context = new GadgetContext() {
+ @Override
+ public URI getUrl() {
+ return gadgetJavaUri;
+ }
+ };
+
+ spec = specFactory.getGadgetSpec(context);
if (spec != null) {
return get(spec);
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetSpecFactory.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetSpecFactory.java?rev=746383&r1=746382&r2=746383&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetSpecFactory.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetSpecFactory.java Fri Feb 20 22:07:18 2009
@@ -31,15 +31,11 @@
public static final String SERVICE_NAME = "testservice";
public static final String SERVICE_NAME_NO_KEY = "nokey";
- public GadgetSpec getGadgetSpec(GadgetContext context) {
- // we don't need this one yet
- return null;
- }
-
- public GadgetSpec getGadgetSpec(URI gadgetUri, boolean ignoreCache) throws GadgetException {
- Uri uri = Uri.fromJavaUri(gadgetUri);
+ public GadgetSpec getGadgetSpec(GadgetContext context) throws GadgetException {
+ Uri uri = Uri.fromJavaUri(context.getUrl());
String gadget = uri.toString();
String baseSpec = GadgetTokenStoreTest.GADGET_SPEC;
+
if (gadget.contains("nokey")) {
// For testing key lookup failures
String nokeySpec = baseSpec.replace(SERVICE_NAME, SERVICE_NAME_NO_KEY);
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java?rev=746383&r1=746382&r2=746383&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/process/ProcessorTest.java Fri Feb 20 22:07:18 2009
@@ -172,10 +172,6 @@
}
return new GadgetSpec(Uri.fromJavaUri(context.getUrl()), GADGET);
}
-
- public GadgetSpec getGadgetSpec(URI uri, boolean ignoreCache) {
- throw new UnsupportedOperationException();
- }
}
private static class FakeVariableSubstituter extends VariableSubstituter {
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java?rev=746383&r1=746382&r2=746383&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/BaseRewriterTestCase.java Fri Feb 20 22:07:18 2009
@@ -167,17 +167,9 @@
});
bind(GadgetSpecFactory.class).toInstance(new GadgetSpecFactory() {
-
public GadgetSpec getGadgetSpec(GadgetContext context) {
- // TODO Auto-generated method stub
return null;
}
-
- public GadgetSpec getGadgetSpec(URI gadgetUri, boolean ignoreCache) {
- // TODO Auto-generated method stub
- return null;
- }
-
});
}
}