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 2011/10/27 23:11:50 UTC
svn commit: r1190036 [1/2] - in /shindig/trunk/java:
common/src/main/java/org/apache/shindig/auth/
common/src/main/java/org/apache/shindig/common/
common/src/main/java/org/apache/shindig/common/servlet/
common/src/main/java/org/apache/shindig/config/ c...
Author: lindner
Date: Thu Oct 27 21:11:48 2011
New Revision: 1190036
URL: http://svn.apache.org/viewvc?rev=1190036&view=rev
Log:
Java hygiene for shindig
* Fix javadoc @param references to renamed variables.
* Remove useless initializers for some variables and restructure some usages.
* Convert several idioms to use isEmpty().
* Use ternary expressions where they make sense.
* use chars for single-character strings.
* use StringUtils#split or Splitter#on instead of String#split regexes.
* use IOUtils#closeQuietly in finally blocks.
* other stylistic cleanups.
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfigELResolver.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperTypeConverter.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ClassFieldMapping.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessorImpl.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResource.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequest.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Request.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStore.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Arguments.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Utils.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Client.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistence.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCache.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBinding.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritePath.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompiler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKey.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuth2CallbackServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcSwfServlet.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LocaleSpec.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/ModulePrefs.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/TemplateProcessor.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/CompositeTagRegistry.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultConcatUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultIframeUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/ProxyUriBase.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriUtils.java
shindig/trunk/java/gadgets/src/main/java16/org/apache/shindig/gadgets/rewrite/js/ClosureJsCompiler.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2DataServiceImpl.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2NormalizedRequest.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2ServiceImpl.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/OAuth2Servlet.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth2/validators/DefaultResourceRequestValidator.java
shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AnonymousSecurityToken.java Thu Oct 27 21:11:48 2011
@@ -20,6 +20,7 @@ package org.apache.shindig.auth;
import java.util.EnumSet;
+import org.apache.shindig.common.Nullable;
import org.apache.shindig.config.ContainerConfig;
/**
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/PropertiesModule.java Thu Oct 27 21:11:48 2011
@@ -105,10 +105,9 @@ public class PropertiesModule extends Ab
is = ResourceLoader.openResource(propertyFile);
properties.load(is);
- String value = null;
for (Object key : properties.keySet()) {
- value = (String)properties.get((String)key);
- if (value != null && value.indexOf("%contextRoot%") >=0 ){
+ String value = (String)properties.get((String)key);
+ if (value != null && value.contains("%contextRoot%")){
properties.put(key, value.replace(("%contextRoot%"),contextRoot));
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java Thu Oct 27 21:11:48 2011
@@ -102,16 +102,15 @@ public class GuiceServletContextListener
String contextRoot = context.getContextPath();
System.setProperty("shindig.contextroot", contextRoot);
String systemProperties = context.getInitParameter(SYSTEM_PROPERTIES);
- String key=null;
- String value=null;
- if(systemProperties!=null && systemProperties.trim().length()>0){
+
+ if (systemProperties!=null && systemProperties.trim().length() > 0){
for (String prop : Splitter.on('\n').trimResults().split(systemProperties)){
String[] keyAndvalue = StringUtils.split(prop, "=", 2);
- if(keyAndvalue.length==2){
- key=keyAndvalue[0];
- value=keyAndvalue[1];
+ if (keyAndvalue.length == 2) {
+ String key = keyAndvalue[0];
+ String value = keyAndvalue[1];
//set the system property if they are not empty
- if (key!=null && key.trim().length()>0 && value!=null && value.trim().length()>0){
+ if (key!=null && key.trim().length() > 0 && value!=null && value.trim().length() > 0){
System.setProperty(key,value);
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfigELResolver.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfigELResolver.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfigELResolver.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/config/ContainerConfigELResolver.java Thu Oct 27 21:11:48 2011
@@ -74,7 +74,7 @@ public class ContainerConfigELResolver e
public Object getValue(ELContext context, Object base, Object property) {
// Handle all requests off the base, and anything that is a reference to
// a container
- String container = null;
+ String container;
if (base == null) {
container = currentContainer;
} else if (base instanceof ContainerReference) {
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperTypeConverter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperTypeConverter.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperTypeConverter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/jasper/JasperTypeConverter.java Thu Oct 27 21:11:48 2011
@@ -29,11 +29,8 @@ public class JasperTypeConverter extends
@Override
public boolean isPostConvertible(Class<?> type) {
- if (type == Boolean.class || type == Boolean.TYPE
- || type == JSONArray.class || type == Iterable.class) {
- return true;
- }
- return false;
+ return type == Boolean.class || type == Boolean.TYPE
+ || type == JSONArray.class || type == Iterable.class;
}
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java Thu Oct 27 21:11:48 2011
@@ -134,7 +134,6 @@ public class JsonRpcServlet extends ApiS
JSONObject request = new JSONObject(content);
dispatch(request, formData, servletRequest, servletResponse, token, callback);
}
- return;
} catch (JSONException je) {
sendJsonParseError(je, servletResponse);
} catch (IllegalArgumentException e) {
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanDelegator.java Thu Oct 27 21:11:48 2011
@@ -129,7 +129,7 @@ public class BeanDelegator {
Map<String, Object> extraFields) {
extraFields = normalizeFields(extraFields);
- if (source == null && extraFields.size() > 0) {
+ if (source == null && !extraFields.isEmpty()) {
// Create delegator that is based only on fields, so use dummy object
source = new NullClass();
}
@@ -235,7 +235,7 @@ public class BeanDelegator {
return (data == NULL ? null : data);
}
}
- Exception exc = null;
+ Exception exc;
try {
Method sourceMethod = sourceClass.getMethod(
method.getName(), method.getParameterTypes());
@@ -392,7 +392,7 @@ public class BeanDelegator {
for (Enum<?> val2 : targetEnum.getEnumConstants()) {
values2Map.put(val2.name(), val2);
}
- Enum<?>[] values1 = sourceEnum.getEnumConstants();
+
ImmutableMap.Builder<Enum<?>, Enum<?>> mapBuilder = ImmutableMap.builder();
for (Enum<?> val1 : sourceEnum.getEnumConstants()) {
if (values2Map.containsKey(val1.name())) {
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanFilter.java Thu Oct 27 21:11:48 2011
@@ -128,7 +128,7 @@ public class BeanFilter {
public Object invoke(Object data, Method method, Object[] args) {
String fieldName = null;
- Object result = null;
+ Object result;
if (method.getName().startsWith("get")
// Do not filter out primitive types, it will result in NPE
&& !method.getReturnType().isPrimitive()) {
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ClassFieldMapping.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ClassFieldMapping.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ClassFieldMapping.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/ClassFieldMapping.java Thu Oct 27 21:11:48 2011
@@ -46,8 +46,6 @@ package org.apache.shindig.protocol.conv
* ...
* </person>
* </pre>
- * For a more compact mapping {@link ItemFieldMapping}.
- *
*
*/
public class ClassFieldMapping {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessorImpl.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessorImpl.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessorImpl.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessorImpl.java Thu Oct 27 21:11:48 2011
@@ -111,7 +111,7 @@ public class FeedProcessorImpl implement
String link = e.getLink();
if (link == null) {
List<SyndLink> links = e.getLinks();
- if (links != null && links.size() > 0) {
+ if (links != null && !links.isEmpty()) {
link = links.get(0).getHref();
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java Thu Oct 27 21:11:48 2011
@@ -191,13 +191,9 @@ public class Gadget {
* @return a map of ModuleSpec/Require and ModuleSpec/Optional elements to Feature
*/
public Map<String, Feature> getViewFeatures() {
- String name = null;
- View view = getCurrentView();
- if (view == null) { // Use default view name if current view is not set
- name = GadgetSpec.DEFAULT_VIEW;
- } else {
- name = view.getName();
- }
+ View view = getCurrentView();
+ String name = (view == null) ? GadgetSpec.DEFAULT_VIEW : view.getName();
+
return spec.getModulePrefs().getViewFeatures(name);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureRegistry.java Thu Oct 27 21:11:48 2011
@@ -306,13 +306,9 @@ public class FeatureRegistry {
// res://-prefixed URIs are actually scheme = res, host = "", path = "/stuff". We want res:path.
// Package-private for use by FeatureParser as well.
static Uri getComponentUri(String str) {
- Uri uri = null;
- if (str.startsWith("res://")) {
- uri = new UriBuilder().setScheme(RESOURCE_SCHEME).setPath(str.substring(6)).toUri();
- } else {
- uri = Uri.parse(str);
- }
- return uri;
+ return (str.startsWith("res://")) ?
+ new UriBuilder().setScheme(RESOURCE_SCHEME).setPath(str.substring(6)).toUri() :
+ Uri.parse(str);
}
private List<FeatureNode> getTransitiveDeps(
@@ -501,10 +497,10 @@ public class FeatureRegistry {
List<String> neededList = Lists.newArrayList(needed);
Collections.sort(neededList);
return new StringBuilder().append(StringUtils.join(neededList, ":"))
- .append("|").append(ctx.getRenderingContext())
- .append("|").append(ctx.getContainer())
- .append("|").append(unsupported != null)
- .append("|").append(Strings.nullToEmpty(repository))
+ .append('|').append(ctx.getRenderingContext())
+ .append('|').append(ctx.getContainer())
+ .append('|').append(unsupported != null)
+ .append('|').append(Strings.nullToEmpty(repository))
.toString();
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResource.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResource.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResource.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/features/FeatureResource.java Thu Oct 27 21:11:48 2011
@@ -69,7 +69,7 @@ public interface FeatureResource {
}
public Map<String, String> getAttribs() {
- return ImmutableMap.<String, String>of();
+ return ImmutableMap.of();
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/DefaultRequestPipeline.java Thu Oct 27 21:11:48 2011
@@ -102,7 +102,7 @@ public class DefaultRequestPipeline impl
}
}
- HttpResponse fetchedResponse = null;
+ HttpResponse fetchedResponse;
switch (request.getAuthType()) {
case NONE:
fetchedResponse = httpFetcher.fetch(request);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessor.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessor.java Thu Oct 27 21:11:48 2011
@@ -86,7 +86,7 @@ public class AddJslInfoVariableProcessor
Collection<String> libs = jsUri.getLibs();
List<Object> features = Lists.newArrayList();
for (String lib : libs) {
- features.add("'" + StringEscapeUtils.escapeJavaScript(lib) + "'");
+ features.add('\'' + StringEscapeUtils.escapeJavaScript(lib) + '\'');
}
return StringUtils.join(features, ",");
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessor.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddJslLoadedVariableProcessor.java Thu Oct 27 21:11:48 2011
@@ -20,7 +20,6 @@ package org.apache.shindig.gadgets.js;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Sets;
-import com.google.inject.Inject;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.shindig.gadgets.GadgetContext;
@@ -63,9 +62,9 @@ public class AddJslLoadedVariableProcess
private String toArrayString(Set<String> bundles) {
StringBuilder builder = new StringBuilder();
for (String bundle : bundles) {
- if (builder.length() > 0) builder.append(",");
- builder.append("'").append(StringEscapeUtils.escapeJavaScript(bundle)).append("'");
+ if (builder.length() > 0) builder.append(',');
+ builder.append('\'').append(StringEscapeUtils.escapeJavaScript(bundle)).append('\'');
}
- return "[" + builder.toString() + "]";
+ return '[' + builder.toString() + ']';
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessor.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/AddOnloadFunctionProcessor.java Thu Oct 27 21:11:48 2011
@@ -56,8 +56,8 @@ public class AddOnloadFunctionProcessor
"if(j['c']&&--j['o']<=0){"+
"j['c']();" +
"delete j['c'];" +
- "delete j['o'];" +
- "}" +
+ "delete j['o'];" +
+ '}' +
"})();";
private static final Pattern ONLOAD_FN_PATTERN = Pattern.compile("[a-zA-Z0-9_]+");
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferJsProcessor.java Thu Oct 27 21:11:48 2011
@@ -91,8 +91,8 @@ public class DeferJsProcessor extends Ba
result.append(FUNCTION_NAME).append("('").append(input.namespace).append("',[");
for (int i = 0; i < input.properties.size(); i++) {
String prop = input.properties.get(i);
- if (i > 0) result.append(",");
- result.append("'").append(prop).append("'");
+ if (i > 0) result.append(',');
+ result.append('\'').append(prop).append('\'');
}
result.append("]);");
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ExportJsProcessor.java Thu Oct 27 21:11:48 2011
@@ -98,16 +98,16 @@ public class ExportJsProcessor extends B
result.append("],{");
for (int i = 0; i < input.properties.size(); i++) {
String prop = input.properties.get(i);
- if (i > 0) result.append(",");
- result.append(prop).append(":'").append(prop).append("'");
+ if (i > 0) result.append(',');
+ result.append(prop).append(":'").append(prop).append('\'');
}
result.append("});");
// Global/window namespace.
} else {
for (String prop : input.properties) {
- result.append(FUNCTION_NAME).append("(");
- result.append("'").append(prop).append("',[");
+ result.append(FUNCTION_NAME).append('(');
+ result.append('\'').append(prop).append("',[");
result.append(prop);
result.append("]);");
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequest.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequest.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsRequest.java Thu Oct 27 21:11:48 2011
@@ -100,9 +100,7 @@ public class JsRequest {
allFeatures = registry.getFeatures(jsUri.getLibs());
loadedFeatures = registry.getFeatures(jsUri.getLoadedLibs());
newFeatures = Lists.newLinkedList();
- Iterator<String> allIt = allFeatures.iterator();
- while (allIt.hasNext()) {
- String candidate = allIt.next();
+ for (String candidate : allFeatures) {
if (!loadedFeatures.contains(candidate)) {
newFeatures.add(candidate);
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/JsResponseBuilder.java Thu Oct 27 21:11:48 2011
@@ -18,6 +18,7 @@
package org.apache.shindig.gadgets.js;
+import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -232,7 +233,7 @@ public class JsResponseBuilder {
*/
public JsResponse build() {
return new JsResponse(jsCode, statusCode, cacheTtlSecs, proxyCacheable,
- errors, rawExterns.toString() + buildExternString());
+ errors, rawExterns + buildExternString());
}
private String buildExternString() {
@@ -254,7 +255,7 @@ public class JsResponseBuilder {
private List<String> expand(String value) {
List<String> result = Lists.newArrayList();
StringBuilder cur = new StringBuilder();
- for (String part : value.split("\\.")) {
+ for (String part : Splitter.on('.').split(value)) {
cur.append(cur.length() > 0 ? "." : "").append(part);
result.add(cur.toString());
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessor.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/SeparatorCommentingProcessor.java Thu Oct 27 21:11:48 2011
@@ -58,7 +58,7 @@ public class SeparatorCommentingProcesso
String tag = start ? "start" : "end";
return JsContent.fromFeature(
"\n/* [" + tag + "] feature=" + bundle.getName() + " */\n",
- "[comment-marker-" + tag + "]", bundle, null);
+ "[comment-marker-" + tag + ']', bundle, null);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java Thu Oct 27 21:11:48 2011
@@ -19,7 +19,6 @@ package org.apache.shindig.gadgets.oauth
import com.google.common.collect.Maps;
-import com.google.inject.Provider;
import com.google.inject.Singleton;
import net.oauth.OAuth;
@@ -184,7 +183,7 @@ public class BasicOAuthStore implements
throw new GadgetException(GadgetException.Code.INTERNAL_SERVER_ERROR,
"No key for gadget " + securityToken.getAppUrl() + " and service " + serviceName);
}
- OAuthConsumer consumer = null;
+ OAuthConsumer consumer;
if (cks.getKeyType() == KeyType.RSA_PRIVATE) {
consumer = new OAuthConsumer(null, cks.getConsumerKey(), null, provider);
// The oauth.net java code has lots of magic. By setting this property here, code thousands
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthArguments.java Thu Oct 27 21:11:48 2011
@@ -19,6 +19,7 @@
package org.apache.shindig.gadgets.oauth;
import com.google.common.base.Objects;
+import org.apache.shindig.common.Nullable;
import org.apache.shindig.gadgets.AuthType;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.http.HttpResponse;
@@ -177,7 +178,7 @@ public class OAuthArguments {
/**
* @return the named parameter from the request, or default if the named parameter is not present.
*/
- private static String getRequestParam(HttpServletRequest request, String name, String def) {
+ private static String getRequestParam(HttpServletRequest request, String name, @Nullable String def) {
String val = request.getParameter(name);
if (val == null) {
val = def;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java Thu Oct 27 21:11:48 2011
@@ -192,7 +192,7 @@ public class OAuthRequest {
* unchecked exception occurs, well, then the client is out of luck.
*/
private HttpResponse fetchNoThrow() {
- HttpResponseBuilder response = null;
+ HttpResponseBuilder response;
try {
accessorInfo = fetcherConfig.getTokenStore().getOAuthAccessor(
realRequest.getSecurityToken(), realRequest.getOAuthArguments(), clientState,
@@ -835,7 +835,7 @@ public class OAuthRequest {
* related error instead of user data.
*/
private HttpResponseBuilder fetchData() throws OAuthRequestException, OAuthProtocolException {
- HttpResponseBuilder builder = null;
+ HttpResponseBuilder builder;
if (accessTokenData != null) {
// This is a request for access token data, return it.
builder = formatAccessTokenData();
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Request.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Request.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Request.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/BasicOAuth2Request.java Thu Oct 27 21:11:48 2011
@@ -483,7 +483,7 @@ public class BasicOAuth2Request implemen
BasicOAuth2Request.LOG.entering(BasicOAuth2Request.LOG_CLASS, "fetchData", accessor);
}
- HttpResponseBuilder ret = null;
+ HttpResponseBuilder ret;
try {
final HttpResponse response = this.fetchFromServer(accessor, this.realRequest);
@@ -511,7 +511,7 @@ public class BasicOAuth2Request implemen
new Object[] { accessor, "only log request once" });
}
- HttpResponse ret = null;
+ HttpResponse ret;
final OAuth2Token accessToken = accessor.getAccessToken();
final OAuth2Token refreshToken = accessor.getRefreshToken();
@@ -597,9 +597,7 @@ public class BasicOAuth2Request implemen
}
private static String getCompleteRefreshUrl(final String refreshUrl) {
- final String ret = OAuth2Utils.buildUrl(refreshUrl, null, null);
-
- return ret;
+ return OAuth2Utils.buildUrl(refreshUrl, null, null);
}
private HttpResponseBuilder getErrorResponseBuilder(final Throwable t, final OAuth2Error error,
@@ -714,7 +712,7 @@ public class BasicOAuth2Request implemen
OAuth2HandlerError ret = null;
- String refershTokenUrl = null;
+ String refershTokenUrl;
refershTokenUrl = BasicOAuth2Request.buildRefreshTokenUrl(accessor);
@@ -766,12 +764,11 @@ public class BasicOAuth2Request implemen
}
if (ret == null) {
- if (response != null) {
- final int statusCode = response.getHttpStatusCode();
- if (statusCode != HttpResponse.SC_OK) {
- ret = new OAuth2HandlerError(OAuth2Error.REFRESH_TOKEN_PROBLEM,
- "bad response from server : " + statusCode, null);
- }
+ // response is not null..
+ final int statusCode = response.getHttpStatusCode();
+ if (statusCode != HttpResponse.SC_OK) {
+ ret = new OAuth2HandlerError(OAuth2Error.REFRESH_TOKEN_PROBLEM,
+ "bad response from server : " + statusCode, null);
}
if (ret == null) {
@@ -846,18 +843,10 @@ public class BasicOAuth2Request implemen
}
private static boolean validateAccessToken(final OAuth2Token accessToken) {
- if (accessToken != null) {
- return true;
- }
-
- return false;
+ return accessToken != null;
}
private static boolean validateRefreshToken(final OAuth2Token refreshToken) {
- if (refreshToken != null) {
- return true;
- }
-
- return false;
+ return refreshToken != null;
}
}
\ No newline at end of file
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStore.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStore.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStore.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/GadgetOAuth2TokenStore.java Thu Oct 27 21:11:48 2011
@@ -89,7 +89,7 @@ public class GadgetOAuth2TokenStore {
new Object[] { arguments, gadgetUri });
}
- GadgetSpec ret = null;
+ GadgetSpec ret;
try {
final GadgetContext context = new OAuth2GadgetContext(securityToken, arguments, gadgetUri);
@@ -166,7 +166,7 @@ public class GadgetOAuth2TokenStore {
+ " , serviceName = " + serviceName, "");
}
- if ((ret == null) && (arguments != null) && (specInfo != null)) {
+ if (ret == null && arguments != null) {
String scope = arguments.getScope();
if ((scope == null) || (scope.length() == 0)) {
// no scope on request, default to module prefs scope
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Arguments.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Arguments.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Arguments.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Arguments.java Thu Oct 27 21:11:48 2011
@@ -23,6 +23,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
+import org.apache.shindig.common.Nullable;
import org.apache.shindig.gadgets.AuthType;
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.spec.RequestAuthenticationInfo;
@@ -137,7 +138,7 @@ public class OAuth2Arguments {
}
private static String getAuthInfoParam(final Map<String, String> attrs, final String name,
- final String def) {
+ @Nullable final String def) {
String val = attrs.get(name);
if (val == null) {
val = def;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Utils.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Utils.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Utils.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/OAuth2Utils.java Thu Oct 27 21:11:48 2011
@@ -26,6 +26,7 @@ import java.util.TreeSet;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang.StringUtils;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLEncodedUtils;
import org.apache.http.message.BasicNameValuePair;
@@ -46,7 +47,7 @@ public class OAuth2Utils {
* Normalizes a URL and parameters. If the URL already contains parameters,
* new parameters will be added properly.
*
- * @param URL
+ * @param url2
* is the base URL to normalize
* @param queryParams
* query parameters to add to the URL
@@ -91,7 +92,7 @@ public class OAuth2Utils {
fragmentParams2.putAll(fragmentParams);
}
- final StringBuffer buff = new StringBuffer(urlNoParams);
+ final StringBuilder buff = new StringBuilder(urlNoParams);
if ((queryParams != null) && !queryParams.isEmpty()) {
if (urlNoParams.contains("?")) {
buff.append('&');
@@ -135,8 +136,7 @@ public class OAuth2Utils {
/**
* Fetch bearer token from http request
*
- * @param request
- * httpServletRequest
+ * @param req httpServletRequest
*
* @return String bearer token from the request
*/
@@ -155,7 +155,7 @@ public class OAuth2Utils {
/**
* Fetch client secret from http request for a given client.
*
- * @param request
+ * @param req
* httpServletRequest
* @param clientId
* id of the client
@@ -168,12 +168,10 @@ public class OAuth2Utils {
if ((secret == null) || secret.equals("")) {
final String header = req.getHeader("Authorization");
if ((header != null) && header.contains("Basic")) {
- String[] parts = header.split("\\s+");
- String temp = parts[parts.length - 1];
final byte[] decodedSecret = Base64.decodeBase64(secret);
try {
- temp = new String(decodedSecret, "UTF-8");
- parts = temp.split(":");
+ String temp = new String(decodedSecret, "UTF-8");
+ String[] parts = StringUtils.split(temp, ':');
if ((parts != null) && (parts.length == 2) && (parts[0].equals(clientId))) {
secret = parts[1];
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandler.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/BasicAuthenticationHandler.java Thu Oct 27 21:11:48 2011
@@ -60,7 +60,7 @@ public class BasicAuthenticationHandler
final String secret = new String(secretBytes, "UTF-8");
- final String authString = clientId + ":" + secret;
+ final String authString = clientId + ':' + secret;
final byte[] authBytes = Base64.encodeBase64(authString.getBytes());
request.setHeader(OAuth2Message.AUTHORIZATION_HEADER, "Basic: " + new String(authBytes));
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandler.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeAuthorizationResponseHandler.java Thu Oct 27 21:11:48 2011
@@ -117,9 +117,7 @@ public class CodeAuthorizationResponseHa
}
private static String getCompleteTokenUrl(final String accessTokenUrl) {
- final String ret = OAuth2Utils.buildUrl(accessTokenUrl, null, null);
-
- return ret;
+ return OAuth2Utils.buildUrl(accessTokenUrl, null, null);
}
public OAuth2HandlerError handleRequest(final OAuth2Accessor accessor,
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandler.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/CodeGrantTypeHandler.java Thu Oct 27 21:11:48 2011
@@ -78,9 +78,7 @@ public class CodeGrantTypeHandler implem
queryParams.put(OAuth2Message.SCOPE, scope);
}
- final String ret = OAuth2Utils.buildUrl(accessor.getAuthorizationUrl(), queryParams, null);
-
- return ret;
+ return OAuth2Utils.buildUrl(accessor.getAuthorizationUrl(), queryParams, null);
}
public String getGrantType() {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandler.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/handler/TokenAuthorizationResponseHandler.java Thu Oct 27 21:11:48 2011
@@ -101,7 +101,7 @@ public class TokenAuthorizationResponseH
if (contentType.startsWith("text/plain")) {
// Facebook does this
- msg.parseQuery("?" + responseString);
+ msg.parseQuery('?' + responseString);
} else if (contentType.startsWith("application/json")) {
// Google does this
final JSONObject responseJson = new JSONObject(responseString);
@@ -194,11 +194,7 @@ public class TokenAuthorizationResponseH
return false;
}
- if (response == null) {
- return false;
- }
-
- return true;
+ return response != null;
}
private static OAuth2HandlerError getError(final String contextMessage) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Client.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Client.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Client.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2Client.java Thu Oct 27 21:11:48 2011
@@ -156,7 +156,7 @@ public class OAuth2Client implements Ser
@Override
public int hashCode() {
if ((this.serviceName != null) && (this.gadgetUri != null)) {
- return (this.serviceName + ":" + this.gadgetUri).hashCode();
+ return (this.serviceName + ':' + this.gadgetUri).hashCode();
}
return 0;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistence.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistence.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistence.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/OAuth2TokenPersistence.java Thu Oct 27 21:11:48 2011
@@ -171,7 +171,7 @@ public class OAuth2TokenPersistence impl
@Override
public int hashCode() {
if ((this.serviceName != null) && (this.gadgetUri != null)) {
- return (this.serviceName + ":" + this.gadgetUri + ":" + this.user + ":" + this.scope + ":" + this.type)
+ return (this.serviceName + ':' + this.gadgetUri + ':' + this.user + ':' + this.scope + ':' + this.type)
.hashCode();
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCache.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCache.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCache.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/InMemoryCache.java Thu Oct 27 21:11:48 2011
@@ -62,14 +62,11 @@ public class InMemoryCache implements OA
}
public OAuth2Client getClient(final Integer index) {
- final OAuth2Client ret = this.clients.get(index);
- return ret;
+ return this.clients.get(index);
}
public Integer getClientIndex(final String gadgetUri, final String serviceName) {
- return Integer
- .valueOf((InMemoryCache.OAUTH2_CLIENT_PREFIX + ":" + gadgetUri + ":" + serviceName)
- .hashCode());
+ return (InMemoryCache.OAUTH2_CLIENT_PREFIX + ':' + gadgetUri + ':' + serviceName).hashCode();
}
public OAuth2Accessor getOAuth2Accessor(final Integer index) {
@@ -83,7 +80,7 @@ public class InMemoryCache implements OA
public Integer getOAuth2AccessorIndex(final String gadgetUri, final String serviceName,
final String user, final String scope) {
- return Integer.valueOf((gadgetUri + ":" + serviceName + ":" + ":" + user + ":" + scope)
+ return Integer.valueOf((gadgetUri + ':' + serviceName + ':' + ':' + user + ':' + scope)
.hashCode());
}
@@ -103,8 +100,8 @@ public class InMemoryCache implements OA
public Integer getTokenIndex(final String gadgetUri, final String serviceName, final String user,
final String scope, final OAuth2Token.Type type) {
- return Integer.valueOf((InMemoryCache.OAUTH2_TOKEN_PREFIX + ":" + gadgetUri + ":" + serviceName
- + ":" + user + ":" + scope + ":" + type.name()).hashCode());
+ return Integer.valueOf((InMemoryCache.OAUTH2_TOKEN_PREFIX + ':' + gadgetUri + ':' + serviceName
+ + ':' + user + ':' + scope + ':' + type.name()).hashCode());
}
public OAuth2Client removeClient(final Integer index) throws OAuth2CacheException {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/JSONOAuth2Persister.java Thu Oct 27 21:11:48 2011
@@ -251,7 +251,7 @@ public class JSONOAuth2Persister impleme
final OAuth2GadgetBinding gadgetBinding = new OAuth2GadgetBinding(gadgetUri,
gadgetServiceName, clientName, allowOverride);
- ret.put(gadgetBinding.getGadgetUri() + ":" + gadgetBinding.getGadgetServiceName(),
+ ret.put(gadgetBinding.getGadgetUri() + ':' + gadgetBinding.getGadgetServiceName(),
gadgetBinding);
}
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBinding.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBinding.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBinding.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth2/persistence/sample/OAuth2GadgetBinding.java Thu Oct 27 21:11:48 2011
@@ -75,7 +75,7 @@ public class OAuth2GadgetBinding {
@Override
public int hashCode() {
if ((this.gadgetUri != null) && (this.gadgetServiceName != null)) {
- return (this.gadgetUri + ":" + this.gadgetServiceName).hashCode();
+ return (this.gadgetUri + ':' + this.gadgetServiceName).hashCode();
}
return 0;
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/GadgetHtmlParser.java Thu Oct 27 21:11:48 2011
@@ -257,7 +257,7 @@ public abstract class GadgetHtmlParser {
}
}
- DocumentFragment fragment = null;
+ DocumentFragment fragment;
try {
fragment = parseFragmentImpl(source);
} catch (DOMException e) {
@@ -356,7 +356,7 @@ public abstract class GadgetHtmlParser {
next.removeChild(next.getFirstChild());
}
- sb.append("</").append(osType).append(">");
+ sb.append("</").append(osType).append('>');
DocumentFragment osFragment = parseFragmentImpl(sb.toString());
while (osFragment.hasChildNodes()) {
Node osKid = osFragment.removeChild(osFragment.getFirstChild());
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java Thu Oct 27 21:11:48 2011
@@ -18,7 +18,6 @@
*/
package org.apache.shindig.gadgets.parse.nekohtml;
-import com.google.common.collect.ImmutableMap;
import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.xml.DomUtil;
import org.apache.shindig.gadgets.GadgetException;
@@ -54,7 +53,6 @@ import org.w3c.dom.NodeList;
import java.io.IOException;
import java.io.StringReader;
-import java.util.Map;
import java.util.Stack;
/**
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java Thu Oct 27 21:11:48 2011
@@ -114,7 +114,7 @@ public class DefaultServiceFetcher {
for (String endpoint : endpoints) {
String endpointVal = endpoint;
if ( endpoint.startsWith("//") && authority != null ){
- endpointVal = authority.getScheme() + ":" + endpoint;
+ endpointVal = authority.getScheme() + ':' + endpoint;
}
endpointServices.putAll(endpoint, retrieveServices(endpointVal.replace("%host%", host)));
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java Thu Oct 27 21:11:48 2011
@@ -435,7 +435,7 @@ public class RenderingGadgetRewriter imp
Map<String, Object> config =
configProcessor.getConfig(gadget.getContext().getContainer(), reqs, null, gadget);
- if (config.size() > 0) {
+ if (!config.isEmpty()) {
return "gadgets.config.init(" + JsonSerializer.serialize(config) + ");\n";
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingGadgetRewriter.java Thu Oct 27 21:11:48 2011
@@ -153,7 +153,7 @@ public class SanitizingGadgetRewriter ex
protected abstract boolean removeAttr(Gadget gadget, Attr attr, Uri ctx);
public VisitStatus visit(Gadget gadget, Node node) throws RewritingException {
- Element elem = null;
+ Element elem;
switch (node.getNodeType()) {
case Node.CDATA_SECTION_NODE:
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizingResponseRewriter.java Thu Oct 27 21:11:48 2011
@@ -109,7 +109,6 @@ public class SanitizingResponseRewriter
}
imageIsSafe = true;
// Return false to indicate that no rewriting occurred
- return;
} catch (IOException ioe) {
throw new RuntimeException(ioe);
} catch (ImageReadException ire) {
@@ -118,10 +117,7 @@ public class SanitizingResponseRewriter
LOG.logp(Level.INFO, classname, "rewriteProxiedImage", MessageKeys.UNABLE_DETECT_IMG_TYPE,new Object[] {request.getUri().toString()});
LOG.log(Level.INFO, ire.getMessage(), ire);
}
- return;
}
- } else {
- return;
}
} finally {
if (!imageIsSafe) {
@@ -147,7 +143,6 @@ public class SanitizingResponseRewriter
sanitized = cssSanitizer.sanitize(resp.getContent(), request.getUri(),
gadgetContext, cssImportRewriter, cssImageRewriter);
}
- return;
} finally {
// Set sanitized content in finally to ensure it is always cleared in
// the case of errors
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=1190036&r1=1190035&r2=1190036&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 Thu Oct 27 21:11:48 2011
@@ -247,7 +247,7 @@ public class ContentRewriterFeature {
this.excludes = getMatchBundle(excludeRegex, excludeUrls);
// Spec-specified include tags.
- Set<String> tagsVal = null;
+ Set<String> tagsVal;
if (f != null && f.getParams().containsKey(INCLUDE_TAGS)) {
tagsVal = Sets.newTreeSet();
for (String tag : Splitter.on(',').trimResults().omitEmptyStrings().split(f.getParam(INCLUDE_TAGS))) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/CssResponseRewriter.java Thu Oct 27 21:11:48 2011
@@ -203,7 +203,7 @@ public class CssResponseRewriter impleme
private static String rewriteUri(UriMaker uriMaker, String input, Uri context,
GadgetContext gadgetContext) {
- Uri inboundUri = null;
+ Uri inboundUri;
try {
inboundUri = Uri.parse(input);
} catch (IllegalArgumentException e) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriter.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageAttributeRewriter.java Thu Oct 27 21:11:48 2011
@@ -99,7 +99,7 @@ public class ImageAttributeRewriter exte
}
public boolean revisit(Gadget gadget, List<Node> nodes) throws RewritingException {
- if (nodes.size() == 0) {
+ if (nodes.isEmpty()) {
return false;
}
Node head = DomUtil.getFirstNamedChildNode(
@@ -149,7 +149,7 @@ public class ImageAttributeRewriter exte
*/
private String processAllImgResources(List<Node> nodes,
Map<Uri, FutureTask<RequestContext>> futureTasks) {
- String cssContent = "";
+ StringBuilder cssContent = new StringBuilder("");
for (int i = 0; i < nodes.size(); i++) {
Element imageElement = (Element) nodes.get(i);
@@ -197,10 +197,10 @@ public class ImageAttributeRewriter exte
if (imageHeight > 0 && imageWidth > 0 && imageHeight * imageWidth > 1) {
imageElement.setAttribute("class", IMG_ATTR_CLASS_NAME_PREFIX + i);
- cssContent += "." + IMG_ATTR_CLASS_NAME_PREFIX + i + " {\n" +
- " height: " + imageHeight + "px" + ";\n" +
- " width: " + imageWidth + "px" + ";\n" +
- "}\n";
+ cssContent.append('.').append(IMG_ATTR_CLASS_NAME_PREFIX).append(i).append(" {\n")
+ .append(" height: ").append(imageHeight).append("px;\n")
+ .append(" width: ").append(imageWidth).append("px;\n")
+ .append("}\n");
}
} catch (ImageReadException e) {
if (LOG.isLoggable(Level.WARNING)) {
@@ -217,7 +217,7 @@ public class ImageAttributeRewriter exte
}
}
- return cssContent;
+ return cssContent.toString();
}
// TODO(satya): Need to pass the request parameters as well ?
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ImageResizeRewriter.java Thu Oct 27 21:11:48 2011
@@ -98,7 +98,7 @@ public class ImageResizeRewriter extends
// We want to append image resize params only to urls that are proxied through us.
String uriStr = imgElement.getAttribute("src").trim();
Uri uri = Uri.parse(uriStr);
- ProxyUriManager.ProxyUri proxied = null;
+ ProxyUriManager.ProxyUri proxied;
// Try parsing this uri as a ProxyUri.
try {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritePath.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritePath.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritePath.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/RewritePath.java Thu Oct 27 21:11:48 2011
@@ -55,9 +55,9 @@ public class RewritePath implements Resp
}
public String toString() {
- return "@" + ResponseRewriterList.class.getName()
- + "(rewriteFlow=" + rewriteFlow + ","
- + "container=" + container + ")";
+ return '@' + ResponseRewriterList.class.getName()
+ + "(rewriteFlow=" + rewriteFlow + ','
+ + "container=" + container + ')';
}
public Class<? extends Annotation> annotationType() {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ScriptConcatContentRewriter.java Thu Oct 27 21:11:48 2011
@@ -61,7 +61,7 @@ public class ScriptConcatContentRewriter
@Override
protected List<Visitor> makeVisitors(Gadget context, Uri gadgetUri) {
ContentRewriterFeature.Config config = featureConfigFactory.get(gadgetUri);
- return Arrays.<Visitor>asList(
+ return Arrays.asList(
new CacheEnforcementVisitor(config, executor, cache, requestPipeline,
CacheEnforcementVisitor.Tags.SCRIPT),
new ConcatVisitor.Js(config, concatUriManager));
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/StyleConcatContentRewriter.java Thu Oct 27 21:11:48 2011
@@ -60,7 +60,7 @@ public class StyleConcatContentRewriter
@Override
protected List<Visitor> makeVisitors(Gadget context, Uri gadgetUri) {
ContentRewriterFeature.Config config = featureConfigFactory.get(gadgetUri);
- return Arrays.<Visitor>asList(
+ return Arrays.asList(
new CacheEnforcementVisitor(config, executor, cache, requestPipeline,
CacheEnforcementVisitor.Tags.STYLESHEET),
new ConcatVisitor.Css(config, concatUriManager));
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/JpegImageUtils.java Thu Oct 27 21:11:48 2011
@@ -147,8 +147,7 @@ public class JpegImageUtils {
stdTotal += stdTable[i];
}
- float scaleFactor = 0;
- scaleFactor = (total - 32F)/stdTotal;
+ float scaleFactor = (total - 32F)/stdTotal;
float approxChannelQuality;
if (scaleFactor > 1.0) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompiler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompiler.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompiler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/js/DefaultJsCompiler.java Thu Oct 27 21:11:48 2011
@@ -41,7 +41,7 @@ public class DefaultJsCompiler implement
if (resource.isExternal()) {
// Support external/type=url feature serving through document.write()
jsContent.add(JsContent.fromFeature("document.write('<script src=\"" + content + "\"></script>')",
- "[external:" + content + "]", bundle, resource));
+ "[external:" + content + ']', bundle, resource));
} else {
jsContent.add(JsContent.fromFeature(content, resource.getName(), bundle, resource));
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java Thu Oct 27 21:11:48 2011
@@ -161,7 +161,7 @@ public class ConcatProxyServlet extends
private boolean doFetchConcatResources(HttpServletResponse response,
ConcatUriManager.ConcatUri concatUri, Uri uri) throws IOException {
// Check for json concat and set output stream.
- ConcatOutputStream cos = null;
+ ConcatOutputStream cos;
Long minCacheTtl = Long.MAX_VALUE;
boolean isMinCacheTtlSet = false;
@@ -200,7 +200,7 @@ public class ConcatProxyServlet extends
List<Pair<Uri, FutureTask<RequestContext>>> futureTasks = parallelFetcher.fetchAll(requests);
for (Pair<Uri, FutureTask<RequestContext>> futureTask : futureTasks) {
- RequestContext requestCxt = null;
+ RequestContext requestCxt;
try {
try {
requestCxt = futureTask.two.get();
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java Thu Oct 27 21:11:48 2011
@@ -33,6 +33,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.auth.SecurityTokenCodec;
import org.apache.shindig.auth.SecurityTokenException;
+import org.apache.shindig.common.Nullable;
import org.apache.shindig.common.servlet.HttpUtil;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.util.TimeSource;
@@ -279,7 +280,7 @@ public class GadgetsHandlerService {
String content = null;
Long expireMs = null;
if (isFieldIncluded(fields, "jsContent")) {
- JsResponse response = null;
+ JsResponse response;
try {
response = jsPipeline.execute(jsRequestBuilder.build(jsUri, servedUri.getAuthority()));
} catch (JsException e) {
@@ -405,17 +406,14 @@ public class GadgetsHandlerService {
}
}
- protected Long getProxyExpireMs(ProxyUri proxyUri, HttpResponse httpResponse) {
- Long expireMs = null;
+ protected Long getProxyExpireMs(ProxyUri proxyUri, @Nullable HttpResponse httpResponse) {
if (httpResponse != null) {
- expireMs = httpResponse.getCacheExpiration();
+ return httpResponse.getCacheExpiration();
} else if (proxyUri.getRefresh() != null) {
- expireMs = timeSource.currentTimeMillis() + proxyUri.getRefresh() * 1000;
- } else {
- // Use default ttl:
- return getDefaultExpiration();
+ return timeSource.currentTimeMillis() + proxyUri.getRefresh() * 1000;
}
- return expireMs;
+
+ return getDefaultExpiration();
}
protected long getDefaultExpiration() {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HtmlAccelServlet.java Thu Oct 27 21:11:48 2011
@@ -58,7 +58,7 @@ public class HtmlAccelServlet extends In
HttpRequest req = ServletUtil.fromHttpServletRequest(request);
req.setContainer(AccelUriManager.CONTAINER);
- HttpResponse response = null;
+ HttpResponse response;
try {
response = accelHandler.fetch(req);
} catch (GadgetException e) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/MakeRequestHandler.java Thu Oct 27 21:11:48 2011
@@ -116,7 +116,7 @@ public class MakeRequestHandler {
"Unable to find gadget in request", HttpResponse.SC_FORBIDDEN);
}
- Gadget gadget = null;
+ Gadget gadget;
GadgetContext context = new HttpGadgetContext(request) {
public Uri getUrl() {
return gadgetUri;
@@ -183,7 +183,7 @@ public class MakeRequestHandler {
+ " parameter is missing.", HttpResponse.SC_BAD_REQUEST);
}
- Uri url = null;
+ Uri url;
try {
url = ServletUtil.validateUrl(Uri.parse(urlStr));
} catch (IllegalArgumentException e) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKey.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKey.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKey.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ModuleCacheKey.java Thu Oct 27 21:11:48 2011
@@ -109,7 +109,7 @@ final class ModuleCacheKey implements Jo
}
private void hash(Node node) {
- hash((short) node.getNodeType());
+ hash(node.getNodeType());
switch (node.getNodeType()) {
case Node.ATTRIBUTE_NODE:
case Node.ELEMENT_NODE:
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuth2CallbackServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuth2CallbackServlet.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuth2CallbackServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/OAuth2CallbackServlet.java Thu Oct 27 21:11:48 2011
@@ -160,7 +160,6 @@ public class OAuth2CallbackServlet exten
if (IOException.class.isInstance(e)) {
throw (IOException) e;
}
- return;
} finally {
if (accessor != null) {
accessor.setRedirecting(false);
@@ -188,7 +187,6 @@ public class OAuth2CallbackServlet exten
}
resp.getWriter().write(OAuth2CallbackServlet.RESP_BODY);
- return;
}
@Inject
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java Thu Oct 27 21:11:48 2011
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.gadgets.servlet;
+import org.apache.commons.io.IOUtils;
import org.apache.shindig.common.logging.i18n.MessageKeys;
import org.apache.shindig.common.servlet.InjectedServlet;
import org.apache.shindig.common.uri.Uri;
@@ -140,10 +141,7 @@ public class ProxyServlet extends Inject
LOG.logp(Level.WARNING, classname, "getPOSTContent", "Caught exception while reading POST body:"
+ e.getMessage());
} finally {
- if (reader != null) {
- reader.close();
- reader = null;
- }
+ IOUtils.closeQuietly(reader);
}
return buffer;
}
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcSwfServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcSwfServlet.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcSwfServlet.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcSwfServlet.java Thu Oct 27 21:11:48 2011
@@ -52,18 +52,16 @@ public class RpcSwfServlet extends HttpS
}
public RpcSwfServlet(String swfResource) {
- byte[] bytes = null;
- try {
+ try {
InputStream is = ResourceLoader.openResource(swfResource);
if (is == null) {
throw new RuntimeException("Failed to locate Flash SWF");
}
- bytes = IOUtils.toByteArray(is);
+ this.swfBytes = IOUtils.toByteArray(is);
+ this.hash = HashUtil.checksum(swfBytes);
} catch (IOException e) {
throw new RuntimeException(e);
}
- this.swfBytes = bytes;
- this.hash = HashUtil.checksum(swfBytes);
}
@Inject(optional = true)
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ServletUtil.java Thu Oct 27 21:11:48 2011
@@ -224,9 +224,10 @@ public final class ServletUtil {
// Ctor args indicate to encode w/o line breaks.
Base64InputStream b64input = new Base64InputStream(response.getResponse(), true, 0, null);
byte[] buf = new byte[1024];
- int read = -1;
+
try {
- while ((read = b64input.read(buf, 0, 1024)) > 0) {
+ int read;
+ while (( read = b64input.read(buf, 0, 1024)) > 0) {
os.write(buf, 0, read);
}
} finally {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Feature.java Thu Oct 27 21:11:48 2011
@@ -116,7 +116,7 @@ public class Feature {
buf.append(required ? "<Require" : "<Optional")
.append(" feature=\"")
.append(name);
- if (views.size() > 0) {
+ if (!views.isEmpty()) {
buf.append("\" views=\"").append(StringUtils.join(views, ','));
}
buf.append("\">");
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LocaleSpec.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LocaleSpec.java?rev=1190036&r1=1190035&r2=1190036&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LocaleSpec.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/LocaleSpec.java Thu Oct 27 21:11:48 2011
@@ -130,7 +130,7 @@ public class LocaleSpec {
buf.append("<Locale").append(" lang='").append(getLanguage()).append('\'')
.append(" country='").append(getCountry()).append('\'')
.append(" language_direction='").append(languageDirection).append('\'');
- if (views.size() > 0) {
+ if (!views.isEmpty()) {
buf.append(" views=\'").append(StringUtils.join(views, ',')).append('\'');
}
buf.append(" messages='").append(messages).append("'>\n");