You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/06/24 21:31:52 UTC
svn commit: r957693 - in /shindig/trunk/java:
gadgets/src/main/java/org/apache/shindig/gadgets/http/
gadgets/src/main/java/org/apache/shindig/gadgets/oauth/
gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/
gadgets/src/main/java/org/apach...
Author: lindner
Date: Thu Jun 24 19:31:52 2010
New Revision: 957693
URL: http://svn.apache.org/viewvc?rev=957693&view=rev
Log:
SHINDIG-1374 | Patch from Jan Luehe | Fixes for findbugs issues in shindig/java/gadgets, part 2
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ProxyingLinkRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriManager.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java?rev=957693&r1=957692&r2=957693&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java Thu Jun 24 19:31:52 2010
@@ -476,27 +476,25 @@ public class HttpRequest {
return method.hashCode()
^ uri.hashCode()
^ authType.hashCode()
- ^ postBody.hashCode()
+ ^ Arrays.hashCode(postBody)
^ headers.hashCode();
}
@Override
public boolean equals(Object obj) {
- if (obj == this) {return true;}
- if (obj instanceof HttpRequest) {
- HttpRequest req = (HttpRequest)obj;
- return method.equals(req.method) &&
- uri.equals(req.uri) &&
- authType == req.authType &&
- Arrays.equals(postBody, req.postBody) &&
- headers.equals(req.headers);
- // TODO: Verify that other fields aren't meaningful. Especially important to check for
- // oauth args.
+ if (obj == this) {
+ return true;
}
- return false;
+ if (!(obj instanceof HttpRequest)) {
+ return false;
+ }
+ HttpRequest req = (HttpRequest)obj;
+ return method.equals(req.method) &&
+ uri.equals(req.uri) &&
+ authType == req.authType &&
+ Arrays.equals(postBody, req.postBody) &&
+ headers.equals(req.headers);
+ // TODO: Verify that other fields aren't meaningful. Especially important to check for oauth args.
}
-
-
-
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java?rev=957693&r1=957692&r2=957693&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java Thu Jun 24 19:31:52 2010
@@ -528,7 +528,7 @@ public final class HttpResponse implemen
public int hashCode() {
return httpStatusCode
^ headers.hashCode()
- ^ responseBytes.hashCode();
+ ^ Arrays.hashCode(responseBytes);
}
@Override
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java?rev=957693&r1=957692&r2=957693&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java Thu Jun 24 19:31:52 2010
@@ -48,9 +48,12 @@ public class BasicOAuthStoreConsumerInde
@Override
public boolean equals(final Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof BasicOAuthStoreConsumerIndex)) {
+ return false;
+ }
final BasicOAuthStoreConsumerIndex other = (BasicOAuthStoreConsumerIndex) obj;
if (gadgetUri == null) {
if (other.gadgetUri != null) return false;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java?rev=957693&r1=957692&r2=957693&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndex.java Thu Jun 24 19:31:52 2010
@@ -70,9 +70,12 @@ public class BasicOAuthStoreTokenIndex {
@Override
public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof BasicOAuthStoreTokenIndex)) {
+ return false;
+ }
final BasicOAuthStoreTokenIndex other = (BasicOAuthStoreTokenIndex) obj;
if (gadgetUri == null) {
if (other.gadgetUri != null) return false;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java?rev=957693&r1=957692&r2=957693&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/testing/FakeOAuthServiceProvider.java Thu Jun 24 19:31:52 2010
@@ -121,7 +121,6 @@ public class FakeOAuthServiceProvider im
private class TokenState {
String tokenSecret;
- OAuthConsumer consumer;
State state;
String userData;
String sessionHandle;
@@ -129,9 +128,8 @@ public class FakeOAuthServiceProvider im
String callbackUrl;
String verifier;
- public TokenState(String tokenSecret, OAuthConsumer consumer, String callbackUrl) {
+ public TokenState(String tokenSecret, String callbackUrl) {
this.tokenSecret = tokenSecret;
- this.consumer = consumer;
this.state = State.PENDING;
this.userData = null;
this.callbackUrl = callbackUrl;
@@ -331,7 +329,7 @@ public class FakeOAuthServiceProvider im
String requestTokenSecret = Crypto.getRandomString(16);
String callbackUrl = info.message.getParameter(OAuth.OAUTH_CALLBACK);
tokenState.put(
- requestToken, new TokenState(requestTokenSecret, accessor.consumer, callbackUrl));
+ requestToken, new TokenState(requestTokenSecret, callbackUrl));
List<Parameter> responseParams = OAuth.newList(
"oauth_token", requestToken,
"oauth_token_secret", requestTokenSecret);
@@ -539,7 +537,7 @@ public class FakeOAuthServiceProvider im
public TokenPair getPreapprovedToken(String userData) {
String requestToken = Crypto.getRandomString(16);
String requestTokenSecret = Crypto.getRandomString(16);
- TokenState state = new TokenState(requestTokenSecret, oauthConsumer, null);
+ TokenState state = new TokenState(requestTokenSecret, null);
state.approveToken();
state.setUserData(userData);
tokenState.put(requestToken, state);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java?rev=957693&r1=957692&r2=957693&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/ParseModule.java Thu Jun 24 19:31:52 2010
@@ -17,12 +17,12 @@
*/
package org.apache.shindig.gadgets.parse;
-import org.apache.shindig.gadgets.parse.nekohtml.NekoSimplifiedHtmlParser;
-
import com.google.inject.AbstractModule;
import com.google.inject.Provider;
+import org.apache.shindig.gadgets.parse.nekohtml.NekoSimplifiedHtmlParser;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.bootstrap.DOMImplementationRegistry;
+import java.lang.reflect.InvocationTargetException;
/**
* Provide parse bindings
@@ -60,8 +60,14 @@ public class ParseModule extends Abstrac
Class.forName("org.apache.xerces.dom.DOMImplementationImpl").
getMethod("getDOMImplementation").invoke(null);
}
- } catch (Exception ex) {
- //try another
+ } catch (ClassNotFoundException ex) {
+ // ignore, try another
+ } catch (IllegalAccessException ex) {
+ // ignore, try another
+ } catch (InvocationTargetException ex) {
+ // ignore, try another
+ } catch (NoSuchMethodException ex) {
+ // ignore, try another
}
try {
if (domImpl == null) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ProxyingLinkRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ProxyingLinkRewriter.java?rev=957693&r1=957692&r2=957693&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ProxyingLinkRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/old/ProxyingLinkRewriter.java Thu Jun 24 19:31:52 2010
@@ -71,7 +71,7 @@ public class ProxyingLinkRewriter implem
if(ignoreCache)
result.append("&nocache=1");
if (rewriterFeature.getExpires() != null &&
- rewriterFeature.getExpires() != ContentRewriterFeature.EXPIRES_DEFAULT) {
+ !rewriterFeature.getExpires().equals(ContentRewriterFeature.EXPIRES_DEFAULT)) {
result.append('&').append(ProxyBase.REFRESH_PARAM).append('=').append(rewriterFeature.getExpires().toString());
}
return result.toString();
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=957693&r1=957692&r2=957693&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 Thu Jun 24 19:31:52 2010
@@ -67,6 +67,9 @@ public interface ProxyUriManager {
@Override
public boolean equals(Object obj) {
+ if (obj == this) {
+ return true;
+ }
if (!(obj instanceof ProxyUri)) {
return false;
}
@@ -77,10 +80,15 @@ public interface ProxyUriManager {
&& 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);
}
-
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(super.hashCode(), resource, fallbackUrl, resizeHeight,
+ resizeWidth, resizeQuality, resizeNoExpand);
+ }
+
/* (non-Javadoc)
* @see org.apache.shindig.gadgets.uri.ProxyUriBase#setFromUri(org.apache.shindig.common.uri.Uri)
*/
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java?rev=957693&r1=957692&r2=957693&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java Thu Jun 24 19:31:52 2010
@@ -22,6 +22,7 @@ import static org.easymock.EasyMock.capt
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
+import com.google.common.base.Objects;
import com.google.common.collect.Maps;
import org.apache.shindig.common.uri.Uri;
@@ -234,13 +235,20 @@ public class ProxyHandlerTest extends Se
@Override
public boolean equals(Object obj) {
- if (obj instanceof HttpRequest) {
- HttpRequest req = (HttpRequest)obj;
- if (req.getCacheTtl() != getCacheTtl() || req.getIgnoreCache() != getIgnoreCache()) {
- return false;
- }
+ if (obj == this) {
+ return true;
}
- return super.equals(obj);
+ if (!(obj instanceof HttpRequest)) {
+ return false;
+ }
+ HttpRequest req = (HttpRequest)obj;
+ return super.equals(obj) && req.getCacheTtl() == getCacheTtl() &&
+ req.getIgnoreCache() == getIgnoreCache();
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(super.hashCode(), getCacheTtl(), getIgnoreCache());
}
}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java?rev=957693&r1=957692&r2=957693&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java Thu Jun 24 19:31:52 2010
@@ -159,6 +159,10 @@ public class CollectionOptions {
// These are overriden so that EasyMock doesn't throw a fit
@Override
public boolean equals(final Object o) {
+ if (o == this) {
+ return true;
+ }
+
if (!(o instanceof CollectionOptions)) {
return false;
}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java?rev=957693&r1=957692&r2=957693&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/GroupId.java Thu Jun 24 19:31:52 2010
@@ -76,6 +76,10 @@ public class GroupId {
// These are overriden so that EasyMock doesn't throw a fit
@Override
public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+
if (!(o instanceof GroupId)) {
return false;
}
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java?rev=957693&r1=957692&r2=957693&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/UserId.java Thu Jun 24 19:31:52 2010
@@ -86,6 +86,10 @@ public class UserId {
// These are overriden so that EasyMock doesn't throw a fit
@Override
public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+
if (!(o instanceof UserId)) {
return false;
}