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/06/02 09:58:11 UTC
svn commit: r950409 - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/auth/
common/src/main/java/org/apache/shindig/config/
gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/
Author: lindner
Date: Wed Jun 2 07:58:11 2010
New Revision: 950409
URL: http://svn.apache.org/viewvc?rev=950409&view=rev
Log:
regex optimizations
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java?rev=950409&r1=950408&r2=950409&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java Wed Jun 2 07:58:11 2010
@@ -35,6 +35,7 @@ public class UrlParameterAuthenticationH
private static final String SECURITY_TOKEN_PARAM = "st";
private static final String OAUTH2_TOKEN_PARAM = "oauth_token";
private final SecurityTokenDecoder securityTokenDecoder;
+ private static final Pattern COMMAWHITESPACE = Pattern.compile("\\s*,\\s*");
@Inject
public UrlParameterAuthenticationHandler(SecurityTokenDecoder securityTokenDecoder) {
@@ -90,7 +91,7 @@ public class UrlParameterAuthenticationH
for (Enumeration<String> headers = request.getHeaders("Authorization"); headers != null && headers.hasMoreElements();) {
Matcher m = AUTHORIZATION.matcher(headers.nextElement());
if (m.matches() && "Token".equalsIgnoreCase(m.group(1))) {
- for (String nvp : m.group(2).split("\\s*,\\s*")) {
+ for (String nvp : COMMAWHITESPACE.split(m.group(2))) {
m = NVP.matcher(nvp);
if (m.matches() && "token".equals(m.group(1))) {
token = OAuth.decodePercent(m.group(2));
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java?rev=950409&r1=950408&r2=950409&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java Wed Jun 2 07:58:11 2010
@@ -46,6 +46,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.logging.Logger;
import java.util.logging.Level;
+import java.util.regex.Pattern;
import javax.el.ELContext;
import javax.el.ELException;
@@ -72,6 +73,7 @@ public class JsonContainerConfig extends
private final Map<String, Map<String, Object>> config;
private final Expressions expressions;
+ private static final Pattern CRLF_PATTERN = Pattern.compile("[\r\n]+");
/**
* Creates a new configuration from files.
@@ -253,7 +255,7 @@ public class JsonContainerConfig extends
* @param base The base object that values will be replaced into.
* @param merge The object to merge values from.
*
- * @throws JSONException if the two objects can't be merged for some reason.
+ * @throws org.json.JSONException if the two objects can't be merged for some reason.
*/
private JSONObject mergeObjects(JSONObject base, JSONObject merge)
throws JSONException {
@@ -345,7 +347,7 @@ public class JsonContainerConfig extends
location = location.substring(6);
LOG.info("Loading resources from: " + location);
if (path.endsWith(".txt")) {
- loadResources(ResourceLoader.getContent(location).split("[\r\n]+"), all);
+ loadResources(CRLF_PATTERN.split(ResourceLoader.getContent(location)), all);
} else {
loadResources(new String[]{location}, all);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java?rev=950409&r1=950408&r2=950409&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java Wed Jun 2 07:58:11 2010
@@ -155,7 +155,8 @@ public class ContentRewriterFeature {
// Lazily computed
private Integer fingerprint;
-
+ private static final Pattern COMMA_WHITESPACE_PATTERN = Pattern.compile("\\s*,\\s*");
+
/**
* Constructor which takes a gadget spec and container settings
* as "raw" input strings.
@@ -180,7 +181,7 @@ public class ContentRewriterFeature {
// Parse includeTags
ImmutableSet.Builder<String> includeTagsBuilder = ImmutableSet.builder();
- for (String s : paramTrim(defaultTags).toLowerCase().split("\\s*,\\s*")) {
+ for (String s : COMMA_WHITESPACE_PATTERN.split(paramTrim(defaultTags).toLowerCase())) {
if (s != null && s.length() > 0) {
includeTagsBuilder.add(s);
}