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 02:56:13 UTC
svn commit: r949331 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/common/
common/src/main/java/org/apache/shindig/protocol/conversion/xstream/
gadgets/src/main/java/org/apache/shindig/gadgets/http/
gadgets/src/main/java/org/apache/s...
Author: lindner
Date: Sat May 29 00:56:13 2010
New Revision: 949331
URL: http://svn.apache.org/viewvc?rev=949331&view=rev
Log:
minor cleanups
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/MapConverter.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/RestfullCollectionConverter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.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/render/old/SanitizingGadgetRewriter.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/HttpGadgetContext.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java?rev=949331&r1=949330&r2=949331&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonSerializer.java Sat May 29 00:56:13 2010
@@ -189,7 +189,7 @@ public final class JsonSerializer {
String attribute = entry.getKey();
// Common use case isOwner/isViewer should not be set unless true
- if (!((attribute.equals("isOwner") || attribute.equals("isViewer")) && value.equals(Boolean.FALSE))) {
+ if (!(("isOwner".equals(attribute) || "isViewer".equals(attribute)) && value.equals(Boolean.FALSE))) {
// Drop null values.
if (firstDone) {
buf.append(',');
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java?rev=949331&r1=949330&r2=949331&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java Sat May 29 00:56:13 2010
@@ -53,7 +53,7 @@ public class DataCollectionConverter ext
// Base API is inherently unchecked
@SuppressWarnings("unchecked")
public boolean canConvert(Class clazz) {
- return (DataCollection.class.isAssignableFrom(clazz));
+ return DataCollection.class.isAssignableFrom(clazz);
}
/**
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/MapConverter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/MapConverter.java?rev=949331&r1=949330&r2=949331&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/MapConverter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/MapConverter.java Sat May 29 00:56:13 2010
@@ -158,7 +158,7 @@ public class MapConverter extends Abstra
@SuppressWarnings("unchecked")
// API is not generic
public boolean canConvert(Class clazz) {
- return (Map.class.isAssignableFrom(clazz));
+ return Map.class.isAssignableFrom(clazz);
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/RestfullCollectionConverter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/RestfullCollectionConverter.java?rev=949331&r1=949330&r2=949331&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/RestfullCollectionConverter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/RestfullCollectionConverter.java Sat May 29 00:56:13 2010
@@ -47,7 +47,7 @@ public class RestfullCollectionConverter
@SuppressWarnings("unchecked")
@Override
public boolean canConvert(Class clazz) {
- return (RestfulCollection.class.isAssignableFrom(clazz));
+ return RestfulCollection.class.isAssignableFrom(clazz);
}
/**
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationHandler.java?rev=949331&r1=949330&r2=949331&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/InvalidationHandler.java Sat May 29 00:56:13 2010
@@ -86,7 +86,7 @@ public class InvalidationHandler {
}
resources.add(Uri.parse(key));
} else {
- if (key.equals("@viewer")) {
+ if ("@viewer".equals(key)) {
// Viewer is invalidated by default if available
continue;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java?rev=949331&r1=949330&r2=949331&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java Sat May 29 00:56:13 2010
@@ -129,7 +129,7 @@ public class BasicOAuthStore implements
String keyTypeStr = consumerInfo.getString(KEY_TYPE_KEY);
KeyType keyType = KeyType.HMAC_SYMMETRIC;
- if (keyTypeStr.equals("RSA_PRIVATE")) {
+ if ("RSA_PRIVATE".equals(keyTypeStr)) {
keyType = KeyType.RSA_PRIVATE;
consumerSecret = convertFromOpenSsl(consumerSecret);
}
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=949331&r1=949330&r2=949331&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 00:56:13 2010
@@ -65,7 +65,7 @@ public class SanitizingGadgetRewriter ex
* @return true if sanitization will be enabled
*/
public static boolean isSanitizedRenderingRequest(Gadget gadget) {
- return ("1".equals(gadget.getContext().getParameter("sanitize")));
+ return "1".equals(gadget.getContext().getParameter("sanitize"));
}
/**
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/old/SanitizingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/old/SanitizingGadgetRewriter.java?rev=949331&r1=949330&r2=949331&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/old/SanitizingGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/old/SanitizingGadgetRewriter.java Sat May 29 00:56:13 2010
@@ -66,7 +66,7 @@ public class SanitizingGadgetRewriter im
* @return true if sanitization will be enabled
*/
public static boolean isSanitizedRenderingRequest(Gadget gadget) {
- return ("1".equals(gadget.getContext().getParameter("sanitize")));
+ return "1".equals(gadget.getContext().getParameter("sanitize"));
}
private static UserDataHandler copyOnClone = new UserDataHandler() {
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=949331&r1=949330&r2=949331&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 00:56:13 2010
@@ -257,7 +257,7 @@ public class HtmlAccelServlet extends Ga
// Check for chain param style request:
if (path.startsWith(accelServletPrefix + "/")) {
int startQuery = accelServletPrefix.length() + 1;
- int endQuery = path.indexOf("/", startQuery);
+ int endQuery = path.indexOf('/', startQuery);
if (endQuery >= startQuery) {
paramsStr = path.substring(startQuery, endQuery);
accelUrl = path.substring(endQuery + 1); // + "?" + req.getQueryString();
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java?rev=949331&r1=949330&r2=949331&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpGadgetContext.java Sat May 29 00:56:13 2010
@@ -260,7 +260,7 @@ public class HttpGadgetContext extends G
if (c == null) {
return null;
}
- return c.equals("1") ? RenderingContext.CONTAINER : RenderingContext.GADGET;
+ return "1".equals(c) ? RenderingContext.CONTAINER : RenderingContext.GADGET;
}
/**
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java?rev=949331&r1=949330&r2=949331&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyBase.java Sat May 29 00:56:13 2010
@@ -203,6 +203,6 @@ public abstract class ProxyBase {
if (ignoreCache == null) {
return false;
}
- return !ignoreCache.equals("0");
+ return !"0".equals(ignoreCache);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java?rev=949331&r1=949330&r2=949331&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthService.java Sat May 29 00:56:13 2010
@@ -55,17 +55,17 @@ public class OAuthService {
continue;
}
String childName = child.getNodeName();
- if (childName.equals("Request")) {
+ if ("Request".equals(childName)) {
if (requestUrl != null) {
throw new SpecParserException("Multiple OAuth/Service/Request elements");
}
requestUrl = parseEndPoint("OAuth/Service/Request", (Element)child, base);
- } else if (childName.equals("Authorization")) {
+ } else if ("Authorization".equals(childName)) {
if (authorizationUrl != null) {
throw new SpecParserException("Multiple OAuth/Service/Authorization elements");
}
authorizationUrl = parseAuthorizationUrl((Element)child, base);
- } else if (childName.equals("Access")) {
+ } else if ("Access".equals(childName)) {
if (accessUrl != null) {
throw new SpecParserException("Multiple OAuth/Service/Access elements");
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java?rev=949331&r1=949330&r2=949331&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java Sat May 29 00:56:13 2010
@@ -163,9 +163,9 @@ public class DefaultProxyUriManager impl
int start = path.indexOf(containerStr);
if (start > 0) {
start += containerStr.length();
- int end = path.indexOf("&", start);
+ int end = path.indexOf('&', start);
if (end < start) {
- end = path.indexOf("/", start);
+ end = path.indexOf('/', start);
}
if (end > start) {
// Looks like chained proxy syntax. Pull out params.
Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java?rev=949331&r1=949330&r2=949331&view=diff
==============================================================================
--- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java (original)
+++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/service/SampleContainerHandler.java Sat May 29 00:56:13 2010
@@ -66,7 +66,7 @@ public class SampleContainerHandler {
@Operation(httpMethods = "POST", bodyParam = "data")
public Future<?> create(RequestItem request) throws ProtocolException {
String type = request.getParameter("type");
- if (type.equals("setstate")) {
+ if ("setstate".equals(type)) {
try {
@SuppressWarnings("unchecked")
Map<String, String> bodyparams = request.getTypedParameter("data", Map.class);
@@ -76,7 +76,7 @@ public class SampleContainerHandler {
throw new ProtocolException(HttpServletResponse.SC_BAD_REQUEST,
"The json state file was not valid json", e);
}
- } else if (type.equals("setevilness")) {
+ } else if ("setevilness".equals(type)) {
throw new ProtocolException(HttpServletResponse.SC_NOT_IMPLEMENTED,
"evil data has not been implemented yet");
}