You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by li...@apache.org on 2009/02/23 18:58:14 UTC
svn commit: r747092 [1/2] - in /incubator/shindig/trunk/java:
common/src/main/java/org/apache/shindig/auth/
common/src/main/java/org/apache/shindig/common/crypto/
common/src/main/java/org/apache/shindig/common/util/
common/src/main/java/org/apache/shin...
Author: lindner
Date: Mon Feb 23 17:58:08 2009
New Revision: 747092
URL: http://svn.apache.org/viewvc?rev=747092&view=rev
Log:
Code Cleanup Day
* remove duplicate super.setUp()
* fix Javadoc problems
* avoid equals() for enum compare
* add final for log variables
* Replace assertEquals with assertSame where appropriate
* remove new designations from static array initialization
* Use entrySet() instead of keySet()
* Use char for length==1 strings
* make some inner classes static
* replace indexOf() calls with contains() calls
* Collections.EMPTY_* to empty*
* replace certain size() calls with isEmpty()
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/AbstractContainerConfig.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanAtomConverter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonLibConverter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXmlConverter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/JsonObjectToMapMorpher.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanConverter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/MapConverter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/FilterOperation.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/SortOrder.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/TestModel.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/DateUtilTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FutureUtilTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DefaultHandlerRegistryTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/ApiValidator.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultUrlGenerator.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderService.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloads.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/Preloader.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizedRenderingContentRewriter.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/encoding/EncodingDetectorTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndexTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssParserTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/SocialMarkupHtmlParserTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataContentRewriterTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXStreamAtomConverter.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLink.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ListField.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthDataStore.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/oauth/SampleOAuthServlet.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/JsonConverterPerformancePerf.java
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/BasicSecurityToken.java Mon Feb 23 17:58:08 2009
@@ -37,7 +37,7 @@
private final Map<String, String> tokenData;
/** tool to use for signing and encrypting the token */
- private BlobCrypter crypter = new BasicBlobCrypter(INSECURE_KEY);
+ private final BlobCrypter crypter = new BasicBlobCrypter(INSECURE_KEY);
private static final byte[] INSECURE_KEY =
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/Crypto.java Mon Feb 23 17:58:08 2009
@@ -63,7 +63,7 @@
*/
public final static int CIPHER_KEY_LEN = 16;
- private static int CIPHER_BLOCK_SIZE = 16;
+ private static final int CIPHER_BLOCK_SIZE = 16;
/**
* Length of HMAC SHA1 output
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/DateUtil.java Mon Feb 23 17:58:08 2009
@@ -30,7 +30,7 @@
*/
public class DateUtil {
- private static DateTimeFormatter rfc1123DateFormat = DateTimeFormat
+ private static final DateTimeFormatter rfc1123DateFormat = DateTimeFormat
.forPattern("EEE, dd MMM yyyy HH:mm:ss 'GMT'")
.withLocale(Locale.US)
.withZone(DateTimeZone.UTC);
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/AbstractContainerConfig.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/AbstractContainerConfig.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/AbstractContainerConfig.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/AbstractContainerConfig.java Mon Feb 23 17:58:08 2009
@@ -44,6 +44,7 @@
return 0;
}
+ @SuppressWarnings("unchecked")
public boolean getBool(String container, String property) {
Object value = getProperty(container, property);
if (value instanceof Boolean) {
@@ -52,22 +53,20 @@
return false;
}
+ @SuppressWarnings("unchecked")
public List<Object> getList(String container, String property) {
Object value = getProperty(container, property);
if (value instanceof List) {
- @SuppressWarnings("unchecked")
- List<Object> listValue = (List<Object>) value;
- return listValue;
+ return (List<Object>) value;
}
return Collections.emptyList();
}
+ @SuppressWarnings("unchecked")
public Map<String, Object> getMap(String container, String property) {
Object value = getProperty(container, property);
if (value instanceof Map) {
- @SuppressWarnings("unchecked")
- Map<String, Object> mapValue = (Map<String, Object>) value;
- return mapValue;
+ return (Map<String, Object>) value;
}
return Collections.emptyMap();
}
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/config/JsonContainerConfig.java Mon Feb 23 17:58:08 2009
@@ -43,6 +43,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.logging.Logger;
+import java.util.logging.Level;
import javax.el.ELContext;
import javax.el.ELException;
@@ -82,7 +83,7 @@
}
/**
- * Creates a new configuration from a JSON Object,Êfor use in testing.
+ * Creates a new configuration from a JSON Object, for use in testing.
*/
public JsonContainerConfig(JSONObject json, Expressions expressions) {
this.expressions = expressions;
@@ -196,7 +197,8 @@
}
loadFromString(ResourceLoader.getContent(file), all);
} else {
- LOG.finest(file.getAbsolutePath() + " doesn't seem to be a JS or JSON file.");
+ if (LOG.isLoggable(Level.FINEST))
+ LOG.finest(file.getAbsolutePath() + " doesn't seem to be a JS or JSON file.");
}
}
} catch (IOException e) {
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/BaseRequestItem.java Mon Feb 23 17:58:08 2009
@@ -230,8 +230,7 @@
return listParam;
}
else if (param instanceof List) {
- List<String> listParam = (List<String>)param;
- return listParam;
+ return (List<String>)param;
} else if (param instanceof JSONArray) {
try {
JSONArray jsonArray = (JSONArray)param;
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DefaultHandlerRegistry.java Mon Feb 23 17:58:08 2009
@@ -130,9 +130,9 @@
public Set<String> getSupportedRestServices() {
Set<String> result = Sets.newTreeSet();
for (Map<String, SortedSet<RestPath>> methods : serviceMethodPathMap.values()) {
- for (String method : methods.keySet()) {
- for (RestPath path : methods.get(method)) {
- result.add(method + " " + path.operationPath);
+ for (Map.Entry<String, SortedSet<RestPath>> method : methods.entrySet()) {
+ for (RestPath path : method.getValue()) {
+ result.add(method.getKey() + ' ' + path.operationPath);
}
}
}
@@ -206,15 +206,15 @@
}
if (StringUtils.isEmpty(op.path())) {
- sortedSet.add(new RestPath("/" + serviceName + service.path(), restHandler));
+ sortedSet.add(new RestPath('/' + serviceName + service.path(), restHandler));
} else {
// Use the standard service name and constant prefix as the key
- sortedSet.add(new RestPath("/" + serviceName + op.path(), restHandler));
+ sortedSet.add(new RestPath('/' + serviceName + op.path(), restHandler));
}
}
}
} catch (NoSuchMethodException nme) {
- logger.log(Level.INFO, "No REST binding for " + service.name() + "." + m.getName());
+ logger.log(Level.INFO, "No REST binding for " + service.name() + '.' + m.getName());
}
}
@@ -232,9 +232,9 @@
RpcInvocationHandler rpcHandler =
new RpcInvocationHandler(methodCaller, handlerProvider, beanJsonConverter,
new ExecutionListenerWrapper(service.name(), opName, executionListener));
- rpcOperations.put(service.name() + "." + opName, rpcHandler);
+ rpcOperations.put(service.name() + '.' + opName, rpcHandler);
} catch (NoSuchMethodException nme) {
- logger.log(Level.INFO, "No RPC binding for " + service.name() + "." + m.getName());
+ logger.log(Level.INFO, "No RPC binding for " + service.name() + '.' + m.getName());
}
}
@@ -466,7 +466,7 @@
*/
private static final class ErrorRestHandler implements RestHandler {
- private ProtocolException error;
+ private final ProtocolException error;
public ErrorRestHandler(ProtocolException error) {
this.error = error;
@@ -483,7 +483,7 @@
*/
private static final class ErrorRpcHandler implements RpcHandler {
- private ProtocolException error;
+ private final ProtocolException error;
public ErrorRpcHandler(ProtocolException error) {
this.error = error;
@@ -503,7 +503,7 @@
CONST, SINGULAR_PARAM, PLURAL_PARAM
}
- class Part {
+ static class Part {
String partName;
PartType type;
Part(String partName, PartType type) {
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanAtomConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanAtomConverter.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanAtomConverter.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanAtomConverter.java Mon Feb 23 17:58:08 2009
@@ -32,7 +32,7 @@
// TODO: This does not produce valid atom sytnax yet
public class BeanAtomConverter implements BeanConverter {
- private static Logger logger =
+ private static final Logger logger =
Logger.getLogger(BeanAtomConverter.class.getName());
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonLibConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonLibConverter.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonLibConverter.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanJsonLibConverter.java Mon Feb 23 17:58:08 2009
@@ -53,7 +53,7 @@
/**
* in IDE debug flag.
*/
- private boolean debugMode = false;
+ private final boolean debugMode = false;
/**
@@ -121,8 +121,7 @@
public JSONObject convertToJson(Object pojo) {
try {
- JSONObject jsonObject = JSONObject.fromObject(pojo, jsonConfig);
- return jsonObject;
+ return JSONObject.fromObject(pojo, jsonConfig);
} catch (JSONException jse) {
throw new RuntimeException(jse);
}
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXStreamConverter.java Mon Feb 23 17:58:08 2009
@@ -40,11 +40,11 @@
public class BeanXStreamConverter implements BeanConverter {
public static final String XML_DECL = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
- private static final XStreamConfiguration.ConverterSet[] MAPPER_SCOPES = new XStreamConfiguration.ConverterSet[] {
+ private static final XStreamConfiguration.ConverterSet[] MAPPER_SCOPES = {
XStreamConfiguration.ConverterSet.MAP,
XStreamConfiguration.ConverterSet.COLLECTION,
XStreamConfiguration.ConverterSet.DEFAULT };
- private static Log log = LogFactory.getLog(BeanXStreamConverter.class);
+ private static final Log log = LogFactory.getLog(BeanXStreamConverter.class);
private ReflectionProvider rp;
private HierarchicalStreamDriver driver;
protected WriterStack writerStack;
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXmlConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXmlConverter.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXmlConverter.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/BeanXmlConverter.java Mon Feb 23 17:58:08 2009
@@ -31,7 +31,7 @@
import java.util.logging.Logger;
public class BeanXmlConverter implements BeanConverter {
- private static Logger logger =
+ private static final Logger logger =
Logger.getLogger(BeanXmlConverter.class.getName());
public String getContentType() {
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/JsonObjectToMapMorpher.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/JsonObjectToMapMorpher.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/JsonObjectToMapMorpher.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/jsonlib/JsonObjectToMapMorpher.java Mon Feb 23 17:58:08 2009
@@ -47,7 +47,7 @@
}
/**
- * @param the bean to be morphed
+ * @param bean the bean to be morphed
* @return the morphed bean (a map)
*/
public Object morph(Object bean) {
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanConverter.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanConverter.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanConverter.java Mon Feb 23 17:58:08 2009
@@ -52,21 +52,23 @@
* need stricter checks, subclass JavaBeanConverter
*/
public boolean canConvert(Class type) {
- if ( type == null ) {
- return false;
- }
- if (Object.class.equals(type)) {
- return false;
- }
- if ( type.isInterface() ) {
- return true;
- }
- for (Class<?> iff : type.getInterfaces()) {
- if (iff.isAnnotationPresent(Exportablebean.class)) {
+ while (true) {
+ if (type == null) {
+ return false;
+ }
+ if (Object.class.equals(type)) {
+ return false;
+ }
+ if (type.isInterface()) {
return true;
}
+ for (Class<?> iff : type.getInterfaces()) {
+ if (iff.isAnnotationPresent(Exportablebean.class)) {
+ return true;
+ }
+ }
+ type = type.getSuperclass();
}
- return canConvert(type.getSuperclass());
}
public void marshal(final Object source,
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/MapConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/MapConverter.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/MapConverter.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/MapConverter.java Mon Feb 23 17:58:08 2009
@@ -44,7 +44,7 @@
/**
* If true will use a short form of xml serialization.
*/
- private boolean shortform = false;
+ private final boolean shortform = false;
/**
* Create a MapConverter that use use the supplied mapper.
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/FilterOperation.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/FilterOperation.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/FilterOperation.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/FilterOperation.java Mon Feb 23 17:58:08 2009
@@ -21,5 +21,5 @@
* Standard filter operations
*/
public enum FilterOperation {
- contains, equals, startsWith, present;
+ contains, equals, startsWith, present
}
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/SortOrder.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/SortOrder.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/SortOrder.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/SortOrder.java Mon Feb 23 17:58:08 2009
@@ -21,5 +21,5 @@
* Common sort order definitions
*/
public enum SortOrder {
- ascending, descending;
+ ascending, descending
}
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/TestModel.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/TestModel.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/TestModel.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/model/TestModel.java Mon Feb 23 17:58:08 2009
@@ -172,6 +172,6 @@
public enum Gender {
male,
- female;
+ female
}
}
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/JsonSerializerTest.java Mon Feb 23 17:58:08 2009
@@ -67,7 +67,7 @@
@Test
public void serializeArray() throws Exception {
- String[] array = new String[] {"foo", null, "bar", "baz"};
+ String[] array = {"foo", null, "bar", "baz"};
assertJsonEquals("['foo','bar','baz']", JsonSerializer.serialize(array));
}
@@ -239,7 +239,7 @@
public static Map<String, Object> perfComparison100Arrays() {
Map<String, Object> data = Maps.newHashMap();
- String[] array = new String[] {
+ String[] array = {
"one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten"
};
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/crypto/CryptoTest.java Mon Feb 23 17:58:08 2009
@@ -47,7 +47,7 @@
public void testHmacSha1() throws Exception {
String key = "abcd1234";
String val = "your mother is a hedgehog";
- byte[] expected = new byte[] {
+ byte[] expected = {
-21, 2, 47, -101, 9, -40, 18, 43, 76, 117,
-51, 115, -122, -91, 39, 26, -18, 122, 30, 90,
};
@@ -59,7 +59,7 @@
public void testHmacSha1Verify() throws Exception {
String key = "abcd1234";
String val = "your mother is a hedgehog";
- byte[] expected = new byte[] {
+ byte[] expected = {
-21, 2, 47, -101, 9, -40, 18, 43, 76, 117,
-51, 115, -122, -91, 39, 26, -18, 122, 30, 90,
};
@@ -71,7 +71,7 @@
public void testHmacSha1VerifyTampered() throws Exception {
String key = "abcd1234";
String val = "your mother is a hedgehog";
- byte[] expected = new byte[] {
+ byte[] expected = {
-21, 2, 47, -101, 9, -40, 18, 43, 76, 117,
-51, 115, -122, -91, 39, 0, -18, 122, 30, 90,
};
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/testing/FakeHttpServletRequest.java Mon Feb 23 17:58:08 2009
@@ -397,7 +397,7 @@
// API promises null return if no cookies
return null;
}
- return cookies.values().toArray(new Cookie[0]);
+ return cookies.values().toArray(new Cookie[cookies.size()]);
}
public long getDateHeader(String name) {
@@ -465,22 +465,22 @@
if (queryString == null && !parameters.isEmpty()) {
boolean hasPrevious = false;
StringBuilder queryString = new StringBuilder();
- for (String key : parameters.keySet()) {
+ for (Map.Entry<String, String[]> stringEntry : parameters.entrySet()) {
// We're not interested in blank keys
- if (key == null || key.equals("") || postParameters.contains(key)) {
+ if (stringEntry.getKey() == null || stringEntry.getKey().equals("") || postParameters.contains(stringEntry.getKey())) {
continue;
}
if (hasPrevious) {
queryString.append('&');
}
- String[] values = parameters.get(key);
+ String[] values = stringEntry.getValue();
// Append the parameters to the query string
if (values.length == 0) {
- queryString.append(URLEncoder.encode(key, "UTF-8"));
+ queryString.append(URLEncoder.encode(stringEntry.getKey(), "UTF-8"));
} else {
for (int i = 0; i < values.length; i++) {
- queryString.append(URLEncoder.encode(key, "UTF-8")).append('=').append(
+ queryString.append(URLEncoder.encode(stringEntry.getKey(), "UTF-8")).append('=').append(
URLEncoder.encode(values[i], "UTF-8"));
if (i < values.length - 1) {
queryString.append('&');
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/CharsetUtilTest.java Mon Feb 23 17:58:08 2009
@@ -53,7 +53,7 @@
}
- private static final byte[] LATIN1_UTF8_DATA = new byte[] {
+ private static final byte[] LATIN1_UTF8_DATA = {
'G', 'a', 'm', 'e', 's', ',', ' ', 'H', 'Q', ',', ' ', 'M', 'a', 'n', 'g', (byte)0xC3,
(byte) 0xA1, ',', ' ', 'A', 'n', 'i', 'm', 'e', ' ', 'e', ' ', 't', 'u', 'd', 'o', ' ',
'q', 'u', 'e', ' ', 'u', 'm', ' ', 'b', 'o', 'm', ' ', 'n', 'e', 'r', 'd', ' ', 'a', 'm', 'a'
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/DateUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/DateUtilTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/DateUtilTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/DateUtilTest.java Mon Feb 23 17:58:08 2009
@@ -28,14 +28,14 @@
public class DateUtilTest {
- String[] text = new String[] {
+ String[] text = {
"Tue, 27 May 2008 05:12:50 GMT",
"Wed, 28 May 2008 04:40:48 GMT",
"Mon, 30 Jun 3090 03:29:55 GMT",
"Fri, 06 Jun 1670 01:57:27 GMT",
};
- Date[] timeStamps = new Date[] {
+ Date[] timeStamps = {
new Date(1211865170000L),
new Date(1211949648000L),
new Date(35359385395000L),
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FutureUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FutureUtilTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FutureUtilTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/FutureUtilTest.java Mon Feb 23 17:58:08 2009
@@ -33,7 +33,7 @@
String firstWord = "hello";
public void testGetFirstOfMany() throws Exception {
- List<String> words = Lists.newArrayList(new String[]{firstWord, "goodbye", "blah"});
+ List<String> words = Lists.newArrayList(firstWord, "goodbye", "blah");
Future<RestfulCollection<String>> collection = ImmediateFuture.newInstance(
new RestfulCollection<String>(words));
@@ -42,7 +42,7 @@
}
public void testGetFirstOfSingle() throws Exception {
- List<String> words = Lists.newArrayList(new String[]{firstWord});
+ List<String> words = Lists.newArrayList(firstWord);
Future<RestfulCollection<String>> collection = ImmediateFuture.newInstance(
new RestfulCollection<String>(words));
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/config/JsonContainerConfigTest.java Mon Feb 23 17:58:08 2009
@@ -52,7 +52,7 @@
private static final String CONTAINER_B = "container-b";
private static final String ARRAY_NAME = "array value";
- private static final String[] ARRAY_VALUE = new String[]{"Hello", "World"};
+ private static final String[] ARRAY_VALUE = {"Hello", "World"};
private static final String ARRAY_ALT_VALUE = "Not an array";
private File createContainer(JSONObject json) throws Exception {
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DefaultHandlerRegistryTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DefaultHandlerRegistryTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DefaultHandlerRegistryTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DefaultHandlerRegistryTest.java Mon Feb 23 17:58:08 2009
@@ -86,7 +86,7 @@
future.get();
fail("Expect exception for missing method");
} catch (ExecutionException t) {
- assertEquals(t.getCause().getClass(), ProtocolException.class);
+ assertSame(t.getCause().getClass(), ProtocolException.class);
Assert.assertEquals(((ProtocolException) t.getCause()).getError(), ResponseError.NOT_IMPLEMENTED);
} catch (Throwable t) {
fail("Unexpected exception " + t.toString());
@@ -100,7 +100,7 @@
future.get();
fail("Expect exception for missing method");
} catch (ExecutionException t) {
- assertEquals(t.getCause().getClass(), ProtocolException.class);
+ assertSame(t.getCause().getClass(), ProtocolException.class);
Assert.assertEquals(((ProtocolException) t.getCause()).getError(), ResponseError.NOT_IMPLEMENTED);
} catch (Throwable t) {
fail("Unexpected exception " + t.toString());
@@ -151,7 +151,7 @@
future.get();
fail("Service method did not produce NullPointerException from Future");
} catch (ExecutionException ee) {
- assertEquals(ee.getCause().getClass(), NullPointerException.class);
+ assertSame(ee.getCause().getClass(), NullPointerException.class);
}
}
@@ -164,7 +164,7 @@
future.get();
fail("Service method did not produce ExecutionException from Future");
} catch (ExecutionException ee) {
- assertEquals(ee.getCause().getClass(), ProtocolException.class);
+ assertSame(ee.getCause().getClass(), ProtocolException.class);
}
}
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/ApiValidator.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/ApiValidator.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/ApiValidator.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/conversion/jsonlib/ApiValidator.java Mon Feb 23 17:58:08 2009
@@ -287,7 +287,7 @@
log.debug(id + '.' + oid);
Object o = scriptableObject.get(String.valueOf(oid), scriptableObject);
if (o instanceof ScriptableObject) {
- listScriptable(id + '.' + String.valueOf(oid), (ScriptableObject) o);
+ listScriptable(id + '.' + oid, (ScriptableObject) o);
}
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultUrlGenerator.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultUrlGenerator.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultUrlGenerator.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/DefaultUrlGenerator.java Mon Feb 23 17:58:08 2009
@@ -113,11 +113,7 @@
String url = context.getUrl().toString();
View view = gadget.getCurrentView();
View.ContentType type;
- if (view == null) {
- type = View.ContentType.HTML;
- } else {
- type = view.getType();
- }
+ type = (view == null) ? View.ContentType.HTML : view.getType();
UriBuilder uri;
switch (type) {
@@ -127,11 +123,7 @@
case HTML:
default:
Uri iframeBaseUri = iframeBaseUris.get(context.getContainer());
- if (iframeBaseUri != null) {
- uri = new UriBuilder(iframeBaseUri);
- } else {
- uri = new UriBuilder();
- }
+ uri = iframeBaseUri != null ? new UriBuilder(iframeBaseUri) : new UriBuilder();
String host = lockedDomainService.getLockedDomainForGadget(spec, context.getContainer());
if (host != null) {
uri.setAuthority(host);
@@ -163,7 +155,7 @@
uri.addQueryParameter("up_" + pref.getName(), value);
}
// add url last to work around browser bugs
- if(!type.equals(View.ContentType.URL)) {
+ if(type != View.ContentType.URL) {
uri.addQueryParameter("url", url);
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/FeedProcessor.java Mon Feb 23 17:58:08 2009
@@ -82,7 +82,7 @@
entry.put("Title", e.getTitle());
entry.put("Link", e.getLink());
if (getSummaries) {
- if (e.getContents() != null && e.getContents().size() > 0) {
+ if (e.getContents() != null && !e.getContents().isEmpty()) {
entry.put("Summary",
((SyndContent)e.getContents().get(0)).getValue());
} else {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java Mon Feb 23 17:58:08 2009
@@ -81,7 +81,7 @@
* @return Whether or not to bypass caching behavior for the current request.
*/
public boolean getIgnoreCache() {
- return delegate == null ? false : delegate.getIgnoreCache();
+ return delegate != null && delegate.getIgnoreCache();
}
/**
@@ -109,7 +109,7 @@
* @return Whether or not to show debug output.
*/
public boolean getDebug() {
- return delegate == null ? false : delegate.getDebug();
+ return delegate != null && delegate.getDebug();
}
/**
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeatureRegistry.java Mon Feb 23 17:58:08 2009
@@ -148,11 +148,7 @@
lock();
Set<String> neededSet;
- if (needed.isEmpty()) {
- neededSet = core.keySet();
- } else {
- neededSet = ImmutableSet.copyOf(needed);
- }
+ neededSet = needed.isEmpty() ? core.keySet() : ImmutableSet.copyOf(needed);
// We use the cache only for situations where all needed are available.
// if any are missing, the result won't be cached.
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java Mon Feb 23 17:58:08 2009
@@ -234,7 +234,7 @@
try {
return ResourceLoader.getContent(name);
} catch (IOException e) {
- logger.warning("Could not find resource: " + name);
+ logger.warning("Could not find resource: " + name + '-' + e.getMessage());
return null;
}
}
@@ -251,7 +251,7 @@
}
if (rhs instanceof JsLibrary) {
JsLibrary lib = (JsLibrary)rhs;
- return content.equals(lib.content) && type.equals(lib.type);
+ return content.equals(lib.content) && type == lib.type;
}
return false;
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/AbstractHttpCache.java Mon Feb 23 17:58:08 2009
@@ -123,7 +123,7 @@
public String createKey(HttpRequest request) {
if ((request.getAuthType() != AuthType.NONE) &&
(request.getSecurityToken() == null)) {
- throw new IllegalArgumentException("Cannot sign request without security token: [" + request + "]");
+ throw new IllegalArgumentException("Cannot sign request without security token: [" + request + ']');
}
String uri = request.getUri().toString();
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java Mon Feb 23 17:58:08 2009
@@ -455,7 +455,7 @@
HttpRequest req = (HttpRequest)obj;
return method.equals(req.method) &&
uri.equals(req.uri) &&
- authType.equals(req.authType) &&
+ authType == req.authType &&
Arrays.equals(postBody, req.postBody) &&
headers.equals(req.headers);
// TODO: Verify that other fields aren't meaningful. Especially important to check for
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreConsumerIndex.java Mon Feb 23 17:58:08 2009
@@ -47,7 +47,7 @@
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) return true;
if (obj == null) return false;
if (getClass() != obj.getClass()) return false;
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthResponseParams.java Mon Feb 23 17:58:08 2009
@@ -270,7 +270,7 @@
* exception. This makes sure that any exception thrown is also exposed to the calling gadget
* in a useful way.
*/
- public class OAuthRequestException extends Exception {
+ public static class OAuthRequestException extends Exception {
private OAuthRequestException(String message) {
super(message);
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderService.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderService.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloaderService.java Mon Feb 23 17:58:08 2009
@@ -48,7 +48,7 @@
public Collection<PreloadedData> preload(GadgetContext context, GadgetSpec gadget, PreloadPhase phase) {
if (preloaders.isEmpty()) {
- return ImmutableList.<PreloadedData>of();
+ return ImmutableList.of();
}
List<Callable<PreloadedData>> tasks = Lists.newArrayList();
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloads.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloads.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloads.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/ConcurrentPreloads.java Mon Feb 23 17:58:08 2009
@@ -82,7 +82,7 @@
}
/** PreloadData implementation that reports failure */
- private class FailedPreload implements PreloadedData {
+ private static class FailedPreload implements PreloadedData {
private final Throwable t;
public FailedPreload(Throwable t) {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/PipelinedDataPreloader.java Mon Feb 23 17:58:08 2009
@@ -206,7 +206,7 @@
} else {
UriBuilder uriBuilder = new UriBuilder(request.getUri());
String query = uriBuilder.getQuery();
- query = query == null ? params : query + "&" + params;
+ query = query == null ? params : query + '&' + params;
uriBuilder.setQuery(query);
request.setUri(uriBuilder.toUri());
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/Preloader.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/Preloader.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/Preloader.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/Preloader.java Mon Feb 23 17:58:08 2009
@@ -37,7 +37,7 @@
* @param gadget The gadget that the operations will be performed for.
* @param phase The preload phase being executed.
* @return Preloading tasks that will be executed by
- * {@link PreloaderService#preload(GadgetContext, GadgetSpec)}.
+ * {@link PreloaderService#}.
*/
Collection<Callable<PreloadedData>> createPreloadTasks(GadgetContext context,
GadgetSpec gadget, PreloaderService.PreloadPhase phase);
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java Mon Feb 23 17:58:08 2009
@@ -120,7 +120,7 @@
}
List<Object> parents = containerConfig.getList(container, "gadgets.parent");
- if (parents.size() == 0) {
+ if (parents.isEmpty()) {
// Allow all.
return true;
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizedRenderingContentRewriter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizedRenderingContentRewriter.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizedRenderingContentRewriter.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/SanitizedRenderingContentRewriter.java Mon Feb 23 17:58:08 2009
@@ -330,8 +330,8 @@
return "about:blank";
}
String rewritten = super.rewrite(link, context);
- rewritten += "&" + ProxyBase.SANITIZE_CONTENT_PARAM + "=1";
- rewritten += "&" + ProxyBase.REWRITE_MIME_TYPE_PARAM + "=" + expectedMime;
+ rewritten += '&' + ProxyBase.SANITIZE_CONTENT_PARAM + "=1";
+ rewritten += '&' + ProxyBase.REWRITE_MIME_TYPE_PARAM + '=' + expectedMime;
return rewritten;
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BaseOptimizer.java Mon Feb 23 17:58:08 2009
@@ -25,6 +25,7 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
+import com.google.common.base.Objects;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
@@ -154,11 +155,7 @@
ImageWriteParam writeParam;
public ImageIOOutputter(ImageWriter writer, ImageWriteParam writeParam) {
this.writer = writer;
- if (writeParam == null) {
- this.writeParam = writer.getDefaultWriteParam();
- } else {
- this.writeParam = writeParam;
- }
+ this.writeParam = Objects.firstNonNull(writeParam, writer.getDefaultWriteParam());
}
public byte[] toBytes(BufferedImage image) throws IOException {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java Mon Feb 23 17:58:08 2009
@@ -98,7 +98,7 @@
response.setStatus(200);
}
- private String formatHttpError(int status, String errorMessage) {
+ private static String formatHttpError(int status, String errorMessage) {
StringBuilder err = new StringBuilder();
err.append("/* ---- Error ");
err.append(status);
@@ -111,7 +111,7 @@
return err.toString();
}
- private void outputError(GadgetException excep, String url, HttpServletResponse resp)
+ private static void outputError(GadgetException excep, String url, HttpServletResponse resp)
throws IOException {
StringBuilder err = new StringBuilder();
err.append(excep.getCode().toString());
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java Mon Feb 23 17:58:08 2009
@@ -87,7 +87,7 @@
StringBuilder jsData = new StringBuilder();
for (GadgetFeature feature : features) {
for (JsLibrary lib : feature.getJsLibraries(context, container)) {
- if (!lib.getType().equals(JsLibrary.Type.URL)) {
+ if (lib.getType() != JsLibrary.Type.URL) {
if (debug) {
jsData.append(lib.getDebugContent());
} else {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/OAuthSpec.java Mon Feb 23 17:58:08 2009
@@ -62,11 +62,11 @@
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("<OAuth>");
- for (String name : serviceMap.keySet()) {
+ for (Map.Entry<String, OAuthService> entry : serviceMap.entrySet()) {
sb.append("<Service name='");
- sb.append(name);
+ sb.append(entry.getKey());
sb.append("'>");
- OAuthService service = serviceMap.get(name);
+ OAuthService service = entry.getValue();
sb.append(service.getRequestUrl().toString("Request"));
sb.append(service.getAccessUrl().toString("Access"));
sb.append("<Authorization url='").append(service.getAuthorizationUrl().toString()).append("'/>");
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/spec/Preload.java Mon Feb 23 17:58:08 2009
@@ -158,8 +158,8 @@
buf.append("<Preload href='").append(href).append('\'')
.append(" authz='").append(auth.toString().toLowerCase()).append('\'')
.append(" views='").append(StringUtils.join(views, ',')).append('\'');
- for (String attr : attributes.keySet()) {
- buf.append(' ').append(attr).append("='").append(attributes.get(attr))
+ for (Map.Entry<String, String> entry : attributes.entrySet()) {
+ buf.append(' ').append(entry.getKey()).append("='").append(entry.getValue())
.append('\'');
}
buf.append("/>");
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetFeatureRegistryTest.java Mon Feb 23 17:58:08 2009
@@ -46,7 +46,7 @@
private static final String CONTENT = "var foo = 'bar'";
private static final String CORE_CONTENT = "var core = 'dependency'";
private static final String DEP_CONTENT = "var bar ='foo'";
- private static final String[] FEATURE_LIST = new String[] {
+ private static final String[] FEATURE_LIST = {
"feature0", "feature1", "feature2", "feature3"
};
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java Mon Feb 23 17:58:08 2009
@@ -176,7 +176,7 @@
JsFeatureLoader.FILE_SEPARATOR +
file2.getAbsolutePath(), registry);
} catch (GadgetException e ) {
- if (!e.getCode().equals(GadgetException.Code.INVALID_PATH)) {
+ if (e.getCode() != GadgetException.Code.INVALID_PATH) {
throw e;
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/encoding/EncodingDetectorTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/encoding/EncodingDetectorTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/encoding/EncodingDetectorTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/encoding/EncodingDetectorTest.java Mon Feb 23 17:58:08 2009
@@ -32,7 +32,7 @@
@Test
public void detectedUtf8WithByteOrderMark() {
- byte[] data = new byte[] {
+ byte[] data = {
(byte)0xEF, (byte)0xBB, (byte)0xBF, 'h', 'e', 'l', 'l', 'o'
};
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java Mon Feb 23 17:58:08 2009
@@ -30,13 +30,13 @@
import java.util.Arrays;
public class HttpResponseTest extends TestCase {
- private static final byte[] UTF8_DATA = new byte[] {
+ private static final byte[] UTF8_DATA = {
(byte)0xEF, (byte)0xBB, (byte)0xBF, 'h', 'e', 'l', 'l', 'o'
};
private static final String UTF8_STRING = "hello";
// A large string is needed for accurate charset detection.
- private static final byte[] LATIN1_DATA = new byte[] {
+ private static final byte[] LATIN1_DATA = {
'G', 'a', 'm', 'e', 's', ',', ' ', 'H', 'Q', ',', ' ', 'M', 'a', 'n', 'g', (byte)0xE1, ',', ' ',
'A', 'n', 'i', 'm', 'e', ' ', 'e', ' ', 't', 'u', 'd', 'o', ' ', 'q', 'u', 'e', ' ', 'u', 'm',
' ', 'b', 'o', 'm', ' ', 'n', 'e', 'r', 'd', ' ', 'a', 'm', 'a'
@@ -44,7 +44,7 @@
private static final String LATIN1_STRING
= "Games, HQ, Mang\u00E1, Anime e tudo que um bom nerd ama";
- private static final byte[] BIG5_DATA = new byte[] {
+ private static final byte[] BIG5_DATA = {
(byte)0xa7, (byte)0x41, (byte)0xa6, (byte)0x6e
};
@@ -146,7 +146,7 @@
}
public void testPreserveBinaryData() throws Exception {
- byte[] data = new byte[] {
+ byte[] data = {
(byte)0x00, (byte)0xDE, (byte)0xEA, (byte)0xDB, (byte)0xEE, (byte)0xF0
};
HttpResponse response = new HttpResponseBuilder()
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndexTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndexTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndexTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/BasicOAuthStoreTokenIndexTest.java Mon Feb 23 17:58:08 2009
@@ -38,7 +38,6 @@
}
- @Test
public void testHashCode() {
BasicOAuthStoreTokenIndex eq1 = new BasicOAuthStoreTokenIndex();
BasicOAuthStoreTokenIndex eq2 = new BasicOAuthStoreTokenIndex();
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java Mon Feb 23 17:58:08 2009
@@ -773,7 +773,7 @@
@Test
public void testPostBinaryData() throws Exception {
- byte[] raw = new byte[] { 0, 1, 2, 3, 4, 5 };
+ byte[] raw = { 0, 1, 2, 3, 4, 5 };
MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
HttpResponse resp = client.sendRawPost(FakeOAuthServiceProvider.RESOURCE_URL, null, raw);
List<Parameter> queryParams = OAuth.decodeForm(resp.getResponseAsString());
@@ -786,7 +786,7 @@
@Test
public void testPostWeirdContentType() throws Exception {
- byte[] raw = new byte[] { 0, 1, 2, 3, 4, 5 };
+ byte[] raw = { 0, 1, 2, 3, 4, 5 };
MakeRequestClient client = makeSignedFetchClient("o", "v", "http://www.example.com/app");
HttpResponse resp = client.sendRawPost(FakeOAuthServiceProvider.RESOURCE_URL,
"funky-content", raw);
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssParserTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssParserTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssParserTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/caja/CajaCssParserTest.java Mon Feb 23 17:58:08 2009
@@ -42,6 +42,6 @@
List<CssTree.SimpleSelector> selectorList = CajaCssUtils.descendants(styleSheet,
CssTree.SimpleSelector.class);
assertEquals(2, selectorList.size());
- assertEquals(CssTree.SimpleSelector.class, selectorList.get(0).getClass());
+ assertSame(CssTree.SimpleSelector.class, selectorList.get(0).getClass());
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/SocialMarkupHtmlParserTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/SocialMarkupHtmlParserTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/SocialMarkupHtmlParserTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/nekohtml/SocialMarkupHtmlParserTest.java Mon Feb 23 17:58:08 2009
@@ -85,7 +85,7 @@
public void testSocialTemplateSerialization() {
String content = NekoSerializer.serialize(document);
assertTrue("Empty elements not preserved as XML inside template",
- content.indexOf("<img/>") >= 0);
+ content.contains("<img/>"));
}
@Test
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java Mon Feb 23 17:58:08 2009
@@ -117,7 +117,7 @@
checkRequest(request);
assertTrue(request.getOAuthArguments().getSignOwner());
assertFalse(request.getOAuthArguments().getSignViewer());
- checkResults((JSONObject) data.toJson().iterator().next());;
+ checkResults((JSONObject) data.toJson().iterator().next());
}
@Test
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataContentRewriterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataContentRewriterTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataContentRewriterTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/PipelineDataContentRewriterTest.java Mon Feb 23 17:58:08 2009
@@ -137,10 +137,9 @@
rewriter.rewrite(gadget, content);
// Verify the data set is injected, and the os-data was deleted
- assertTrue("Script not inserted", content.getContent().indexOf(
- "DataContext.putDataSet(\"key\",{\"foo\":\"bar\"})") >= 0);
+ assertTrue("Script not inserted", content.getContent().contains("DataContext.putDataSet(\"key\",{\"foo\":\"bar\"})"));
assertFalse("os-data wasn't deleted",
- content.getContent().indexOf("type=\"text/os-data\"") >= 0);
+ content.getContent().contains("type=\"text/os-data\""));
assertTrue(batchCapture.getValue().getSocialPreloads().containsKey("me"));
assertTrue(batchCapture.getValue().getHttpPreloads().containsKey("json"));
@@ -193,12 +192,10 @@
control.verify();
// Verify the data set is injected, and the os-data was deleted
- assertTrue("First batch not inserted", content.getContent().indexOf(
- "DataContext.putDataSet(\"json\",{\"user\":\"canonical\"})") >= 0);
- assertTrue("Second batch not inserted", content.getContent().indexOf(
- "DataContext.putDataSet(\"me\",{\"id\":\"canonical\"})") >= 0);
+ assertTrue("First batch not inserted", content.getContent().contains("DataContext.putDataSet(\"json\",{\"user\":\"canonical\"})"));
+ assertTrue("Second batch not inserted", content.getContent().contains("DataContext.putDataSet(\"me\",{\"id\":\"canonical\"})"));
assertFalse("os-data wasn't deleted",
- content.getContent().indexOf("type=\"text/os-data\"") >= 0);
+ content.getContent().contains("type=\"text/os-data\""));
// Check the evaluated HTTP request
RequestAuthenticationInfo request = firstBatch.getValue().getHttpPreloads().get("json");
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/TemplateRewriterTest.java Mon Feb 23 17:58:08 2009
@@ -115,8 +115,8 @@
rewriter.rewrite(gadget, content);
assertTrue("Template wasn't transformed (" + condition + ")",
content.getContent().indexOf("Hello, John") > 0);
- assertTrue("Template tag wasn't removed (" + condition + ")",
- content.getContent().indexOf("text/os-template") < 0);
+ assertTrue("Template tag wasn't removed (" + condition + ")",
+ !content.getContent().contains("text/os-template"));
}
private void testExpectingNoTransform(String code, String condition) throws Exception {
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcGadgetContextTest.java Mon Feb 23 17:58:08 2009
@@ -32,8 +32,8 @@
public class JsonRpcGadgetContextTest extends TestCase {
final static String SPEC_URL = "http://example.org/gadget.xml";
final static int SPEC_ID = 1234;
- final static String[] PREF_KEYS = new String[] {"hello", "foo"};
- final static String[] PREF_VALUES = new String[] {"world", "bar"};
+ final static String[] PREF_KEYS = {"hello", "foo"};
+ final static String[] PREF_VALUES = {"world", "bar"};
final static Map<String, String> prefs = Maps.newHashMap();
static {
for (int i = 0, j = PREF_KEYS.length; i < j; ++i) {
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java Mon Feb 23 17:58:08 2009
@@ -312,7 +312,7 @@
expect(request.getParameter(MakeRequestHandler.AUTHZ_PARAM))
.andReturn(AuthType.OAUTH.toString()).atLeastOnce();
// This isn't terribly accurate, but is close enough for this test.
- expect(request.getParameterMap()).andStubReturn(Collections.EMPTY_MAP);
+ expect(request.getParameterMap()).andStubReturn(Collections.emptyMap());
expectParameters(request);
replay();
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/OAuthCallbackServletTest.java Mon Feb 23 17:58:08 2009
@@ -20,6 +20,7 @@
import org.junit.Test;
import org.junit.Assert;
+import static junit.framework.Assert.assertEquals;
/**
* Tests for OAuth callback servlet.
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ServletTestFixture.java Mon Feb 23 17:58:08 2009
@@ -39,6 +39,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertTrue;
+
/**
* Contains everything needed for making servlet requests, plus a bunch of stuff that shouldn't be
* here.
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXStreamAtomConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXStreamAtomConverter.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXStreamAtomConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanXStreamAtomConverter.java Mon Feb 23 17:58:08 2009
@@ -31,7 +31,7 @@
*/
public class BeanXStreamAtomConverter extends BeanXStreamConverter {
- private static Log log = LogFactory.getLog(BeanXStreamAtomConverter.class);
+ private static final Log log = LogFactory.getLog(BeanXStreamAtomConverter.class);
/**
* @param configuration
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomFeed.java Mon Feb 23 17:58:08 2009
@@ -35,8 +35,7 @@
*/
public class AtomFeed {
- @SuppressWarnings("unchecked")
- private Collection entry;
+ private Collection<AtomEntry> entry;
@SuppressWarnings("unused")
private int startIndex;
@SuppressWarnings("unused")
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLink.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLink.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLink.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLink.java Mon Feb 23 17:58:08 2009
@@ -30,8 +30,9 @@
private String title;
/**
- * @param string
- * @param string2
+ * Construct a new AtomLink
+ * @param rel a value for the rel attribute
+ * @param href a value for the href attribute
*/
public AtomLink(String rel, String href) {
this.rel = rel;
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/Address.java Mon Feb 23 17:58:08 2009
@@ -227,7 +227,7 @@
Boolean getPrimary();
/**
- * @see Address.getPrimary()
+ * @see org.apache.shindig.social.opensocial.model.Address#getPrimary()
* @param primary set the Primary status of this Address.
*/
void setPrimary(Boolean primary);
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ListField.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ListField.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ListField.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/ListField.java Mon Feb 23 17:58:08 2009
@@ -96,7 +96,7 @@
String getValue();
/**
- * @see ListField.getValue()
+ * @see ListField#getValue()
* @param value the value of the field
*/
void setValue(String value);
@@ -114,7 +114,7 @@
Boolean getPrimary();
/**
- * @see ListField.getPrimary()
+ * @see ListField#getPrimary()
* @param primary set to true if a primary or preferred value
*/
void setPrimary(Boolean primary);
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/AppDataHandler.java Mon Feb 23 17:58:08 2009
@@ -93,7 +93,7 @@
HandlerPreconditions.requireNotEmpty(userIds, "No userId specified");
HandlerPreconditions.requireSingular(userIds, "Multiple userIds not supported");
- Map<String, String> values = request.getTypedParameter("data", HashMap.class);
+ Map<String, String> values = (Map<String,String>) request.getTypedParameter("data", HashMap.class);
for (String key : values.keySet()) {
if (!isValidKey(key)) {
throw new SocialSpiException(ResponseError.BAD_REQUEST,
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java?rev=747092&r1=747091&r2=747092&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/CollectionOptions.java Mon Feb 23 17:58:08 2009
@@ -158,7 +158,7 @@
// These are overriden so that EasyMock doesn't throw a fit
@Override
- public boolean equals(Object o) {
+ public boolean equals(final Object o) {
if (!(o instanceof CollectionOptions)) {
return false;
}