Author: jasvir Date: Wed Jan 6 07:47:11 2010 New Revision: 896342 URL: http://svn.apache.org/viewvc?rev=896342&view=rev Log: * Fixed bug where & operator used instead of && * added missing hashCode function * closed unclosed i/o streams * removed dead code * removed unnecessary imports
http://codereview.appspot.com/183110 Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.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/expressions/ShindigTypeConverter.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/BeanXStreamConverter.java incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.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/protocol/DataServiceServletTest.java incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpRequest.java incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandler.java incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpRequestHandlerTest.java incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/FakeTemplateProcessor.java incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.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/EnumUtil.java incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MessageService.java incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java (original) +++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/JsonUtil.java Wed Jan 6 07:47:11 2010 @@ -49,7 +49,7 @@ if (value instanceof JSONObject) { return ((JSONObject) value).opt(propertyName); - } else if (value instanceof Map) { + } else if (value instanceof Map<?, ?>) { return ((Map<?, ?>) value).get(propertyName); } else { // Try getter conversion Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java (original) +++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/crypto/BasicBlobCrypter.java Wed Jan 6 07:47:11 2010 @@ -81,6 +81,9 @@ BufferedReader reader = new BufferedReader( new InputStreamReader(openFile, CharsetUtil.UTF8)); String line = reader.readLine(); + if (line == null) { + throw new IOException("Unexpectedly empty keyfile:" + keyfile); + } line = line.trim(); byte[] keyBytes = CharsetUtil.getUtf8Bytes(line); init(keyBytes); 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=896342&r1=896341&r2=896342&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 Wed Jan 6 07:47:11 2010 @@ -44,7 +44,6 @@ return 0; } - @SuppressWarnings("unchecked") public boolean getBool(String container, String property) { Object value = getProperty(container, property); if (value instanceof Boolean) { 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=896342&r1=896341&r2=896342&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 Wed Jan 6 07:47:11 2010 @@ -378,14 +378,15 @@ private Object evaluateAll(Object value) { if (value instanceof CharSequence) { return value.toString(); - } else if (value instanceof Map) { + } else if (value instanceof Map<?, ?>) { + Map<?, ?> mapValue = (Map<?, ?>) value; ImmutableMap.Builder<Object, Object> newMap = ImmutableMap.builder(); - for (Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet()) { + for (Map.Entry<?, ?> entry : mapValue.entrySet()) { newMap.put(entry.getKey(), evaluateAll(entry.getValue())); } return newMap.build(); - } else if (value instanceof List) { + } else if (value instanceof List<?>) { ImmutableList.Builder<Object> newList = ImmutableList.builder(); for (Object entry : (List<?>) value) { newList.add(evaluateAll(entry)); Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java (original) +++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/ShindigTypeConverter.java Wed Jan 6 07:47:11 2010 @@ -72,7 +72,7 @@ return ImmutableList.of(); } - if (obj instanceof Iterable) { + if (obj instanceof Iterable<?>) { return ((Iterable<?>) obj); } 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=896342&r1=896341&r2=896342&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 Wed Jan 6 07:47:11 2010 @@ -217,7 +217,7 @@ public String getParameter(String paramName) { Object param = this.parameters.get(paramName); - if (param instanceof List) { + if (param instanceof List<?>) { if (((List<?>)param).isEmpty()) { return null; } else { @@ -248,7 +248,7 @@ this.parameters.put(paramName, listParam); return listParam; } - else if (param instanceof List) { + else if (param instanceof List<?>) { // Assume it's a list of strings. This is not type-safe. @SuppressWarnings("unchecked") List<String> listParam = (List<String>) 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=896342&r1=896341&r2=896342&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 Wed Jan 6 07:47:11 2010 @@ -90,7 +90,7 @@ for (final Object handler : handlers) { Class<?> handlerType; Provider<?> handlerProvider; - if (handler instanceof Class) { + if (handler instanceof Class<?>) { handlerType = (Class<?>) handler; handlerProvider = injector.getProvider(handlerType); } else { @@ -476,7 +476,7 @@ result = method.invoke(handler, item.getTypedRequest(inputClass)); } - if (result instanceof Future) { + if (result instanceof Future<?>) { return (Future<?>) result; } return ImmediateFuture.newInstance(result); 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=896342&r1=896341&r2=896342&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 Wed Jan 6 07:47:11 2010 @@ -98,7 +98,7 @@ private String convertToXml(Object obj) { writerStack.reset(); - if (obj instanceof Map) { + if (obj instanceof Map<?, ?>) { Map<?, ?> m = (Map<?, ?>) obj; XStreamConfiguration.ConverterConfig cc = converterMap .get(XStreamConfiguration.ConverterSet.MAP); Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.java (original) +++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/GuiceBeanProvider.java Wed Jan 6 07:47:11 2010 @@ -17,13 +17,6 @@ */ package org.apache.shindig.protocol.conversion.xstream; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSortedSet; -import com.google.common.collect.Lists; -import com.google.common.collect.MapMaker; -import com.google.inject.Injector; -import com.thoughtworks.xstream.converters.reflection.ObjectAccessException; - import java.beans.BeanInfo; import java.beans.IntrospectionException; import java.beans.Introspector; @@ -34,7 +27,13 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.WeakHashMap; + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSortedSet; +import com.google.common.collect.Lists; +import com.google.common.collect.MapMaker; +import com.google.inject.Injector; +import com.thoughtworks.xstream.converters.reflection.ObjectAccessException; /** * 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=896342&r1=896341&r2=896342&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 Wed Jan 6 07:47:11 2010 @@ -22,15 +22,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.apache.shindig.common.util.FakeTimeSource; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - import java.security.GeneralSecurityException; import java.util.regex.Pattern; +import org.apache.shindig.common.util.FakeTimeSource; +import org.junit.Test; + public class CryptoTest { private BasicBlobCrypter crypter; Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java (original) +++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.java Wed Jan 6 07:47:11 2010 @@ -17,6 +17,12 @@ */ package org.apache.shindig.protocol; +import java.io.IOException; +import java.io.PrintWriter; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.commons.lang.StringUtils; import org.apache.shindig.auth.AuthInfo; import org.apache.shindig.common.testing.FakeGadgetToken; @@ -25,22 +31,13 @@ import org.apache.shindig.protocol.conversion.BeanJsonConverter; import org.easymock.IMocksControl; import org.easymock.classextension.EasyMock; - -import java.io.IOException; -import java.io.PrintWriter; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import junit.framework.TestCase; - -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Sets; - import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Sets; + public class DataServiceServletTest extends Assert { private static final FakeGadgetToken FAKE_GADGET_TOKEN = new FakeGadgetToken() Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java (original) +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BasicGadgetBlacklist.java Wed Jan 6 07:47:11 2010 @@ -90,22 +90,27 @@ } private void parseBlacklist(File blacklistFile) throws IOException { - BufferedReader in = new BufferedReader(new FileReader(blacklistFile)); - String line; - while ((line = in.readLine()) != null) { - line = line.trim(); - if (line.length() == 0 || line.charAt(0) == COMMENT_MARKER) { - continue; - } - // replaces regex \\s+ - String[] parts = StringUtils.split(line); - if (parts.length == 1) { - exactMatches.add(line.toLowerCase()); - } else if (parts.length == 2 - && parts[0].toUpperCase().equals(REGEXP_PREFIX)) { - // compile will throw PatternSyntaxException on invalid patterns. - regexpMatches.add(Pattern.compile(parts[1], Pattern.CASE_INSENSITIVE)); + BufferedReader in = null; + try { + in = new BufferedReader(new FileReader(blacklistFile)); + String line; + while ((line = in.readLine()) != null) { + line = line.trim(); + if (line.length() == 0 || line.charAt(0) == COMMENT_MARKER) { + continue; + } + // replaces regex \\s+ + String[] parts = StringUtils.split(line); + if (parts.length == 1) { + exactMatches.add(line.toLowerCase()); + } else if (parts.length == 2 + && parts[0].toUpperCase().equals(REGEXP_PREFIX)) { + // compile will throw PatternSyntaxException on invalid patterns. + regexpMatches.add(Pattern.compile(parts[1], Pattern.CASE_INSENSITIVE)); + } } + } finally { + in.close(); } } Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java (original) +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/encoding/EncodingDetector.java Wed Jan 6 07:47:11 2010 @@ -20,7 +20,6 @@ import java.nio.charset.Charset; -import com.google.inject.Inject; import com.ibm.icu.text.CharsetDetector; import com.ibm.icu.text.CharsetMatch; @@ -79,7 +78,7 @@ int i = 0; if (input.length >= 3 && (input[0] & 0xFF) == 0xEF && - (input[1] & 0xFF) == 0xBB & + (input[1] & 0xFF) == 0xBB && (input[2] & 0xFF) == 0xBF) { // Skip BOM. i = 3; 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=896342&r1=896341&r2=896342&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 Wed Jan 6 07:47:11 2010 @@ -472,6 +472,15 @@ } @Override + public int hashCode() { + return method.hashCode() + ^ uri.hashCode() + ^ authType.hashCode() + ^ postBody.hashCode() + ^ headers.hashCode(); + } + + @Override public boolean equals(Object obj) { if (obj == this) {return true;} if (obj instanceof HttpRequest) { Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java (original) +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/HttpResponse.java Wed Jan 6 07:47:11 2010 @@ -507,6 +507,13 @@ } @Override + public int hashCode() { + return httpStatusCode + ^ headers.hashCode() + ^ responseBytes.hashCode(); + } + + @Override public boolean equals(Object obj) { if (obj == this) { return true; } if (!(obj instanceof HttpResponse)) { return false; } Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java (original) +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/BasicOAuthStore.java Wed Jan 6 07:47:11 2010 @@ -116,7 +116,6 @@ } } - @SuppressWarnings("unused") private void storeConsumerInfo(URI gadgetUri, String serviceName, JSONObject consumerInfo) throws JSONException, GadgetException { realStoreConsumerInfo(gadgetUri, serviceName, consumerInfo); Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java (original) +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssParser.java Wed Jan 6 07:47:11 2010 @@ -46,7 +46,6 @@ import java.io.Writer; import java.net.URI; import java.util.Collections; -import java.util.logging.Level; import java.util.logging.Logger; /** A CSS DOM parser using Caja. */ Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java (original) +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/DefaultServiceFetcher.java Wed Jan 6 07:47:11 2010 @@ -22,25 +22,24 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; +import org.apache.shindig.common.uri.Uri; import org.apache.shindig.config.ContainerConfig; +import org.apache.shindig.gadgets.GadgetException; import org.apache.shindig.gadgets.http.HttpFetcher; import org.apache.shindig.gadgets.http.HttpRequest; import org.apache.shindig.gadgets.http.HttpResponse; -import org.apache.shindig.gadgets.GadgetException; -import org.apache.shindig.common.uri.Uri; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; -import com.google.common.collect.ImmutableList; import com.google.inject.Inject; /** @@ -110,7 +109,6 @@ @SuppressWarnings("unchecked") private List<String> getEndpointsFromContainerConfig(String container, String host) { - @SuppressWarnings("unchecked") Map<String, Object> properties = (Map<String, Object>) containerConfig.getMap(container, GADGETS_FEATURES_CONFIG).get(OSAPI_FEATURE_CONFIG); Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java (original) +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/OpenSocialI18NGadgetRewriter.java Wed Jan 6 07:47:11 2010 @@ -18,6 +18,11 @@ */ package org.apache.shindig.gadgets.render; +import java.io.IOException; +import java.util.Locale; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + import org.apache.shindig.common.util.ResourceLoader; import org.apache.shindig.common.xml.DomUtil; import org.apache.shindig.gadgets.Gadget; @@ -28,13 +33,6 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; -import com.google.inject.Inject; - -import java.io.IOException; -import java.util.Locale; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - /** * Produce data constants that are needed by the opensocial-i18n * feature based on user locale. Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java (original) +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java Wed Jan 6 07:47:11 2010 @@ -106,11 +106,13 @@ } public HttpResponse rewrite(HttpRequest request, HttpResponse response) { + if (request == null || response == null) + return response; + Uri uri = request.getUri(); - - if (uri == null || request == null || response == null) + if (null == uri) return response; - + try { // Check resizing Integer resizeQuality = request.getParamAsInteger(PARAM_RESIZE_QUALITY); Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java (original) +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/CajaContentRewriter.java Wed Jan 6 07:47:11 2010 @@ -81,9 +81,10 @@ public Reader retrieve(ExternalReference externalReference, String string) throws UriCallbackException { logger.info("Retrieving " + externalReference.toString()); + Reader in = null; try { URI resourceUri = retrievedUri.resolve(externalReference.getUri()); - Reader in = new InputStreamReader( + in = new InputStreamReader( resourceUri.toURL().openConnection().getInputStream(), "UTF-8"); char[] buf = new char[4096]; StringBuilder sb = new StringBuilder(); @@ -95,6 +96,13 @@ throw new UriCallbackException(externalReference, ex); } catch (IOException ex) { throw new UriCallbackException(externalReference, ex); + } finally { + try { + in.close(); + } catch (IOException e) { + // Not sure what else we can do here + throw new RuntimeException(e); + } } } Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandler.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandler.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandler.java (original) +++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/templates/tags/RenderTagHandler.java Wed Jan 6 07:47:11 2010 @@ -62,7 +62,7 @@ // TODO: for non-Elements, output errors if (value instanceof ElementWrapper) { copyChildren((ElementWrapper) value, result); - } else if (value instanceof List) { + } else if (value instanceof List<?>) { List<?> children = (List<?>) value; for (Object probablyAnElement : children) { if (probablyAnElement instanceof ElementWrapper) { Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/DefaultGadgetSpecFactoryTest.java Wed Jan 6 07:47:11 2010 @@ -21,7 +21,6 @@ import static org.easymock.EasyMock.expect; import static org.easymock.classextension.EasyMock.replay; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import org.apache.shindig.common.cache.CacheProvider; import org.apache.shindig.common.cache.LruCacheProvider; Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParsingTestBase.java Wed Jan 6 07:47:11 2010 @@ -20,6 +20,10 @@ import static org.junit.Assert.assertEquals; +import java.io.IOException; +import java.io.InputStream; +import java.util.LinkedList; + import name.fraser.neil.plaintext.diff_match_patch; import name.fraser.neil.plaintext.diff_match_patch.Diff; import name.fraser.neil.plaintext.diff_match_patch.Operation; @@ -29,12 +33,6 @@ import org.apache.commons.lang.StringUtils; import org.w3c.dom.Document; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.LinkedList; - /** * Simple base class providing test helpers for parsing/serializing tests. */ Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpRequestHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpRequestHandlerTest.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpRequestHandlerTest.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpRequestHandlerTest.java Wed Jan 6 07:47:11 2010 @@ -22,6 +22,11 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.reportMatcher; +import java.util.Arrays; +import java.util.Collections; +import java.util.Map; +import java.util.concurrent.ExecutionException; + import org.apache.shindig.common.EasyMockTestCase; import org.apache.shindig.common.JsonAssert; import org.apache.shindig.common.testing.FakeGadgetToken; @@ -50,15 +55,9 @@ import org.junit.Before; import org.junit.Test; -import java.util.Arrays; -import java.util.Collections; -import java.util.Map; -import java.util.concurrent.ExecutionException; - import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import com.google.inject.Guice; import com.google.inject.Injector; Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/FakeTemplateProcessor.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/FakeTemplateProcessor.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/FakeTemplateProcessor.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/FakeTemplateProcessor.java Wed Jan 6 07:47:11 2010 @@ -41,7 +41,7 @@ // Some quick-and-dirty mocking: put a List in the map, and // you get one result per-entry Object result = expressionResults.get(expression); - if (result instanceof List && !type.isAssignableFrom(List.class)) { + if (result instanceof List<?> && !type.isAssignableFrom(List.class)) { result = ((List<?>) result).remove(0); } return type.cast(result); Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java (original) +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomContent.java Wed Jan 6 07:47:11 2010 @@ -60,7 +60,7 @@ * @param value */ public AtomContent(Object value) { - if (value instanceof Map) { + if (value instanceof Map<?, ?>) { Map<?, ?> entries = (Map<?, ?>) value; List<AtomKeyValue> keyValues = Lists.newArrayList(); for ( Entry<?, ?> e : entries.entrySet() ) { 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=896342&r1=896341&r2=896342&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 Wed Jan 6 07:47:11 2010 @@ -17,16 +17,15 @@ */ package org.apache.shindig.social.opensocial.model; +import java.util.EnumSet; +import java.util.Map; + import org.apache.shindig.protocol.model.Exportablebean; import org.apache.shindig.social.core.model.AddressImpl; -import com.google.inject.ImplementedBy; -import com.google.common.collect.Maps; import com.google.common.base.Functions; - -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Map; +import com.google.common.collect.Maps; +import com.google.inject.ImplementedBy; /** * Base interface for all address objects Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java (original) +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/model/EnumUtil.java Wed Jan 6 07:47:11 2010 @@ -20,7 +20,6 @@ import com.google.common.collect.ImmutableSet; -import java.util.Collections; import java.util.Set; /** Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java (original) +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/PersonHandler.java Wed Jan 6 07:47:11 2010 @@ -17,6 +17,10 @@ */ package org.apache.shindig.social.opensocial.service; +import java.util.List; +import java.util.Set; +import java.util.concurrent.Future; + import org.apache.shindig.common.util.FutureUtil; import org.apache.shindig.config.ContainerConfig; import org.apache.shindig.protocol.HandlerPreconditions; @@ -33,13 +37,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import com.google.inject.Inject; -import java.util.List; -import java.util.Set; -import java.util.concurrent.Future; - @Service(name = "people", path = "/{userId}+/{groupId}/{personId}+") public class PersonHandler { private final PersonService personService; Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java (original) +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/SocialRequestItem.java Wed Jan 6 07:47:11 2010 @@ -17,6 +17,10 @@ */ package org.apache.shindig.social.opensocial.service; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.apache.shindig.auth.SecurityToken; import org.apache.shindig.protocol.BaseRequestItem; import org.apache.shindig.protocol.conversion.BeanConverter; @@ -27,13 +31,7 @@ import org.apache.shindig.social.opensocial.spi.UserId; import org.json.JSONObject; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; /** * Subclass with social specific extensions Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MessageService.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MessageService.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MessageService.java (original) +++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MessageService.java Wed Jan 6 07:47:11 2010 @@ -22,7 +22,6 @@ import org.apache.shindig.auth.SecurityToken; import org.apache.shindig.social.opensocial.model.Message; import org.apache.shindig.social.opensocial.model.MessageCollection; -import org.apache.shindig.social.sample.spi.JsonDbOpensocialService; import org.apache.shindig.protocol.ProtocolException; import org.apache.shindig.protocol.RestfulCollection; Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java (original) +++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/SocialApiTestsGuiceModule.java Wed Jan 6 07:47:11 2010 @@ -18,6 +18,8 @@ */ package org.apache.shindig.social; +import java.util.Set; + import org.apache.shindig.common.servlet.ParameterFetcher; import org.apache.shindig.config.ContainerConfig; import org.apache.shindig.config.JsonContainerConfig; @@ -29,27 +31,19 @@ import org.apache.shindig.social.core.util.xstream.XStream081Configuration; import org.apache.shindig.social.opensocial.service.ActivityHandler; import org.apache.shindig.social.opensocial.service.AppDataHandler; -import org.apache.shindig.social.opensocial.service.PersonHandler; import org.apache.shindig.social.opensocial.service.MessageHandler; +import org.apache.shindig.social.opensocial.service.PersonHandler; import org.apache.shindig.social.opensocial.spi.ActivityService; import org.apache.shindig.social.opensocial.spi.AppDataService; import org.apache.shindig.social.opensocial.spi.MessageService; import org.apache.shindig.social.opensocial.spi.PersonService; import org.apache.shindig.social.sample.spi.JsonDbOpensocialService; -import org.easymock.EasyMock; - import com.google.common.collect.ImmutableSet; import com.google.inject.AbstractModule; import com.google.inject.TypeLiteral; -import com.google.inject.Provider; import com.google.inject.name.Names; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.ServletRequest; - /** * Provides social api component injection for all large tests */ Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java?rev=896342&r1=896341&r2=896342&view=diff ============================================================================== --- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java (original) +++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MessageHandlerTest.java Wed Jan 6 07:47:11 2010 @@ -17,12 +17,14 @@ */ package org.apache.shindig.social.opensocial.service; +import java.util.List; +import java.util.Map; + import org.apache.shindig.common.testing.FakeGadgetToken; import org.apache.shindig.common.util.ImmediateFuture; import org.apache.shindig.protocol.DefaultHandlerRegistry; import org.apache.shindig.protocol.HandlerExecutionListener; import org.apache.shindig.protocol.HandlerRegistry; -import org.apache.shindig.protocol.ProtocolException; import org.apache.shindig.protocol.RequestItem; import org.apache.shindig.protocol.RestHandler; import org.apache.shindig.protocol.conversion.BeanJsonConverter; @@ -31,17 +33,13 @@ import org.apache.shindig.social.opensocial.spi.MessageService; import org.apache.shindig.social.opensocial.spi.UserId; import org.easymock.classextension.EasyMock; - -import java.util.List; -import java.util.Map; -import java.util.concurrent.ExecutionException; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; public class MessageHandlerTest extends Assert {
