Author: lindner
Date: Wed Oct 14 21:16:16 2009
New Revision: 825286
URL: http://svn.apache.org/viewvc?rev=825286&view=rev
Log:
minor performance improvements
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultInvalidationService.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TagRegistry.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateResource.java
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java?rev=825286&r1=825285&r2=825286&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
Wed Oct 14 21:16:16 2009
@@ -38,7 +38,7 @@
* Use this random number generator instead of creating your own. This is
* thread-safe.
*/
- public static SecureRandom rand = new SecureRandom();
+ public static final SecureRandom rand = new SecureRandom();
/**
* HMAC algorithm to use
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java?rev=825286&r1=825285&r2=825286&view=diff
==============================================================================
---
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
(original)
+++
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonConverter.java
Wed Oct 14 21:16:16 2009
@@ -20,6 +20,7 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.MapMaker;
import com.google.common.collect.Lists;
+import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject;
import com.google.inject.Injector;
@@ -92,16 +93,16 @@
return methods;
}
- methods = new HashMap<String, Method>();
-
+ ImmutableMap.Builder<String,Method> builder = ImmutableMap.builder();
for (Method method : type.getMethods()) {
if (method.getParameterTypes().length == 1) {
String name = getPropertyName(method);
if (name != null) {
- methods.put(name, method);
+ builder.put(name, method);
}
}
}
+ methods = builder.build();
setters.put(type, methods);
return methods;
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultInvalidationService.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultInvalidationService.java?rev=825286&r1=825285&r2=825286&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultInvalidationService.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultInvalidationService.java
Wed Oct 14 21:16:16 2009
@@ -118,7 +118,7 @@
*/
private String getKey(String userId, SecurityToken token) {
// Convert the id to the container relative form
- int colonIndex = userId.lastIndexOf(":");
+ int colonIndex = userId.lastIndexOf(':');
if (colonIndex != -1) {
userId = userId.substring(colonIndex + 1);
}
@@ -126,9 +126,9 @@
// Assume the container is consistent in its use of either appId or appUrl.
// Use appId
if (!StringUtils.isEmpty(token.getAppId())) {
- return TOKEN_PREFIX + token.getAppId() + ":" + userId;
+ return TOKEN_PREFIX + token.getAppId() + ':' + userId;
}
- return TOKEN_PREFIX + token.getAppUrl() + ":" + userId;
+ return TOKEN_PREFIX + token.getAppUrl() + ':' + userId;
}
/**
@@ -155,10 +155,10 @@
}
}
if (ownerStamp != null) {
- currentInvalidation.append("o=").append(ownerStamp).append(";");
+ currentInvalidation.append("o=").append(ownerStamp).append(';');
}
if (viewerStamp != null) {
- currentInvalidation.append("v=").append(viewerStamp).append(";");
+ currentInvalidation.append("v=").append(viewerStamp).append(';');
}
return currentInvalidation.toString();
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java?rev=825286&r1=825285&r2=825286&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
Wed Oct 14 21:16:16 2009
@@ -110,10 +110,10 @@
*
* @param request the social request
* @return the response to the request
+ * @throws GadgetException if there are errors processing the gadget spec
*/
protected HttpResponse executeSocialRequest(HttpRequest request) throws
GadgetException {
- HttpResponse response = requestPipeline.execute(request);
- return response;
+ return requestPipeline.execute(request);
}
private static class VariableTask implements Callable<PreloadedData> {
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java?rev=825286&r1=825285&r2=825286&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java
Wed Oct 14 21:16:16 2009
@@ -80,7 +80,7 @@
DATA_PATH + "NumberFormatConstants__" + localeName + ".js",
"opensocial-i18n", null);
inlineJs.append(dateTimeConstants.getContent())
- .append("\n").append(numberConstants.getContent());
+ .append('\n').append(numberConstants.getContent());
i18nConstantsCache.put(locale, inlineJs.toString());
}
Element inlineTag = headTag.getOwnerDocument().createElement("script");
@@ -102,8 +102,8 @@
if (!country.equalsIgnoreCase("ALL")) {
try {
- String content = attemptToLoadResource(localeName + "_" + country);
- localeName += "_" + country;
+ String content = attemptToLoadResource(localeName + '_' + country);
+ localeName += '_' + country;
} catch (IOException e) {
}
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java?rev=825286&r1=825285&r2=825286&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServletRequest.java
Wed Oct 14 21:16:16 2009
@@ -60,7 +60,7 @@
String urlParam = chainedMatcher.group(2);
if (request.getQueryString() != null) {
- urlParam += "?" + request.getQueryString();
+ urlParam += '?' + request.getQueryString();
}
extractedParameters.put(ProxyBase.URL_PARAM, urlParam);
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TagRegistry.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TagRegistry.java?rev=825286&r1=825285&r2=825286&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TagRegistry.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TagRegistry.java
Wed Oct 14 21:16:16 2009
@@ -51,7 +51,7 @@
@Override
public String toString() {
- return namespaceUri + ":" + localName;
+ return namespaceUri + ':' + localName;
}
@Override
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateResource.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateResource.java?rev=825286&r1=825285&r2=825286&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateResource.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateResource.java
Wed Oct 14 21:16:16 2009
@@ -67,6 +67,6 @@
@Override
public String toString() {
- return "<" + type + ">" + content + "</" + type + ">";
+ return "<" + type + '>' + content + "</" + type + '>';
}
}
