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/07/20 01:27:48 UTC
svn commit: r965677 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/oauth/
main/java/org/apache/shindig/gadgets/oauth/testing/
main/java/org/apache/shindig/gadgets/rewrite/
test/java/org/apache/shindig/gadgets/servlet/
Author: lindner
Date: Mon Jul 19 23:27:47 2010
New Revision: 965677
URL: http://svn.apache.org/viewvc?rev=965677&view=rev
Log:
minor cleanups
Modified:
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/oauth/testing/FakeOAuthServiceProvider.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitor.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java
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=965677&r1=965676&r2=965677&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 Mon Jul 19 23:27:47 2010
@@ -476,7 +476,7 @@ public class OAuthRequest {
Long.toString(fetcherConfig.getClock().currentTimeMillis() / 1000)));
// the oauth.net java code uses a clock to generate nonces, which causes nonce collisions
// under heavy load. A random nonce is more reliable.
- params.add(new Parameter(OAuth.OAUTH_NONCE, "" + Math.abs(Crypto.RAND.nextLong())));
+ params.add(new Parameter(OAuth.OAUTH_NONCE, String.valueOf(Math.abs(Crypto.RAND.nextLong()))));
}
static String getAuthorizationHeader(List<Map.Entry<String, String>> oauthParams) {
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=965677&r1=965676&r2=965677&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 Mon Jul 19 23:27:47 2010
@@ -756,7 +756,7 @@ public class FakeOAuthServiceProvider im
// Most OAuth service providers are much laxer than this about checking nonces (rapidly
// changing server-side state scales badly), but we are very strict in test cases.
- String nonceKey = info.message.getConsumerKey() + ","
+ String nonceKey = info.message.getConsumerKey() + ','
+ info.message.getParameter("oauth_nonce");
CachedObject<OAuthMessage> previousMessage = nonceCache.getElement(nonceKey);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitor.java?rev=965677&r1=965676&r2=965677&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleTagProxyEmbeddedUrlsVisitor.java Mon Jul 19 23:27:47 2010
@@ -64,6 +64,6 @@ public class StyleTagProxyEmbeddedUrlsVi
elem, contentBase,
CssResponseRewriter.uriMaker(proxyUriManager, config), false);
}
- return nodes.size() > 0;
+ return !nodes.isEmpty();
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java?rev=965677&r1=965676&r2=965677&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HtmlAccelServletTest.java Mon Jul 19 23:27:47 2010
@@ -60,7 +60,7 @@ public class HtmlAccelServletTest extend
}
}
- private class FakeCaptureRewriter extends CaptureRewriter {
+ private static class FakeCaptureRewriter extends CaptureRewriter {
String contentToRewrite;
public void setContentToRewrite(String s) {