Author: johnh
Date: Fri Apr 9 22:12:24 2010
New Revision: 932636
URL: http://svn.apache.org/viewvc?rev=932636&view=rev
Log:
Dangling-comma fix, multiple cleanups for ProxyUris.
Modified:
shindig/trunk/features/src/main/javascript/features/core.io/io.js
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriManager.java
Modified: shindig/trunk/features/src/main/javascript/features/core.io/io.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/core.io/io.js?rev=932636&r1=932635&r2=932636&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/core.io/io.js (original)
+++ shindig/trunk/features/src/main/javascript/features/core.io/io.js Fri Apr
9 22:12:24 2010
@@ -389,7 +389,7 @@ gadgets.io = function() {
container : urlParams.container || urlParams.synd || "default",
// should we bypass gadget spec cache (e.g. to read OAuth provider
URLs)
bypassSpecCache : gadgets.util.getUrlParameters().nocache || "",
- getFullHeaders : !!params.GET_FULL_HEADERS,
+ getFullHeaders : !!params.GET_FULL_HEADERS
};
// OAuth goodies
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java?rev=932636&r1=932635&r2=932636&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
Fri Apr 9 22:12:24 2010
@@ -16,11 +16,20 @@
*/
package org.apache.shindig.gadgets.oauth;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+import net.oauth.OAuth;
+import net.oauth.OAuthAccessor;
+import net.oauth.OAuthException;
+import net.oauth.OAuthMessage;
+import net.oauth.OAuthProblemException;
+import net.oauth.OAuth.Parameter;
+
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
-
import org.apache.shindig.auth.OAuthConstants;
import org.apache.shindig.auth.OAuthUtil;
import org.apache.shindig.common.uri.Uri;
@@ -35,17 +44,6 @@ import org.apache.shindig.gadgets.oauth.
import org.apache.shindig.gadgets.oauth.AccessorInfo.OAuthParamLocation;
import
org.apache.shindig.gadgets.oauth.OAuthResponseParams.OAuthRequestException;
import org.apache.shindig.gadgets.oauth.OAuthStore.TokenInfo;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-import net.oauth.OAuth;
-import net.oauth.OAuthAccessor;
-import net.oauth.OAuthException;
-import net.oauth.OAuthMessage;
-import net.oauth.OAuthProblemException;
-import net.oauth.OAuth.Parameter;
-
import org.json.JSONObject;
import java.io.IOException;
@@ -200,6 +198,8 @@ public class OAuthRequest {
// No data for us.
if
(OAuthError.UNAUTHENTICATED.toString().equals(responseParams.getError())) {
responseParams.logDetailedInfo("Unauthenticated OAuth fetch", e);
+ } else if
(OAuthError.INVALID_REQUEST.toString().equals(responseParams.getError())) {
+ responseParams.logDetailedInfo("Invalid OAuth fetch request", e);
} else {
responseParams.logDetailedWarning("OAuth fetch fatal error", e);
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java?rev=932636&r1=932635&r2=932636&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ConcatUriManager.java
Fri Apr 9 22:12:24 2010
@@ -18,11 +18,12 @@
*/
package org.apache.shindig.gadgets.uri;
+import com.google.common.base.Objects;
+import com.google.common.collect.Lists;
+
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.Gadget;
-import com.google.common.collect.Lists;
-
import java.util.List;
import java.util.Map;
@@ -135,6 +136,18 @@ public interface ConcatUriManager {
this.splitParam = splitParam;
this.type = type;
}
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof ConcatUri)) {
+ return false;
+ }
+ ConcatUri objUri = (ConcatUri) obj;
+ return (super.equals(obj)
+ && Objects.equal(this.batch, objUri.batch)
+ && Objects.equal(this.splitParam, objUri.splitParam)
+ && Objects.equal(this.type, objUri.type));
+ }
public List<Uri> getBatch() {
return batch;
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java?rev=932636&r1=932635&r2=932636&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
Fri Apr 9 22:12:24 2010
@@ -18,6 +18,11 @@
*/
package org.apache.shindig.gadgets.uri;
+import com.google.common.collect.Lists;
+import com.google.inject.ImplementedBy;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.uri.UriBuilder;
import org.apache.shindig.config.ContainerConfig;
@@ -28,11 +33,6 @@ import org.apache.shindig.gadgets.spec.U
import org.apache.shindig.gadgets.spec.View;
import org.apache.shindig.gadgets.uri.UriCommon.Param;
-import com.google.common.collect.Lists;
-import com.google.inject.ImplementedBy;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -235,7 +235,7 @@ public class DefaultIframeUriManager imp
protected String getScheme(Gadget gadget, String container) {
// Scheme-relative by default. Override for specific use cases.
- return "";
+ return null;
}
protected void addExtras(UriBuilder uri) {
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java?rev=932636&r1=932635&r2=932636&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
Fri Apr 9 22:12:24 2010
@@ -18,6 +18,8 @@
*/
package org.apache.shindig.gadgets.uri;
+import com.google.common.base.Objects;
+
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.shindig.common.uri.Uri;
@@ -67,6 +69,7 @@ public class ProxyUriBase {
* Note this function is called by a constructor,
* and can be override to handle derived class parsing
*/
+ @SuppressWarnings("deprecation") // we still need to support SYND while
parsing
public void setFromUri(Uri uri) {
if (uri != null) {
refresh = getIntegerValue(uri.getQueryParameter(Param.REFRESH.getKey()));
@@ -82,7 +85,23 @@ public class ProxyUriBase {
sanitizeContent =
getBooleanValue(uri.getQueryParameter(Param.SANITIZE.getKey()));
}
}
-
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof ProxyUriBase)) {
+ return false;
+ }
+ ProxyUriBase objUri = (ProxyUriBase) obj;
+ return (Objects.equal(this.status, objUri.status)
+ && Objects.equal(this.refresh, objUri.refresh)
+ && Objects.equal(this.container, objUri.container)
+ && Objects.equal(this.gadget, objUri.gadget)
+ && Objects.equal(this.rewriteMimeType, objUri.rewriteMimeType)
+ && this.noCache == objUri.noCache
+ && this.debug == objUri.debug
+ && this.sanitizeContent == objUri.sanitizeContent);
+ }
+
public ProxyUriBase setRewriteMimeType(String type) {
this.rewriteMimeType = type;
return this;
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriManager.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriManager.java?rev=932636&r1=932635&r2=932636&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriManager.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriManager.java
Fri Apr 9 22:12:24 2010
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.gadgets.uri;
+import com.google.common.base.Objects;
import com.google.common.collect.Lists;
import org.apache.shindig.common.uri.Uri;
@@ -64,6 +65,22 @@ public interface ProxyUriManager {
this.resource = resource;
}
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof ProxyUri)) {
+ return false;
+ }
+ ProxyUri objUri = (ProxyUri) obj;
+ return (super.equals(obj)
+ && Objects.equal(this.resource, objUri.resource)
+ && Objects.equal(this.fallbackUrl, objUri.fallbackUrl)
+ && Objects.equal(this.resizeHeight, objUri.resizeHeight)
+ && Objects.equal(this.resizeWidth, objUri.resizeWidth)
+ && Objects.equal(this.resizeQuality, objUri.resizeQuality)
+ && Objects.equal(this.resizeWidth, objUri.resizeWidth)
+ && this.resizeNoExpand == objUri.resizeNoExpand);
+ }
+
/* (non-Javadoc)
* @see
org.apache.shindig.gadgets.uri.ProxyUriBase#setFromUri(org.apache.shindig.common.uri.Uri)
*/
