Author: lindner
Date: Wed Jun 2 07:58:03 2010
New Revision: 950407
URL: http://svn.apache.org/viewvc?rev=950407&view=rev
Log:
Bunch of cleanups
* Use entrySet instead of keySet
* Mark classes with private constructors final
* use StringBuilder
Modified:
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/ActivityStreamsGuiceModule.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/Pairs.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.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/features/FeatureParser.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
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/parse/caja/CajaCssUtils.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/preload/PipelinedDataPreloader.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewriterUtils.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java
Modified:
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/ActivityStreamsGuiceModule.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/ActivityStreamsGuiceModule.java?rev=950407&r1=950406&r2=950407&view=diff
==============================================================================
---
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/ActivityStreamsGuiceModule.java
(original)
+++
shindig/trunk/extras/src/main/java/org/apache/shindig/extras/as/ActivityStreamsGuiceModule.java
Wed Jun 2 07:58:03 2010
@@ -25,7 +25,6 @@ import com.google.inject.name.Names;
import org.apache.shindig.extras.as.opensocial.service.ActivityStreamsHandler;
import org.apache.shindig.extras.as.opensocial.spi.ActivityStreamService;
import org.apache.shindig.extras.as.sample.ActivityStreamsJsonDbService;
-import org.apache.shindig.social.sample.spi.JsonDbOpensocialService;
/**
* Configures the Extra modules in shindig-extras.
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=950407&r1=950406&r2=950407&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
Wed Jun 2 07:58:03 2010
@@ -38,7 +38,7 @@ public final class JsonUtil {
private static final Set<String> EXCLUDE_METHODS
= ImmutableSet.of("getClass", "getDeclaringClass");
- private static final Map<Class<?>, Map<String, Method>> getters = new
MapMaker().makeMap();
+ private static final Map<Class<?>, Map<String, Method>> GETTERS = new
MapMaker().makeMap();
/**
* Gets a property of an Object. Will return a property value if
@@ -78,7 +78,7 @@ public final class JsonUtil {
static Map<String, Method> getGetters(Object pojo) {
Class<?> clazz = pojo.getClass();
- Map<String, Method> methods = getters.get(clazz);
+ Map<String, Method> methods = GETTERS.get(clazz);
if (methods != null) {
return methods;
}
@@ -94,7 +94,7 @@ public final class JsonUtil {
}
}
- getters.put(clazz, methods);
+ GETTERS.put(clazz, methods);
return methods;
}
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/Pairs.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/Pairs.java?rev=950407&r1=950406&r2=950407&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/Pairs.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/Pairs.java
Wed Jun 2 07:58:03 2010
@@ -20,7 +20,8 @@ package org.apache.shindig.common;
/**
* Utility class for creating Pair objects.
*/
-public class Pairs {
+public final class Pairs {
+ private Pairs() {}
public static <T1, T2> Pair<T1, T2> newPair(T1 one, T2 two) {
return new Pair<T1, T2>(one, two);
}
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java?rev=950407&r1=950406&r2=950407&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/uri/UriBuilder.java
Wed Jun 2 07:58:03 2010
@@ -37,7 +37,7 @@ import javax.servlet.http.HttpServletReq
* Note that the builder will only automatically encode query parameters that
are added. Other
* parameters must be encoded explicitly.
*/
-public class UriBuilder {
+public final class UriBuilder {
private static final Pattern QUERY_PATTERN =
Pattern.compile("([^&=]+)=([^&=]*)");
private String scheme;
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java?rev=950407&r1=950406&r2=950407&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java
Wed Jun 2 07:58:03 2010
@@ -114,7 +114,7 @@ public class ShindigTypeConverter implem
// Does this object have a "list" property that is an array?
// TODO: add to specification
Object childList = json.opt("list");
- if (childList != null && childList instanceof JSONArray) {
+ if (childList instanceof JSONArray) {
return coerceToIterable(childList);
}
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=950407&r1=950406&r2=950407&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
Wed Jun 2 07:58:03 2010
@@ -29,7 +29,7 @@ import java.util.Map;
/**
* Handles converting HttpResponse objects to the format expected by the
makeRequest javascript.
*/
-public class FetchResponseUtils {
+public final class FetchResponseUtils {
private FetchResponseUtils() {}
/**
* Convert a response to a JSON object.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java?rev=950407&r1=950406&r2=950407&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureParser.java
Wed Jun 2 07:58:03 2010
@@ -102,7 +102,7 @@ class FeatureParser {
return attribs.build();
}
- static class ParsedFeature {
+ static final class ParsedFeature {
private final String name;
private final List<String> deps;
private final List<Bundle> bundles;
@@ -125,7 +125,7 @@ class FeatureParser {
return bundles;
}
- public static class Bundle {
+ public final static class Bundle {
private final String type;
private final Map<String, String> attribs;
private final List<Resource> resources;
@@ -149,7 +149,7 @@ class FeatureParser {
}
}
- static class Resource {
+ static final class Resource {
private final Uri source;
private final String content;
private final Map<String, String> attribs;
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java?rev=950407&r1=950406&r2=950407&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponseBuilder.java
Wed Jun 2 07:58:03 2010
@@ -103,17 +103,17 @@ public class HttpResponseBuilder extends
Collection<String> values = headers.get("Content-Type");
if (!values.isEmpty()) {
String contentType = values.iterator().next();
- String newContentType = "";
+ StringBuilder newContentType = new StringBuilder("");
// Remove previously set charset:
String[] parts = StringUtils.split(contentType, ';');
for (String part : parts) {
if (!part.contains("charset=")) {
- newContentType += part + "; ";
+ newContentType.append(part).append("; ");
}
}
- newContentType += "charset=" + charset.name();
+ newContentType.append("charset=").append(charset.name());
values.clear();
- values.add(newContentType);
+ values.add(newContentType.toString());
if (!(values.size() == 1 && !contentType.equals(newContentType))) {
incrementNumChanges();
}
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=950407&r1=950406&r2=950407&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
Wed Jun 2 07:58:03 2010
@@ -416,8 +416,8 @@ public class OAuthRequest {
}
authParams.clear();
- for (String key : paramMap.keySet()) {
- authParams.add(new Parameter(key, paramMap.get(key)));
+ for (Entry<String, String> entry : paramMap.entrySet()) {
+ authParams.add(new Parameter(entry.getKey(), entry.getValue()));
}
}
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssUtils.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssUtils.java?rev=950407&r1=950406&r2=950407&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssUtils.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssUtils.java
Wed Jun 2 07:58:03 2010
@@ -27,8 +27,9 @@ import java.util.List;
/**
* Utility functions for traversing Caja's CSS DOM
*/
-class CajaCssUtils {
-
+public final class CajaCssUtils {
+ private CajaCssUtils() {}
+
/**
* Get the immediate children of the passed node with the specified node type
*/
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=950407&r1=950406&r2=950407&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
Wed Jun 2 07:58:03 2010
@@ -98,7 +98,7 @@ public class CajaHtmlParser extends Gadg
Node lastChild = fragment != null ? fragment.getLastChild() : null;
if (lastChild != null && lastChild.getNodeType() == Node.TEXT_NODE) {
String lastText = lastChild.getTextContent();
- if (lastText.equals("\n")) {
+ if ("\n".equals(lastText)) {
fragment.removeChild(lastChild);
} else if (lastText.endsWith("\n")) {
lastChild.setTextContent(lastText.substring(0, lastText.length() -
1));
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java?rev=950407&r1=950406&r2=950407&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
Wed Jun 2 07:58:03 2010
@@ -60,7 +60,7 @@ public class PipelinedDataPreloader {
private final RequestPipeline requestPipeline;
private final ContainerConfig config;
- private static Set<String> HTTP_RESPONSE_HEADERS =
+ private static final Set<String> HTTP_RESPONSE_HEADERS =
ImmutableSet.of("content-type", "location", "set-cookie");
@Inject
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=950407&r1=950406&r2=950407&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
Wed Jun 2 07:58:03 2010
@@ -25,7 +25,7 @@ import org.apache.shindig.gadgets.http.H
/**
* Various utility functions used by rewriters
*/
-public class RewriterUtils {
+public final class RewriterUtils {
private RewriterUtils() {}
public static boolean isHtml(HttpRequest request, HttpResponse original) {
Modified:
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java?rev=950407&r1=950406&r2=950407&view=diff
==============================================================================
---
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
(original)
+++
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/xstream/XStream081Configuration.java
Wed Jun 2 07:58:03 2010
@@ -363,6 +363,7 @@ public class XStream081Configuration imp
final K defaultval;
public DefaultedEnumMap(Class<K> clz, K defaultkey) {
+ super();
this.backing = new EnumMap<K,V>(Preconditions.checkNotNull(clz));
this.defaultval = Preconditions.checkNotNull(defaultkey);
}
Modified:
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java?rev=950407&r1=950406&r2=950407&view=diff
==============================================================================
---
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java
(original)
+++
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java
Wed Jun 2 07:58:03 2010
@@ -38,8 +38,8 @@ import com.google.common.collect.Immutab
*/
public class SocialRequestItem extends BaseRequestItem {
- String USER_ID = "userId";
- String GROUP_ID = "groupId";
+ private static final String USER_ID = "userId";
+ private static final String GROUP_ID = "groupId";
public SocialRequestItem(Map<String, String[]> parameters,
SecurityToken token, BeanConverter converter, BeanJsonConverter
jsonConverter) {
