You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by li...@apache.org on 2008/02/06 01:13:46 UTC
svn commit: r618835 - in
/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets:
./ http/
Author: lindner
Date: Tue Feb 5 16:13:42 2008
New Revision: 618835
URL: http://svn.apache.org/viewvc?rev=618835&view=rev
Log:
Basic performance cleanups:
* Use EnumMap instead of HashMap
* Use character constants instead of Strings where appropriate
* Use StringBuilder instead of StringBuffer
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSigner.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicRemoteContentFetcher.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundle.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Substitutions.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CajaContentFilter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java?rev=618835&r1=618834&r2=618835&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java Tue Feb 5 16:13:42 2008
@@ -59,6 +59,7 @@
/**
* Constructs a new blacklist from the given file.
*
+ * @param blacklistFile file containing blacklist entries
* @throws IOException if reading the file fails
* @throws PatternSyntaxException if an invalid regular expression occurs in
* the file
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSigner.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSigner.java?rev=618835&r1=618834&r2=618835&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSigner.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetSigner.java Tue Feb 5 16:13:42 2008
@@ -57,7 +57,7 @@
/**
* Create signer
- * @param timeToLive
+ * @param timeToLive basic TTL in milliseconds
*/
public BasicGadgetSigner(long timeToLive) {
this.timeToLive = timeToLive;
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicRemoteContentFetcher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicRemoteContentFetcher.java?rev=618835&r1=618834&r2=618835&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicRemoteContentFetcher.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicRemoteContentFetcher.java Tue Feb 5 16:13:42 2008
@@ -81,7 +81,7 @@
fetcher.setRequestMethod("POST");
fetcher.setInstanceFollowRedirects(true);
fetcher.setConnectTimeout(CONNECT_TIMEOUT_MS);
- fetcher.setRequestProperty("Content-Length", "" + postData.length);
+ fetcher.setRequestProperty("Content-Length", String.valueOf(postData.length));
fetcher.setUseCaches(false);
fetcher.setDoInput(true);
fetcher.setDoOutput(true);
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java?rev=618835&r1=618834&r2=618835&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java Tue Feb 5 16:13:42 2008
@@ -215,13 +215,8 @@
InputStream is = cl.getResourceAsStream(name);
if (is != null) {
byte[] content = load(is);
- int lastSlash = name.lastIndexOf("/");
- String base = null;
- if (lastSlash == -1) {
- base = name;
- } else {
- base = name.substring(0, lastSlash + 1);
- }
+ int lastSlash = name.lastIndexOf('/');
+ String base = (lastSlash == -1) ? name : name.substring(0, lastSlash + 1);
feature = parse(content, base, true);
}
} catch (GadgetException ge) {
@@ -243,10 +238,9 @@
logger.info("Loading file: " + file.getName());
ParsedFeature feature = null;
if (file.canRead()) {
- FileInputStream fis = null;
try {
byte[] content = load(new FileInputStream(file));
- feature = parse(content, file.getParent() + "/", false);
+ feature = parse(content, file.getParent() + '/', false);
} catch (IOException e) {
logger.warning("Error reading file: " + file.getAbsolutePath());
} catch (GadgetException ge) {
@@ -403,7 +397,7 @@
private byte[] load(InputStream is) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
byte[] buf = new byte[8192];
- int read = 0;
+ int read;
try {
while ((read = is.read(buf)) > 0) {
baos.write(buf, 0, read);
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundle.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundle.java?rev=618835&r1=618834&r2=618835&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundle.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/MessageBundle.java Tue Feb 5 16:13:42 2008
@@ -21,7 +21,7 @@
* Name/value mapping of messages retrieved from a message bundle.
*/
public class MessageBundle {
- private Map<String, String> messages = new HashMap<String, String>();
+ private Map<String, String> messages;
public static final MessageBundle EMPTY = new MessageBundle();
/**
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Substitutions.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Substitutions.java?rev=618835&r1=618834&r2=618835&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Substitutions.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Substitutions.java Tue Feb 5 16:13:42 2008
@@ -15,6 +15,7 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.EnumMap;
/**
* Performs string substitutions for message bundles, user prefs, and bidi
@@ -59,7 +60,7 @@
* The placeholder prefix for substituted strings.
*/
Type(String prefix) {
- this.prefix = "__" + prefix + "_";
+ this.prefix = "__" + prefix + '_';
}
public String getPrefix() {
@@ -68,7 +69,7 @@
}
private Map<Type, Map<String, String>> substitutions =
- new HashMap<Type, Map<String, String>>();
+ new EnumMap<Type, Map<String, String>>(Type.class);
/**
* Create a basic substitution coordinator.
@@ -134,7 +135,7 @@
return input;
}
- StringBuffer output = new StringBuffer();
+ StringBuilder output = new StringBuilder();
for (int i = 0, j = input.length(); i < j; ++i) {
if (input.regionMatches(i, type.prefix, 0, type.prefix.length())) {
// Look for a trailing "__". If we don't find it, then this isn't a
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CajaContentFilter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CajaContentFilter.java?rev=618835&r1=618834&r2=618835&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CajaContentFilter.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CajaContentFilter.java Tue Feb 5 16:13:42 2008
@@ -85,11 +85,11 @@
List<GadgetException> exceptions = new ArrayList<GadgetException>();
if (cause != null) {
- errbuilder.append(cause).append("\n");
+ errbuilder.append(cause).append('\n');
}
for (Message m : mq.getMessages()) {
- errbuilder.append(m.format(mc)).append("\n");
+ errbuilder.append(m.format(mc)).append('\n');
}
throw new GadgetException(
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java?rev=618835&r1=618834&r2=618835&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java Tue Feb 5 16:13:42 2008
@@ -235,11 +235,11 @@
// servlet. We should probably inline external JS as well.
externJs.append(String.format(externFmt, library.getContent()));
} else if (type == JsLibrary.Type.INLINE) {
- inlineJs.append(library.getContent()).append("\n");
+ inlineJs.append(library.getContent()).append('\n');
} else {
// FILE or RESOURCE
if (options.getForcedJsLibs() == null) {
- inlineJs.append(library.getContent()).append("\n");
+ inlineJs.append(library.getContent()).append('\n');
} // otherwise it was already included by options.forceJsLibs.
}
}
@@ -333,9 +333,9 @@
markup.append("<pre>");
for (GadgetException error : errs.getComponents()) {
markup.append(error.getCode().toString());
- markup.append(" ");
- markup.append(error.getMessage().toString());
- markup.append("\n");
+ markup.append(' ');
+ markup.append(error.getMessage());
+ markup.append('\n');
}
markup.append("</pre>");
markup.append("</body></html>");
@@ -359,11 +359,11 @@
private String getPrefsQueryString(UserPrefs prefVals) {
StringBuilder buf = new StringBuilder();
for (Map.Entry<String, String> prefEntry : prefVals.getPrefs().entrySet()) {
- buf.append("&");
+ buf.append('&');
try {
buf.append(USERPREF_PARAM_PREFIX)
.append(URLEncoder.encode(prefEntry.getKey(), "UTF8"))
- .append("=")
+ .append('=')
.append(URLEncoder.encode(prefEntry.getValue(), "UTF8"));
} catch (UnsupportedEncodingException e) {
// If UTF8 is somehow not supported, we may as well bail.
@@ -376,7 +376,7 @@
private String getLibsQueryString(Set<String> features) {
StringBuilder buf = new StringBuilder();
- buf.append("&").append(LIBS_PARAM_NAME).append("=");
+ buf.append('&').append(LIBS_PARAM_NAME).append('=');
buf.append(jsServicePath);
if (features.size() == 0) {
buf.append("core");
@@ -386,7 +386,7 @@
if (first) {
first = false;
} else {
- buf.append(":");
+ buf.append(':');
}
buf.append(feature);
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java?rev=618835&r1=618834&r2=618835&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/JsServlet.java Tue Feb 5 16:13:42 2008
@@ -76,7 +76,7 @@
String uri = req.getRequestURI();
// We only want the file name part. There will always be at least 1 slash
// (the server root), so this is always safe.
- String resourceName = uri.substring(uri.lastIndexOf("/") + 1);
+ String resourceName = uri.substring(uri.lastIndexOf('/') + 1);
if (resourceName.endsWith(".js")) {
// Lop off the suffix for lookup purposes
resourceName = resourceName.substring(