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/05/29 11:07:03 UTC
svn commit: r949359 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/auth/
common/src/main/java/org/apache/shindig/common/
common/src/main/java/org/apache/shindig/common/cache/ehcache/
common/src/main/java/org/apache/shindig/common/cry...
Author: lindner
Date: Sat May 29 09:07:02 2010
New Revision: 949359
URL: http://svn.apache.org/viewvc?rev=949359&view=rev
Log:
prep for 2.0.0, run static analysis, cleanups
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/OAuthUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/FutureUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ImmediateFuture.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/Utf8UrlCoder.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/DomUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/OpensocialFunctions.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerPreconditions.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FetchResponseUtils.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequestException.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/ImageUtils.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NullTemplateLibrary.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/HashShaLockedDomainPrefixGenerator.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGeneratorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/OAuthUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/OAuthUtil.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/OAuthUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/OAuthUtil.java Sat May 29 09:07:02 2010
@@ -35,8 +35,9 @@ import java.util.Map.Entry;
* for cases that are extremely unlikely to happen. We turn those IOExceptions in to
* RuntimeExceptions since the caller can't do anything about them anyway.
*/
-public class OAuthUtil {
-
+public final class OAuthUtil {
+ private OAuthUtil() {}
+
public static String getParameter(OAuthMessage message, String name) {
try {
return message.getParameter(name);
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java Sat May 29 09:07:02 2010
@@ -32,7 +32,9 @@ import com.google.common.collect.Maps;
/**
* JSON utilities that are not specific to either serialization or conversion.
*/
-public class JsonUtil {
+public final class JsonUtil {
+ private JsonUtil() {}
+
private static final Set<String> EXCLUDE_METHODS
= ImmutableSet.of("getClass", "getDeclaringClass");
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/cache/ehcache/EhCacheCacheProvider.java Sat May 29 09:07:02 2010
@@ -39,7 +39,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
public class EhCacheCacheProvider implements CacheProvider {
- private final Logger LOG = Logger.getLogger(EhCacheCacheProvider.class.getName());
+ private static final Logger LOG = Logger.getLogger(EhCacheCacheProvider.class.getName());
private final CacheManager cacheManager;
private final Map<String, Cache<?, ?>> caches = new MapMaker().makeMap();
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java Sat May 29 09:07:02 2010
@@ -32,7 +32,7 @@ import javax.crypto.spec.SecretKeySpec;
/**
* Cryptographic utility functions.
*/
-public class Crypto {
+public final class Crypto {
/**
* Use this random number generator instead of creating your own. This is
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/HttpUtil.java Sat May 29 09:07:02 2010
@@ -28,7 +28,9 @@ import java.util.regex.Pattern;
/**
* Collection of HTTP utilities
*/
-public class HttpUtil {
+public final class HttpUtil {
+ private HttpUtil() {}
+
// 1 year.
private static int defaultTtl = 60 * 60 * 24 * 365;
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/CharsetUtil.java Sat May 29 09:07:02 2010
@@ -27,8 +27,9 @@ import java.nio.charset.Charset;
/**
* Utilities for dealing with character set encoding.
*/
-public class CharsetUtil {
-
+public final class CharsetUtil {
+ private CharsetUtil() {}
+
/**
* UTF-8 Charset.
*/
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java Sat May 29 09:07:02 2010
@@ -30,7 +30,7 @@ import java.util.Locale;
/**
* Date parsing and writing utilities.
*/
-public class DateUtil {
+public final class DateUtil {
private static final DateTimeFormatter rfc1123DateFormat = DateTimeFormat
.forPattern("EEE, dd MMM yyyy HH:mm:ss 'GMT'")
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/FutureUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/FutureUtil.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/FutureUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/FutureUtil.java Sat May 29 09:07:02 2010
@@ -27,7 +27,8 @@ import java.util.concurrent.TimeoutExcep
/**
* Utility methods for processing {@link Future} wrapped objects
*/
-public class FutureUtil {
+public final class FutureUtil {
+ private FutureUtil() {}
/**
* Process a {@link Future} wrapped {@link RestfulCollection}
* to return the first (if any) object, as a {@link Future}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/HashUtil.java Sat May 29 09:07:02 2010
@@ -25,7 +25,8 @@ import java.security.NoSuchAlgorithmExce
/**
* Routines for producing hashes.
*/
-public class HashUtil {
+public final class HashUtil {
+ private HashUtil() {}
/**
* Produces a checksum for the given input data.
*
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ImmediateFuture.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ImmediateFuture.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ImmediateFuture.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ImmediateFuture.java Sat May 29 09:07:02 2010
@@ -24,7 +24,7 @@ import java.util.concurrent.ExecutionExc
/**
* Implements a future that is immediately available.
*/
-public class ImmediateFuture {
+public final class ImmediateFuture {
private ImmediateFuture() {}
/**
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java Sat May 29 09:07:02 2010
@@ -35,8 +35,9 @@ import java.util.regex.Pattern;
/**
* Utilities for converting a JSON object to and from a URL encoding
*/
-public class JsonConversionUtil {
-
+public final class JsonConversionUtil {
+ private JsonConversionUtil() {}
+
private static final Pattern ARRAY_MATCH = Pattern.compile("(\\w+)\\((\\d+)\\)");
private static final Set<String> RESERVED_PARAMS = ImmutableSet.of("method", "id", "st", "oauth_token");
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/ResourceLoader.java Sat May 29 09:07:02 2010
@@ -30,8 +30,8 @@ import java.io.InputStream;
/**
* Handles loading contents from resource and file system files.
*/
-public class ResourceLoader {
-
+public final class ResourceLoader {
+ private ResourceLoader() {}
/**
* Opens a given path as either a resource or a file, depending on the path
* name.
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/Utf8UrlCoder.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/Utf8UrlCoder.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/Utf8UrlCoder.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/Utf8UrlCoder.java Sat May 29 09:07:02 2010
@@ -26,7 +26,9 @@ import java.net.URLEncoder;
* Performs url encoding / decoding with forced utf-8. Automatically takes care
* of boilerplate exception handling.
*/
-public class Utf8UrlCoder {
+public final class Utf8UrlCoder {
+
+ private Utf8UrlCoder() {}
public static String encode(String input) {
try {
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/DomUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/DomUtil.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/DomUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/DomUtil.java Sat May 29 09:07:02 2010
@@ -33,7 +33,7 @@ import java.util.Set;
/**
* Utility functions for navigating DOM
*/
-public class DomUtil {
+public final class DomUtil {
private DomUtil() {}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java Sat May 29 09:07:02 2010
@@ -41,7 +41,7 @@ import javax.xml.parsers.ParserConfigura
* Utility class for simplifying parsing of xml documents. Documents are not validated, and
* loading of external files (xinclude, external entities, DTDs, etc.) are disabled.
*/
-public class XmlUtil {
+public final class XmlUtil {
private static final Logger LOG = Logger.getLogger(XmlUtil.class.getName());
// Handles xml errors so that they're not logged to stderr.
private static final ErrorHandler errorHandler = new ErrorHandler() {
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/OpensocialFunctions.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/OpensocialFunctions.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/OpensocialFunctions.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/OpensocialFunctions.java Sat May 29 09:07:02 2010
@@ -32,7 +32,7 @@ import javax.el.ELException;
/**
* Default functions in the "os:" namespace prefix.
*/
-public class OpensocialFunctions {
+public final class OpensocialFunctions {
private OpensocialFunctions() {
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java Sat May 29 09:07:02 2010
@@ -250,9 +250,7 @@ public class BaseRequestItem implements
}
else if (param instanceof List<?>) {
// Assume it's a list of strings. This is not type-safe.
- @SuppressWarnings("unchecked")
- List<String> listParam = (List<String>) param;
- return listParam;
+ return (List<String>) param;
} else if (param instanceof JSONArray) {
try {
JSONArray jsonArray = (JSONArray)param;
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/ContentTypes.java Sat May 29 09:07:02 2010
@@ -28,8 +28,8 @@ import java.util.logging.Logger;
/**
* Common mime content types and utilities
*/
-public class ContentTypes {
-
+public final class ContentTypes {
+ private ContentTypes() {}
private static final Logger logger = Logger.getLogger(ContentTypes.class.getName());
/**
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerPreconditions.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerPreconditions.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerPreconditions.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/HandlerPreconditions.java Sat May 29 09:07:02 2010
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRes
/**
* Utility class for common API call preconditions
*/
-public class HandlerPreconditions {
+public final class HandlerPreconditions {
private HandlerPreconditions() {}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java Sat May 29 09:07:02 2010
@@ -71,8 +71,6 @@ public class BasicGadgetBlacklist implem
*
* @param blacklistFile file containing blacklist entries
* @throws IOException if reading the file fails
- * @throws PatternSyntaxException if an invalid regular expression occurs in
- * the file
*/
public BasicGadgetBlacklist(File blacklistFile) throws IOException {
exactMatches = Sets.newHashSet();
@@ -103,7 +101,7 @@ public class BasicGadgetBlacklist implem
if (parts.length == 1) {
exactMatches.add(line.toLowerCase());
} else if (parts.length == 2
- && parts[0].toUpperCase().equals(REGEXP_PREFIX)) {
+ && parts[0].equalsIgnoreCase(REGEXP_PREFIX)) {
// compile will throw PatternSyntaxException on invalid patterns.
regexpMatches.add(Pattern.compile(parts[1], Pattern.CASE_INSENSITIVE));
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FetchResponseUtils.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FetchResponseUtils.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FetchResponseUtils.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FetchResponseUtils.java Sat May 29 09:07:02 2010
@@ -30,7 +30,7 @@ import java.util.Map;
* Handles converting HttpResponse objects to the format expected by the makeRequest javascript.
*/
public class FetchResponseUtils {
-
+ private FetchResponseUtils() {}
/**
* Convert a response to a JSON object.
*
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java Sat May 29 09:07:02 2010
@@ -28,7 +28,9 @@ import com.ibm.icu.text.CharsetMatch;
*
* Highly skewed towards common encodings (UTF-8 and Latin-1).
*/
-public class EncodingDetector {
+public final class EncodingDetector {
+ private EncodingDetector() {}
+
private static final Charset UTF_8 = Charset.forName("UTF-8");
private static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java Sat May 29 09:07:02 2010
@@ -74,7 +74,8 @@ public class FeatureRegistry {
/**
*
- * @param featureFiles
+ * @param resourceLoader
+ * @param featuresoo
* @throws GadgetException
*/
@Inject
@@ -104,7 +105,7 @@ public class FeatureRegistry {
* That is, their dependencies must all be valid features as well, and the
* dependency tree must not contain circular dependencies.
*
- * @param resourceKey The file or directory to load the feature from. If feature.xml
+ * @param resourceList The files or directories to load the feature from. If feature.xml
* is passed in directly, it will be loaded as a single feature. If a
* directory is passed, any features in that directory (recursively) will
* be loaded. If res://*.txt or res:*.txt is passed, we will look for named resources
@@ -474,7 +475,7 @@ public class FeatureRegistry {
return ImmutableMap.<String, String>builder().putAll(bundleAttribs).putAll(resourceAttribs).build();
}
- private static class InlineFeatureResource extends FeatureResource.Default {
+ private static final class InlineFeatureResource extends FeatureResource.Default {
private final String content;
private InlineFeatureResource(String content) {
@@ -490,7 +491,7 @@ public class FeatureRegistry {
}
}
- private static class FeatureBundle {
+ private static final class FeatureBundle {
private final String type;
private final Map<String, String> attribs;
private final List<FeatureResource> resources;
@@ -514,7 +515,7 @@ public class FeatureRegistry {
}
}
- private static class FeatureNode {
+ private static final class FeatureNode {
private final String name;
private final List<FeatureBundle> bundles;
private final List<String> requestedDeps;
@@ -587,7 +588,7 @@ public class FeatureRegistry {
}
}
- private static class FeatureCacheKey {
+ private static final class FeatureCacheKey {
private final Collection<String> needed;
private final RenderingContext rCtx;
private final String container;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequestException.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequestException.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequestException.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequestException.java Sat May 29 09:07:02 2010
@@ -125,7 +125,7 @@ public class OAuthRequestException exten
@Override
public String toString() {
- return "[" + error + "," + errorText + "]";
+ return '[' + error + ',' + errorText + ']';
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java Sat May 29 09:07:02 2010
@@ -162,11 +162,11 @@ public class OAuthResponseParams {
trace.append("\n====");
int i = 1;
for (Pair<HttpRequest, HttpResponse> event : requestTrace) {
- trace.append("\n==== Sent request " + i + ":\n");
+ trace.append("\n==== Sent request ").append(i).append(":\n");
if (event.one != null) {
trace.append(filterSecrets(event.one.toString()));
}
- trace.append("\n==== Received response " + i + ":\n");
+ trace.append("\n==== Received response ").append(i).append(":\n");
if (event.two != null) {
trace.append(filterSecrets(event.two.toString()));
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaHtmlParser.java Sat May 29 09:07:02 2010
@@ -92,7 +92,7 @@ public class CajaHtmlParser extends Gadg
// Newline works around Caja parser issue with certain short-form
// HTML - the internal Lexer gets confused. A bug has been filed w/ Caja.
// Even so, adding the newline is innocuous for any HTML.
- DomParser parser = getDomParser(source + "\n", mq);
+ DomParser parser = getDomParser(source + '\n', mq);
DocumentFragment fragment = parser.parseFragment();
// Get rid of the newline, if maintained.
Node lastChild = fragment != null ? fragment.getLastChild() : null;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java Sat May 29 09:07:02 2010
@@ -151,7 +151,7 @@ public class ProxyRenderer {
if (userAgent != null) {
String myIdent = getUAIdent();
if (myIdent != null) {
- userAgent = userAgent + " " + myIdent;
+ userAgent = userAgent + ' ' + myIdent;
}
request.setHeader("User-Agent", userAgent);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingResults.java Sat May 29 09:07:02 2010
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRes
/**
* Contains the results of a rendering operation.
*/
-public class RenderingResults {
+public final class RenderingResults {
private final Status status;
private final String content;
private final String errorMessage;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java Sat May 29 09:07:02 2010
@@ -211,7 +211,7 @@ public class SanitizingGadgetRewriter ex
/**
* Restrict the set of allowed tags and attributes
*/
- static class BasicElementFilter extends SanitizingWalker {
+ static final class BasicElementFilter extends SanitizingWalker {
private final Set<String> allowedTags;
private final Set<String> allowedAttributes;
@@ -265,7 +265,7 @@ public class SanitizingGadgetRewriter ex
* Enfore that all images in the document are rewritten through the proxy.
* Prevents issues in IE where the image content contains script
*/
- static class ImageFilter extends SanitizingWalker {
+ static final class ImageFilter extends SanitizingWalker {
private final SanitizingProxyUriManager imageRewriter;
private ImageFilter(ProxyUriManager proxyUriManager) {
@@ -298,7 +298,7 @@ public class SanitizingGadgetRewriter ex
/**
* Pass the contents of style tags through the CSS sanitizer
*/
- static class StyleFilter implements DomWalker.Visitor {
+ static final class StyleFilter implements DomWalker.Visitor {
private final SanitizingProxyUriManager imageRewriter;
private final SanitizingProxyUriManager cssImportRewriter;
private final CajaCssSanitizer cssSanitizer;
@@ -328,7 +328,7 @@ public class SanitizingGadgetRewriter ex
* Restrict link tags to stylesheet content only and force the link to
* be rewritten through the proxy and sanitized
*/
- static class LinkFilter extends SanitizingWalker {
+ static final class LinkFilter extends SanitizingWalker {
private final SanitizingProxyUriManager cssImportRewriter;
private LinkFilter(ProxyUriManager proxyUriManager) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriter.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssRequestRewriter.java Sat May 29 09:07:02 2010
@@ -80,7 +80,7 @@ public class CssRequestRewriter implemen
* Rewrite the given CSS content and optionally extract the import references.
* @param content CSS content
* @param source Uri of content
- * @param rewriter Rewrite urls
+ * @param uriMaker a Uri Maker
* @param writer Output
* @param extractImports If true remove the import statements from the output and return their
* referenced URIs.
@@ -115,7 +115,7 @@ public class CssRequestRewriter implemen
* Rewrite the CSS content in a style DOM node.
* @param styleNode Rewrite the CSS content of this node
* @param source Uri of content
- * @param rewriter Rewrite urls
+ * @param uriMaker a UriMaker
* @param extractImports If true remove the import statements from the output and return their
* referenced URIs.
* @return Empty list of extracted import URIs.
@@ -149,7 +149,7 @@ public class CssRequestRewriter implemen
* Rewrite the CSS DOM in place.
* @param styleSheet To rewrite
* @param source Uri of content
- * @param rewriter Rewrite urls
+ * @param uriMaker a UriMaker
* @param extractImports If true remove the import statements from the output and return their
* referenced URIs.
* @return Empty list of extracted import URIs.
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DomWalker.java Sat May 29 09:07:02 2010
@@ -42,7 +42,9 @@ import java.util.Map;
*
* See subclass doc for additional detail.
*/
-public class DomWalker {
+public final class DomWalker {
+ private DomWalker() {}
+
/**
* Implemented by classes that do actual manipulation of the DOM
* while {@code DomWalker.ContentVisitor} walks it. {@code Visitor}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java Sat May 29 09:07:02 2010
@@ -25,6 +25,7 @@ import org.apache.shindig.gadgets.http.H
* Various utility functions used by rewriters
*/
public class RewriterUtils {
+ private RewriterUtils() {}
public static boolean isHtml(HttpRequest request, HttpResponse original) {
String mimeType = getMimeType(request, original);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java Sat May 29 09:07:02 2010
@@ -258,9 +258,8 @@ public class BasicImageRewriter implemen
/** Gets the feasible resize ratio. */
private double getResizeRatio(int requestedWidth, int requestedHeight, int origWidth,
int origHeight) {
- double ratio = min(requestedWidth / (double) origWidth,
- requestedHeight / (double) origHeight);
- return ratio;
+ return min(requestedWidth / (double) origWidth,
+ requestedHeight / (double) origHeight);
}
/**
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/ImageUtils.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/ImageUtils.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/ImageUtils.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/ImageUtils.java Sat May 29 09:07:02 2010
@@ -31,8 +31,8 @@ import java.util.Map;
/**
* Utility functions for image processing and introspection.
*/
-public class ImageUtils {
-
+public final class ImageUtils {
+ private ImageUtils() {}
/**
* Convert an image to a palletized one. Will not create a palette above a fixed
* number of entries
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java Sat May 29 09:07:02 2010
@@ -60,7 +60,7 @@ import java.util.logging.Logger;
public class CajaContentRewriter implements GadgetRewriter {
public static final String CAJOLED_DOCUMENTS = "cajoledDocuments";
- private final Logger logger = Logger.getLogger(CajaContentRewriter.class.getName());
+ private static final Logger logger = Logger.getLogger(CajaContentRewriter.class.getName());
private final Cache<String, Element> cajoledCache;
private final RequestPipeline requestPipeline;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java Sat May 29 09:07:02 2010
@@ -211,8 +211,7 @@ public class HtmlAccelServlet extends Ga
.setIgnoreCache(context.getIgnoreCache())
.setContainer(context.getContainer());
- HttpResponse results = requestPipeline.execute(request);
- return results;
+ return requestPipeline.execute(request);
}
private void respondVerbatim(HttpResponse results, HttpServletResponse response)
@@ -255,7 +254,7 @@ public class HtmlAccelServlet extends Ga
String paramsStr = null;
String accelUrl = null;
// Check for chain param style request:
- if (path.startsWith(accelServletPrefix + "/")) {
+ if (path.startsWith(accelServletPrefix + '/')) {
int startQuery = accelServletPrefix.length() + 1;
int endQuery = path.indexOf('/', startQuery);
if (endQuery >= startQuery) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java Sat May 29 09:07:02 2010
@@ -54,7 +54,7 @@ public class JsServlet extends InjectedS
"var nm='%s';" +
"if (typeof window[nm]==='function') {" +
"window[nm]();" +
- "}" +
+ '}' +
"})();";
private static final Pattern ONLOAD_FN_PATTERN = Pattern.compile("[a-zA-Z0-9_]+");
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NullTemplateLibrary.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NullTemplateLibrary.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NullTemplateLibrary.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/NullTemplateLibrary.java Sat May 29 09:07:02 2010
@@ -27,7 +27,7 @@ import com.google.common.collect.Immutab
/**
* Null object implementation of TemplateLibrary.
*/
-public class NullTemplateLibrary implements TemplateLibrary {
+public final class NullTemplateLibrary implements TemplateLibrary {
public static final TemplateLibrary INSTANCE = new NullTemplateLibrary();
private final TagRegistry registry = new DefaultTagRegistry(ImmutableSet.<TagHandler>of());
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=949359&r1=949358&r2=949359&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 Sat May 29 09:07:02 2010
@@ -189,7 +189,7 @@ public interface ConcatUriManager {
/**
* Validate the version of the resource list.
- * @param resourceUri Uri of a proxied resource
+ * @param resourceUris Uris of a proxied resource
* @param container Container requesting the resource
* @param value Version value to validate.
* @return Status of the version.
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=949359&r1=949358&r2=949359&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 Sat May 29 09:07:02 2010
@@ -250,7 +250,7 @@ public class DefaultIframeUriManager imp
return versioner.validate(gadgetUri, container, version);
}
- public static final String tplKey(String key) {
+ public static String tplKey(String key) {
return '%' + key + '%';
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/HashShaLockedDomainPrefixGenerator.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/HashShaLockedDomainPrefixGenerator.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/HashShaLockedDomainPrefixGenerator.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/HashShaLockedDomainPrefixGenerator.java Sat May 29 09:07:02 2010
@@ -25,7 +25,6 @@ import org.apache.shindig.common.uri.Uri
public class HashShaLockedDomainPrefixGenerator implements LockedDomainPrefixGenerator {
public String getLockedDomainPrefix(Uri gadgetUri) {
byte[] sha1 = DigestUtils.sha(gadgetUri.toString());
- String hash = new String(Base32.encodeBase32(sha1));
- return hash;
+ return new String(Base32.encodeBase32(sha1)); // a hash
}
}
\ No newline at end of file
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/JsUriManager.java Sat May 29 09:07:02 2010
@@ -64,7 +64,7 @@ public interface JsUriManager {
@ImplementedBy(DefaultJsVersioner.class)
public interface Versioner {
/**
- * @param gadget Gadget for which extern Uri was generated.
+ * @param gadgeUri Gadget for which extern Uri was generated.
* @param extern Collection of libs externed.
* @return Version string for the 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=949359&r1=949358&r2=949359&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 Sat May 29 09:07:02 2010
@@ -242,10 +242,7 @@ public class ProxyUriBase {
}
protected static boolean getBooleanValue(String str) {
- if (str != null && "1".equals(str)) {
- return true;
- }
- return false;
+ return str != null && "1".equals(str);
}
protected static Integer getIntegerValue(String str) {
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGeneratorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGeneratorTest.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGeneratorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetOAuthCallbackGeneratorTest.java Sat May 29 09:07:02 2010
@@ -245,7 +245,7 @@ public class GadgetOAuthCallbackGenerato
}
public void appendTo(StringBuffer buffer) {
- buffer.append("GadgetContextMatcher(" + securityToken + ", " + arguments + ')');
+ buffer.append("GadgetContextMatcher(").append(securityToken).append(", ").append(arguments).append(')');
}
}
}
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PipelineExecutorTest.java Sat May 29 09:07:02 2010
@@ -299,7 +299,7 @@ public class PipelineExecutorTest {
}
public void appendTo(StringBuffer buffer) {
- buffer.append("eqBuffer[social=" + socialCount + ",http=" + httpCount + ']');
+ buffer.append("eqBuffer[social=").append(socialCount).append(",http=").append(httpCount).append(']');
}
public boolean matches(Object obj) {
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriterTest.java Sat May 29 09:07:02 2010
@@ -686,7 +686,7 @@ public class RenderingGadgetRewriterTest
String prefix = "gadgets.config.init(";
int configIdx = content.indexOf(prefix);
assertTrue("gadgets.config.init not found in rewritten content", configIdx != -1);
- int endIdx = content.indexOf(")", configIdx + prefix.length());
+ int endIdx = content.indexOf(')', configIdx + prefix.length());
assertTrue("unexpected error, gadgets.config.init not closed", endIdx != -1);
String configJson = content.substring(configIdx + prefix.length(), endIdx);
JSONObject config = new JSONObject(configJson);
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManagerTest.java Sat May 29 09:07:02 2010
@@ -441,7 +441,7 @@ public class DefaultProxyUriManagerTest
int proxyEnd = uriStr.indexOf("/proxy/") + "/proxy/".length();
String paramsUri = uriStr.substring(
proxyEnd,
- (endOfPath ? uriStr.indexOf("/", proxyEnd) : uriStr.indexOf("/path")));
+ (endOfPath ? uriStr.indexOf('/', proxyEnd) : uriStr.indexOf("/path")));
uri = new UriBuilder().setQuery(paramsUri).toUri();
// "Raw" query param verification.
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java?rev=949359&r1=949358&r2=949359&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java Sat May 29 09:07:02 2010
@@ -45,10 +45,10 @@ public class SampleOAuthDataStore implem
// This needs to be long enough that an attacker can't guess it. If the attacker can guess this
// value before they exceed the maximum number of attempts, they can complete a session fixation
// attack against a user.
- private final int CALLBACK_TOKEN_LENGTH = 6;
+ private static final int CALLBACK_TOKEN_LENGTH = 6;
// We limit the number of trials before disabling the request token.
- private final int CALLBACK_TOKEN_ATTEMPTS = 5;
+ private static final int CALLBACK_TOKEN_ATTEMPTS = 5;
// used to get samplecontainer data from canonicaldb.json
private final JsonDbOpensocialService service;