Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java (original) +++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java Thu Oct 27 21:11:48 2011 @@ -810,7 +810,7 @@ public class ModulePrefs { return false; Feature feature = new Feature(element); - if (feature.getViews().size() == 0) { + if (feature.getViews().isEmpty()) { coreIncluded = coreIncluded || feature.getName().startsWith("core"); features.put(feature.getName(), feature); globalFeatures.put(feature.getName(), feature);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java (original) +++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java Thu Oct 27 21:11:48 2011 @@ -18,6 +18,7 @@ */ package org.apache.shindig.gadgets.templates; +import org.apache.shindig.common.Nullable; import org.w3c.dom.DocumentFragment; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -64,5 +65,5 @@ public interface TemplateProcessor { * @param type Expected result type * @param defaultValue Default value to return */ - <T> T evaluate(String expression, Class<T> type, T defaultValue); + <T> T evaluate(String expression, Class<T> type, @Nullable T defaultValue); } Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistry.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistry.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistry.java (original) +++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistry.java Thu Oct 27 21:11:48 2011 @@ -33,7 +33,7 @@ public class CompositeTagRegistry extend } public TagHandler getHandlerFor(NSName name) { - TagHandler handler = null; + TagHandler handler; for (TagRegistry registry : registries) { handler = registry.getHandlerFor(name); if (handler != null) { Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java (original) +++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java Thu Oct 27 21:11:48 2011 @@ -182,12 +182,14 @@ public class DefaultConcatUriManager imp } if (versioner != null) { - List<String> versions = null; List<List<Uri>> batches = Lists.newArrayList(); List<String> resourceTags = Lists.newArrayList(); + batches.add(batchUris); resourceTags.add(type.getTagName().toLowerCase()); - versions = versioner.version(batches, container, resourceTags); + + List<String> versions = versioner.version(batches, container, resourceTags); + if (versions != null && versions.size() == 1) { String version = versions.get(0); if (version != null) { @@ -202,7 +204,7 @@ public class DefaultConcatUriManager imp for (Uri uri : uris) { Integer i = START_INDEX; String splitParam = uri.getQueryParameter(Param.JSON.getKey()); - String resourceUri = null; + String resourceUri; while ((resourceUri = uri.getQueryParameter(i.toString())) != null) { Uri resource = Uri.parse(resourceUri); snippets.put(resource, getJsSnippet(splitParam, resource)); @@ -267,7 +269,7 @@ public class DefaultConcatUriManager imp String splitParam = type == Type.JS ? uri.getQueryParameter(Param.JSON.getKey()) : null; Integer i = START_INDEX; - String uriStr = null; + String uriStr; while ((uriStr = uri.getQueryParameter(i.toString())) != null) { try { Uri concatUri = Uri.parse(uriStr); Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java (original) +++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java Thu Oct 27 21:11:48 2011 @@ -218,7 +218,7 @@ public class DefaultIframeUriManager imp UriBuilder uri = new UriBuilder(inUri); String gadgetStr = uri.getQueryParameter(Param.URL.getKey()); - Uri gadgetUri = null; + Uri gadgetUri; try { gadgetUri = Uri.parse(gadgetStr); } catch (Exception e) { Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java (original) +++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java Thu Oct 27 21:11:48 2011 @@ -23,6 +23,7 @@ import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.inject.Inject; +import org.apache.commons.lang.StringUtils; import org.apache.shindig.common.uri.Uri; import org.apache.shindig.common.uri.UriBuilder; import org.apache.shindig.config.ContainerConfig; @@ -83,7 +84,7 @@ public class DefaultJsUriManager impleme // Add the list of already-loaded libs if (!ctx.getLoadedLibs().isEmpty()) { - jsPath.append("!").append(addJsLibs(ctx.getLoadedLibs())); + jsPath.append('!').append(addJsLibs(ctx.getLoadedLibs())); } jsPath.append(JS_SUFFIX); @@ -171,7 +172,7 @@ public class DefaultJsUriManager impleme return INVALID_URI; } - int lastSlash = path.lastIndexOf("/"); + int lastSlash = path.lastIndexOf('/'); if (lastSlash != -1) { path = path.substring(lastSlash + 1); } @@ -185,7 +186,7 @@ public class DefaultJsUriManager impleme path = path.substring(1); } - String[] splits = path.split("!"); + String[] splits = StringUtils.split(path, '!'); Collection<String> libs = getJsLibs(splits.length >= 1 ? splits[0] : ""); String haveString = (splits.length >= 2 ? splits[1] : ""); Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java (original) +++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java Thu Oct 27 21:11:48 2011 @@ -159,9 +159,6 @@ public class DefaultProxyUriManager impl @SuppressWarnings("deprecation") public ProxyUri process(Uri uriIn) throws GadgetException { - UriStatus status = UriStatus.BAD_URI; - Uri uri = null; - // First determine if the URI is chained-syntax or query-style. String container = uriIn.getQueryParameter(Param.CONTAINER.getKey()); if (container == null) { @@ -213,7 +210,7 @@ public class DefaultProxyUriManager impl } if (!endToken.endsWith("/")) { // add suffix '/' that was added by the creator - endToken = endToken + "/"; + endToken = endToken + '/'; } // Pull URI out of original inUri's full representation. @@ -256,6 +253,8 @@ public class DefaultProxyUriManager impl } } + + Uri uri; try { uri = Uri.parse(uriStr); if (uri.getScheme() == null) { @@ -269,7 +268,7 @@ public class DefaultProxyUriManager impl } // URI is valid. - status = UriStatus.VALID_UNVERSIONED; + UriStatus status = UriStatus.VALID_UNVERSIONED; String version = queryUri.getQueryParameter(Param.VERSION.getKey()); if (versioner != null && version != null) { Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java (original) +++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java Thu Oct 27 21:11:48 2011 @@ -337,13 +337,11 @@ public class ProxyUriBase { } protected static Integer getIntegerValue(String str) { - Integer val = null; try { - val = NumberUtils.createInteger(str); + return NumberUtils.createInteger(str); } catch (NumberFormatException e) { // -1 is sentinel for invalid value. - val = -1; + return -1; } - return val; } } Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java (original) +++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java Thu Oct 27 21:11:48 2011 @@ -204,7 +204,7 @@ public final class UriUtils { String header = inHeader.getKey(); List<String> headerValues = inHeader.getValue(); - if (headerValues != null && headerValues.size() > 0 && + if (headerValues != null && !headerValues.isEmpty() && isValidHeaderName(header) && !allDisallowedHeaders.contains(header.toLowerCase())) { // Remove existing values of this header. Modified: shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java (original) +++ shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java Thu Oct 27 21:11:48 2011 @@ -287,7 +287,7 @@ public class ClosureJsCompiler implement } private static String getRootSrc(String source) { - int colIx = source.lastIndexOf(":"); + int colIx = source.lastIndexOf(':'); if (colIx == -1) { return source; } @@ -391,11 +391,11 @@ public class ClosureJsCompiler implement * @return {@link JsContent} entries for code fragments belonging to a single source */ public Iterable<JsContent> mapCompiled(String compiled) { - int row = 1, column = 1; // current row-col being parsed + int row = 1, column; // current row-col being parsed StringBuilder codeFragment = new StringBuilder(); // code fragment for a single mapping OriginalMapping previousMapping = null, // the row-col mapping at the previous valid position - currentMapping = null; // the row-col mapping at the current valid position + currentMapping; // the row-col mapping at the current valid position ImmutableList.Builder<JsContent> contentEntries = ImmutableList.builder(); Iterable<String> compiledLines = Splitter.on("\n").split(compiled); Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2DataServiceImpl.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2DataServiceImpl.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2DataServiceImpl.java (original) +++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2DataServiceImpl.java Thu Oct 27 21:11:48 2011 @@ -82,7 +82,7 @@ public class OAuth2DataServiceImpl imple public void registerAuthorizationCode(String clientId, OAuth2Code authCode) { if (authCodes.containsKey(clientId)) { - ((List<OAuth2Code>) authCodes.get(clientId)).add(authCode); + authCodes.get(clientId).add(authCode); } else { List<OAuth2Code> list = Lists.newArrayList(); list.add(authCode); @@ -117,7 +117,7 @@ public class OAuth2DataServiceImpl imple public void registerAccessToken(String clientId, OAuth2Code accessToken) { if (accessTokens.containsKey(clientId)) { - ((List<OAuth2Code>) accessTokens.get(clientId)).add(accessToken); + accessTokens.get(clientId).add(accessToken); } else { List<OAuth2Code> list = Lists.newArrayList(); list.add(accessToken); Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2NormalizedRequest.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2NormalizedRequest.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2NormalizedRequest.java (original) +++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2NormalizedRequest.java Thu Oct 27 21:11:48 2011 @@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.IOUtils; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; import org.apache.shindig.common.logging.i18n.MessageKeys; @@ -246,8 +247,8 @@ public class OAuth2NormalizedRequest ext return ""; InputStream is = null; try { - String line = null; - StringBuffer sb = new StringBuffer(); + String line; + StringBuilder sb = new StringBuilder(); is = request.getInputStream(); BufferedReader reader = new BufferedReader(new InputStreamReader(is)); while ((line = reader.readLine()) != null) { @@ -259,7 +260,7 @@ public class OAuth2NormalizedRequest ext LOG.logp(Level.WARNING, classname, "getBodyAsString", MessageKeys.INVALID_OAUTH, ioe); return null; } finally { - try { is.close(); } catch (IOException ignore) { } + IOUtils.closeQuietly(is); } } Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2ServiceImpl.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2ServiceImpl.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2ServiceImpl.java (original) +++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2ServiceImpl.java Thu Oct 27 21:11:48 2011 @@ -40,7 +40,6 @@ import org.apache.shindig.social.core.oa import com.google.inject.CreationException; import com.google.inject.Inject; import com.google.inject.Singleton; -import com.google.inject.name.Named; import com.google.inject.spi.Message; /** Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Servlet.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Servlet.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Servlet.java (original) +++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Servlet.java Thu Oct 27 21:11:48 2011 @@ -28,6 +28,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.io.IOUtils; import org.apache.shindig.common.logging.i18n.MessageKeys; import org.apache.shindig.common.servlet.HttpUtil; import org.apache.shindig.common.servlet.InjectedServlet; @@ -104,7 +105,7 @@ public class OAuth2Servlet extends Injec LOG.logp(Level.WARNING, classname, "getBodyAsString", MessageKeys.INVALID_OAUTH, e); throw new RuntimeException(e); } finally { - out.close(); + IOUtils.closeQuietly(out); } } Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/DefaultResourceRequestValidator.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/DefaultResourceRequestValidator.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/DefaultResourceRequestValidator.java (original) +++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/DefaultResourceRequestValidator.java Thu Oct 27 21:11:48 2011 @@ -62,6 +62,7 @@ public class DefaultResourceRequestValid } } + // TODO(plindner): change this into a constructor or .create() on OAuth2Exception private void throwAccessDenied(String msg) throws OAuth2Exception { OAuth2NormalizedResponse resp = new OAuth2NormalizedResponse(); resp.setError(ErrorType.ACCESS_DENIED.toString()); Modified: shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java URL: http://svn.apache.org/viewvc/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java?rev=1190036&r1=1190035&r2=1190036&view=diff ============================================================================== --- shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java (original) +++ shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java Thu Oct 27 21:11:48 2011 @@ -895,9 +895,8 @@ public class JsonDbOpensocialService imp jsonAlbum.put(Album.Field.ID.toString(), albumId); // Iterate through albums to identify album to update - JSONObject curAlbum = null; for (int i = 0; i < userAlbums.length(); i++) { - curAlbum = userAlbums.getJSONObject(i); + JSONObject curAlbum = userAlbums.getJSONObject(i); if (curAlbum.getString(Album.Field.ID.toString()).equals(albumId)) { userAlbums.put(i, jsonAlbum); return ImmediateFuture.newInstance(null); @@ -939,7 +938,7 @@ public class JsonDbOpensocialService imp } // MediaItem wasn't found - throw new ProtocolException(HttpServletResponse.SC_BAD_REQUEST, "MediaItem ID '" + mediaItemId + "' does not exist within Album '" + albumId + "'"); + throw new ProtocolException(HttpServletResponse.SC_BAD_REQUEST, "MediaItem ID '" + mediaItemId + "' does not exist within Album '" + albumId + '\''); } catch (JSONException je) { throw new ProtocolException( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, @@ -1159,9 +1158,8 @@ public class JsonDbOpensocialService imp jsonMediaItem.put(MediaItem.Field.ALBUM_ID.toString(), albumId); // Iterate through MediaItems to identify item to update - JSONObject curMediaItem = null; for (int i = 0; i < userMediaItems.length(); i++) { - curMediaItem = userMediaItems.getJSONObject(i); + JSONObject curMediaItem = userMediaItems.getJSONObject(i); if (curMediaItem.getString(MediaItem.Field.ID.toString()).equals(mediaItemId) && curMediaItem.getString(MediaItem.Field.ALBUM_ID.toString()).equals(albumId)) { userMediaItems.put(i, jsonMediaItem);
