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/05/21 03:17:07 UTC
svn commit: r658522 - in /incubator/shindig/trunk/java:
common/src/main/java/org/apache/shindig/common/xml/
gadgets/src/main/java/org/apache/shindig/gadgets/
gadgets/src/main/java/org/apache/shindig/gadgets/http/
gadgets/src/main/java/org/apache/shindi...
Author: lindner
Date: Tue May 20 18:17:06 2008
New Revision: 658522
URL: http://svn.apache.org/viewvc?rev=658522&view=rev
Log:
Bunch of minor cleanups
- Use character constants for single char strings
- Use contains() and isEmpty() where appropriate (more readable)
- User StringBuilder instead of StringBuffer
- Start cleaning up some javadoc
- make outputError() static
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.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/HttpRequest.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/HtmlRewriterTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/AbstractLargeRestfulTests.java
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/xml/XmlUtil.java Tue May 20 18:17:06 2008
@@ -129,7 +129,7 @@
InputSource is = new InputSource(new StringReader(xml.trim()));
return factory.newDocumentBuilder().parse(is).getDocumentElement();
} catch (SAXParseException e) {
- throw new XmlException(e.getMessage()+" At: ("+e.getLineNumber()+","+e.getColumnNumber()+")", e);
+ throw new XmlException(e.getMessage()+" At: ("+e.getLineNumber()+ ',' +e.getColumnNumber()+ ')', e);
} catch (SAXException e) {
throw new XmlException(e);
} catch (ParserConfigurationException e) {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java Tue May 20 18:17:06 2008
@@ -185,6 +185,7 @@
*
* @param obj
* @return An array of all keys in the object.
+ * @throws org.json.JSONException
*/
private static String[] getNames(JSONObject obj) throws JSONException {
JSONArray arr = obj.names();
@@ -237,6 +238,7 @@
/**
* Processes a container file.
* @param json
+ * @throws GadgetException
*/
public void loadFromString(String json) throws GadgetException {
try {
@@ -271,6 +273,7 @@
* from within the GadgetServerConfig.
*
* @param path
+ * @throws GadgetException
*/
public void loadContainers(String path) throws GadgetException {
try {
@@ -294,6 +297,8 @@
/**
* Creates a new, empty configuration.
+ * @param containers
+ * @throws GadgetException
*/
@Inject
public ContainerConfig(@Named("containers.default") String containers)
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java Tue May 20 18:17:06 2008
@@ -136,7 +136,7 @@
Set<Entry> resultsFound,
Set<String> resultsMissing) {
graphComplete = true;
- if (needed.size() == 0) {
+ if (needed.isEmpty()) {
// Shortcut for gadgets that don't have any explicit dependencies.
resultsFound.addAll(core.values());
return true;
@@ -158,7 +158,7 @@
}
}
- if (resultsMissing.size() == 0) {
+ if (resultsMissing.isEmpty()) {
// Store to cache
transitiveDeps.put(
Collections.unmodifiableSet(new HashSet<String>(needed)),
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetServer.java Tue May 20 18:17:06 2008
@@ -184,7 +184,7 @@
// Cant execute signed/oauth preloads without the token
if ((preload.getAuth() == Auth.NONE ||
gadget.getContext().getToken() != null) &&
- (preload.getViews().size() == 0 ||
+ (preload.getViews().isEmpty() ||
preload.getViews().contains(gadget.getContext().getView()))) {
PreloadTask task = new PreloadTask(gadget.getContext(), preload,
preloadFetcherFactory);
@@ -219,7 +219,7 @@
}
}
- if (running.size() > 0) {
+ if (!running.isEmpty()) {
try {
Future<GadgetException> future;
while ((future = featureProcessor.take()) != null) {
@@ -240,7 +240,7 @@
running.remove(task);
}
}
- } while (pending.size() > 0 || running.size() > 0);
+ } while (!pending.isEmpty() || !running.isEmpty());
}
/**
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SigningFetcher.java Tue May 20 18:17:06 2008
@@ -186,7 +186,7 @@
resource.getScheme(),
resource.getHost(),
resource.getPort(),
- resource.getRawPath() + "?" + cacheableQuery);
+ resource.getRawPath() + '?' + cacheableQuery);
HttpRequest cacheableRequest =
new HttpRequest(url.toURI(), request);
return cacheableRequest;
@@ -243,7 +243,7 @@
resource.getScheme(),
resource.getHost(),
resource.getPort(),
- resource.getRawPath() + "?" + finalQuery);
+ resource.getRawPath() + '?' + finalQuery);
return new HttpRequest(url.toURI(), req);
} catch (GadgetException e) {
throw e;
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=658522&r1=658521&r2=658522&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 May 20 18:17:06 2008
@@ -137,7 +137,7 @@
return input;
}
- if (substitutions.get(type).size() == 0 || !input.contains(type.prefix)) {
+ if (substitutions.get(type).isEmpty() || !input.contains(type.prefix)) {
return input;
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java Tue May 20 18:17:06 2008
@@ -111,7 +111,7 @@
*/
public String getHeader(String name) {
List<String> headerList = getHeaders(name);
- if (headerList.size() == 0) {
+ if (headerList.isEmpty()) {
return null;
} else {
return headerList.get(0);
@@ -175,14 +175,14 @@
for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
List<String> newList = new ArrayList<String>(entry.getValue());
// Proxies should be bypassed with the Pragma: no-cache check.
- if (entry.getKey().equals("Pragma") && options.ignoreCache) {
+ if (entry.getKey().equals("Pragma") && options != null && options.ignoreCache) {
newList.add("no-cache");
setPragmaHeader = true;
}
tmpHeaders.put(entry.getKey(), Collections.unmodifiableList(newList));
}
// Bypass caching in proxies as well.
- if (!setPragmaHeader && options.ignoreCache) {
+ if (!setPragmaHeader && options != null && options.ignoreCache) {
tmpHeaders.put("Pragma", Arrays.asList("no-cache"));
}
this.headers = Collections.unmodifiableMap(tmpHeaders);
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java Tue May 20 18:17:06 2008
@@ -212,7 +212,7 @@
*/
public String getHeader(String name) {
List<String> headerList = getHeaders(name);
- if (headerList.size() == 0) {
+ if (headerList.isEmpty()) {
return null;
} else {
return headerList.get(0);
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthFetcher.java Tue May 20 18:17:06 2008
@@ -362,7 +362,7 @@
} else {
postBody = new StringBuilder()
.append(postBody)
- .append("&")
+ .append('&')
.append(OAuth.formEncode(oauthParams))
.toString();
}
@@ -425,15 +425,15 @@
// At some point we can be clever and use a callback URL to improve
// the user experience, but that's too complex for now.
OAuthAccessor accessor = accessorInfo.getAccessor();
- StringBuffer azn = new StringBuffer(
+ StringBuilder azn = new StringBuilder(
accessor.consumer.serviceProvider.userAuthorizationURL);
if (azn.indexOf("?") == -1) {
- azn.append("?");
+ azn.append('?');
} else {
- azn.append("&");
+ azn.append('&');
}
azn.append(OAuth.OAUTH_TOKEN);
- azn.append("=");
+ azn.append('=');
azn.append(OAuth.percentEncode(accessor.requestToken));
aznUrl = azn.toString();
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/DefaultContentRewriter.java Tue May 20 18:17:06 2008
@@ -106,11 +106,11 @@
}
private boolean isHTML(String mime) {
- return (mime.toLowerCase().indexOf("html") != -1);
+ return (mime.toLowerCase().contains("html"));
}
private boolean isCSS(String mime) {
- return (mime.toLowerCase().indexOf("css") != -1);
+ return (mime.toLowerCase().contains("css"));
}
protected String getProxyUrl() {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/JavascriptTagMerger.java Tue May 20 18:17:06 2008
@@ -123,7 +123,7 @@
if (!srcUrl.isAbsolute()) {
srcUrl = relativeUrlBase.resolve(srcUrl);
}
- builder.append(paramIndex).append("=")
+ builder.append(paramIndex).append('=')
.append(URLEncoder.encode(srcUrl.toString(), "UTF-8"));
if (i < concat.size() - 1) {
if (builder.length() - urlStart > MAX_URL_LENGTH) {
@@ -132,7 +132,7 @@
builder.append("<script src=\"").append(concatBase);
urlStart = builder.length();
} else {
- builder.append("&");
+ builder.append('&');
paramIndex++;
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriter.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriter.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/LinkingTagRewriter.java Tue May 20 18:17:06 2008
@@ -79,7 +79,7 @@
String link = stripQuotes(token.text);
builder.append("=\"");
builder.append(linkRewriter.rewrite(link, relativeBase));
- builder.append("\"");
+ builder.append('\"');
return;
}
builder.append(HtmlRewriter.producePreTokenSeparator(token, lastToken));
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java Tue May 20 18:17:06 2008
@@ -178,7 +178,7 @@
String redir =
request.getScheme() + "://" +
required +
- request.getServletPath() + "?" +
+ request.getServletPath() + '?' +
request.getQueryString();
logger.info("Redirecting gadget " + context.getUrl() + " from domain " +
host + " to domain " + redir);
@@ -241,7 +241,7 @@
}
// Forced libs are always done first.
- if (libs.size() > 0) {
+ if (!libs.isEmpty()) {
String jsUrl = urlGenerator.getBundledJsUrl(libs, context);
markup.append(String.format(externFmt, jsUrl));
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java Tue May 20 18:17:06 2008
@@ -66,7 +66,7 @@
doGet(request, response);
}
- private void outputError(GadgetException excep, HttpServletResponse resp)
+ private static void outputError(GadgetException excep, HttpServletResponse resp)
throws IOException {
StringBuilder err = new StringBuilder();
err.append(excep.getCode().toString());
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java Tue May 20 18:17:06 2008
@@ -143,7 +143,7 @@
value = pref.getDefaultValue();
}
buf.append("&up_").append(URLEncoder.encode(pref.getName(), "UTF-8"))
- .append("=").append(URLEncoder.encode(value, "UTF-8"));
+ .append('=').append(URLEncoder.encode(value, "UTF-8"));
}
// add url last to work around browser bugs
if(!type.equals(View.ContentType.URL)) {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/GadgetSpec.java Tue May 20 18:17:06 2008
@@ -103,7 +103,7 @@
public GadgetSpec substitute(Substitutions substituter, boolean rewrite) {
GadgetSpec spec = new GadgetSpec(this);
spec.modulePrefs = modulePrefs.substitute(substituter);
- if (userPrefs.size() == 0) {
+ if (userPrefs.isEmpty()) {
spec.userPrefs = Collections.emptyList();
} else {
List<UserPref> prefs = new ArrayList<UserPref>(userPrefs.size());
@@ -202,7 +202,7 @@
this.modulePrefs = modulePrefs;
}
- if (views.size() == 0) {
+ if (views.isEmpty()) {
throw new SpecParserException("At least 1 Content is required.");
} else {
Map<String, View> tmpViews = new HashMap<String, View>();
@@ -213,7 +213,7 @@
this.views = Collections.unmodifiableMap(tmpViews);
}
- if (userPrefs.size() > 0) {
+ if (!userPrefs.isEmpty()) {
this.userPrefs = Collections.unmodifiableList(userPrefs);
} else {
this.userPrefs = Collections.emptyList();
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java Tue May 20 18:17:06 2008
@@ -293,7 +293,7 @@
* @return The locale spec, if there is a matching one, or null.
*/
public LocaleSpec getLocale(Locale locale) {
- if (locales.size() == 0) {
+ if (locales.isEmpty()) {
return null;
}
LocaleSpec localeSpec = locales.get(locale);
@@ -319,7 +319,7 @@
ModulePrefs prefs = new ModulePrefs(this);
// Icons, if any
- if (icons.size() == 0) {
+ if (icons.isEmpty()) {
prefs.icons = Collections.emptyList();
} else {
List<Icon> iconList = new ArrayList<Icon>(icons.size());
@@ -390,7 +390,7 @@
.append(" scrolling=\"").append(scrolling).append('\"')
.append(">\n");
for (Preload preload : preloads) {
- buf.append(preload).append("\n");
+ buf.append(preload).append('\n');
}
for (Feature feature : features.values()) {
buf.append(feature).append('\n');
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/UserPref.java Tue May 20 18:17:06 2008
@@ -96,7 +96,7 @@
Substitutions.Type type = Substitutions.Type.MESSAGE;
pref.displayName = substituter.substituteString(type, displayName);
pref.defaultValue = substituter.substituteString(type, defaultValue);
- if (enumValues.size() == 0) {
+ if (enumValues.isEmpty()) {
pref.enumValues = Collections.emptyMap();
} else {
Map<String, String> values
@@ -124,7 +124,7 @@
.append("\" datatype=\"")
.append(dataType.toString().toLowerCase())
.append('\"');
- if (enumValues.size() == 0) {
+ if (enumValues.isEmpty()) {
buf.append("/>");
} else {
buf.append('\n');
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/View.java Tue May 20 18:17:06 2008
@@ -144,7 +144,7 @@
content.append(element.getTextContent());
}
this.content = content.toString();
- this.needsUserPrefSubstitution = this.content.indexOf("__UP_") != -1;
+ this.needsUserPrefSubstitution = this.content.contains("__UP_");
this.quirks = quirks;
this.href = href;
this.type = type;
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java Tue May 20 18:17:06 2008
@@ -115,7 +115,7 @@
}
public void testPathQuery() throws Exception {
- String path = NESTED_KEY + "/" + NESTED_NAME;
+ String path = NESTED_KEY + '/' + NESTED_NAME;
String data = config.get(DEFAULT_CONTAINER, path);
assertEquals(NESTED_VALUE, data);
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetServerTest.java Tue May 20 18:17:06 2008
@@ -220,7 +220,7 @@
};
Gadget gadget = gadgetServer.processGadget(context);
- assertTrue(gadget.getPreloadMap().size() == 0);
+ assertTrue(gadget.getPreloadMap().isEmpty());
}
public void testNoSignedPreloadWithoutToken() throws Exception {
@@ -248,7 +248,7 @@
};
Gadget gadget = gadgetServer.processGadget(context);
- assertTrue(gadget.getPreloadMap().size() == 0);
+ assertTrue(gadget.getPreloadMap().isEmpty());
}
public void testSignedPreloadWithToken() throws Exception {
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/GadgetTokenStoreTest.java Tue May 20 18:17:06 2008
@@ -152,7 +152,7 @@
GadgetInfo gadgetInfo = GadgetOAuthTokenStore.getGadgetOAuthInfo(spec);
OAuthStore.ProviderKey providerKey = new OAuthStore.ProviderKey();
- providerKey.setGadgetUri(gadgetUrl.toString());
+ providerKey.setGadgetUri(gadgetUrl);
providerKey.setServiceName(gadgetInfo.getServiceName());
mockStoreImpl.setOAuthServiceProviderInfo(
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/HtmlRewriterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/HtmlRewriterTest.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/HtmlRewriterTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/HtmlRewriterTest.java Tue May 20 18:17:06 2008
@@ -81,7 +81,7 @@
+ "<h2>DRAFT - HTML4 Test Suite: Test 7_5_5-BF-01 Headings: The H1, H2, H3, H4, H5, H6 elements</h2>\n"
+ "<hr>[<a href=\"sec7_5_4-BF-02.html\">Previous</a>] [<a href=\"section8.html\">Next</a>] [<a href=\"section7.html\">Section</a>]"
+ " [<a href=\"index.html\">Contents</a>] [<a href=\"http://www.w3.org/TR/html401/struct/global.html#h-7.5.5\">Specification</a>]<BR>\n"
- + "\n"
+ + '\n'
+ "</div>\n"
+ "<object height=\"100%\" width=\"100%\" border=\"0\" type=\"text/html\" data=\"7_5_5-BF-01.html\">\n"
+ "<a class=\"navigation\" href=\"7_5_5-BF-01.html\" target=\"testwindow\">Test</a></object>\n"
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java Tue May 20 18:17:06 2008
@@ -111,18 +111,18 @@
public void testStandardsMode() throws Exception {
String content = parseBasicGadget(GadgetSpec.DEFAULT_VIEW);
- assertTrue(-1 != content.indexOf(GadgetRenderingTask.STRICT_MODE_DOCTYPE));
+ assertTrue(content.contains(GadgetRenderingTask.STRICT_MODE_DOCTYPE));
}
public void testQuirksMode() throws Exception {
String content = parseBasicGadget("quirks");
- assertTrue(-1 == content.indexOf(GadgetRenderingTask.STRICT_MODE_DOCTYPE));
+ assertTrue(!content.contains(GadgetRenderingTask.STRICT_MODE_DOCTYPE));
}
public void testContentRendered() throws Exception {
String content = parseBasicGadget(GadgetSpec.DEFAULT_VIEW);
- assertTrue(-1 != content.indexOf(CONTENT));
+ assertTrue(content.contains(CONTENT));
}
@SuppressWarnings("unchecked")
@@ -132,7 +132,7 @@
expect(urlGenerator.getBundledJsUrl(isA(Collection.class),
isA(GadgetContext.class))).andReturn(jsLibs);
String content = parseBasicGadget(GadgetSpec.DEFAULT_VIEW);
- assertTrue(-1 != content.indexOf("<script src=\"" + jsLibs + "\">"));
+ assertTrue(content.contains("<script src=\"" + jsLibs + "\">"));
}
public void testViewAliases() throws Exception {
@@ -148,7 +148,7 @@
String content = parseBasicGadget("dummy");
- assertTrue(-1 != content.indexOf(ALT_CONTENT));
+ assertTrue(content.contains(ALT_CONTENT));
}
public void testLockedDomainFailure() throws Exception {
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java Tue May 20 18:17:06 2008
@@ -156,7 +156,7 @@
fail("should have thrown");
} catch (GadgetException e) {
assertTrue(
- e.getMessage().indexOf("made to wrong domain www.example.com") != -1);
+ e.getMessage().contains("made to wrong domain www.example.com"));
}
verify();
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java Tue May 20 18:17:06 2008
@@ -112,10 +112,10 @@
String entryId = null;
Date updated = null;
if (obj instanceof Person) {
- entryId = request.getUri().toString() + "/" + ((Person) obj).getId();
+ entryId = request.getUri().toString() + '/' + ((Person) obj).getId();
updated = ((Person) obj).getUpdated();
} else if (obj instanceof Activity) {
- entryId = request.getUri().toString() + "/" + ((Activity) obj).getId();
+ entryId = request.getUri().toString() + '/' + ((Activity) obj).getId();
updated = ((Activity) obj).getUpdated();
}
Entry entry = fillEntry(request, obj, entryId, updated, format);
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/util/BeanXmlConverter.java Tue May 20 18:17:06 2008
@@ -43,7 +43,7 @@
try {
// get class name in lower letters (w/o package name)
String className = obj.getClass().getName();
- int lastDotIndex = className.lastIndexOf(".");
+ int lastDotIndex = className.lastIndexOf('.');
if (lastDotIndex >= 0) {
className = className.substring(lastDotIndex + 1);
}
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/AbstractLargeRestfulTests.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/AbstractLargeRestfulTests.java?rev=658522&r1=658521&r2=658522&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/AbstractLargeRestfulTests.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/abdera/AbstractLargeRestfulTests.java Tue May 20 18:17:06 2008
@@ -105,7 +105,7 @@
JSONException {
BufferedReader reader = new BufferedReader(resp.getReader());
- StringBuffer json = new StringBuffer();
+ StringBuilder json = new StringBuilder();
String line = reader.readLine();
while (line != null) {
json.append(line);