Author: awiner
Date: Tue Jun 2 21:08:45 2009
New Revision: 781169
URL: http://svn.apache.org/viewvc?rev=781169&view=rev
Log:
Fix various warnings, mostly unused imports and unchecked casts
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CacheKeyBuilder.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoHtmlParser.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/render/DefaultServiceFetcher.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/Renderer.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.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/render/DefaultRpcServiceLookupTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/RenderTagHandlerTest.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CacheKeyBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CacheKeyBuilder.java?rev=781169&r1=781168&r2=781169&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CacheKeyBuilder.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/CacheKeyBuilder.java
Tue Jun 2 21:08:45 2009
@@ -96,7 +96,6 @@
appendLegacyKeys(keyBuilder);
if (!paramMap.isEmpty()) {
- boolean first = true;
for (Map.Entry<String, Object> mapEntry : paramMap.entrySet()) {
keyBuilder.append(KEY_SEPARATOR);
keyBuilder.append(String.format("%s=%s", mapEntry.getKey(),
mapEntry.getValue()));
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java?rev=781169&r1=781168&r2=781169&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
Tue Jun 2 21:08:45 2009
@@ -29,7 +29,6 @@
import java.io.IOException;
import java.io.StringWriter;
-import java.util.Set;
/**
* This parser does not try to escape entities in text content as it expects
the parser
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoHtmlParser.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoHtmlParser.java?rev=781169&r1=781168&r2=781169&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoHtmlParser.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoHtmlParser.java
Tue Jun 2 21:08:45 2009
@@ -19,7 +19,6 @@
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.parse.GadgetHtmlParser;
-import org.apache.shindig.gadgets.parse.HtmlSerializer;
import org.cyberneko.html.parsers.DOMFragmentParser;
import org.cyberneko.html.parsers.DOMParser;
import org.w3c.dom.DOMImplementation;
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=781169&r1=781168&r2=781169&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
Tue Jun 2 21:08:45 2009
@@ -18,6 +18,7 @@
*/
package org.apache.shindig.gadgets.preload;
+import org.apache.commons.lang.StringUtils;
import org.apache.shindig.common.JsonSerializer;
import org.apache.shindig.common.JsonUtil;
import org.apache.shindig.common.uri.Uri;
@@ -32,25 +33,22 @@
import org.apache.shindig.gadgets.http.RequestPipeline;
import org.apache.shindig.gadgets.spec.PipelinedData;
import org.apache.shindig.gadgets.spec.RequestAuthenticationInfo;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.inject.Inject;
-
-import org.apache.commons.lang.StringUtils;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import java.nio.charset.Charset;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
+import com.google.inject.Inject;
+
/**
* Processes a single batch of pipeline data into tasks.
*/
@@ -58,7 +56,6 @@
private final RequestPipeline requestPipeline;
private final ContainerConfig config;
- private static final Charset UTF8 = Charset.forName("UTF-8");
private static Set<String> HTTP_RESPONSE_HEADERS =
ImmutableSet.of("content-type", "location", "set-cookie");
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=781169&r1=781168&r2=781169&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
Tue Jun 2 21:08:45 2009
@@ -92,7 +92,9 @@
Map<String, Object> declaredServices = containerConfig.getMap(container,
OSAPI_SERVICES);
if (!declaredServices.isEmpty()) {
for (Map.Entry<String, Object> entry : declaredServices.entrySet()) {
- endpointServices.putAll(entry.getKey(),
(Iterable<String>)entry.getValue());
+ @SuppressWarnings("unchecked")
+ Iterable<String> entryValue = (Iterable<String>) entry.getValue();
+ endpointServices.putAll(entry.getKey(), entryValue);
}
}
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java?rev=781169&r1=781168&r2=781169&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/ProxyRenderer.java
Tue Jun 2 21:08:45 2009
@@ -38,14 +38,11 @@
import com.google.common.collect.ImmutableList;
import com.google.inject.Inject;
-import java.nio.charset.Charset;
-
/**
* Implements proxied rendering.
*/
public class ProxyRenderer {
public static final String PATH_PARAM = "path";
- private static final Charset UTF8 = Charset.forName("UTF-8");
private final RequestPipeline requestPipeline;
private final HttpCache httpCache;
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=781169&r1=781168&r2=781169&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
Tue Jun 2 21:08:45 2009
@@ -26,7 +26,6 @@
import org.apache.shindig.gadgets.LockedDomainService;
import org.apache.shindig.gadgets.process.ProcessingException;
import org.apache.shindig.gadgets.process.Processor;
-import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.View;
import com.google.inject.Inject;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java?rev=781169&r1=781168&r2=781169&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java
Tue Jun 2 21:08:45 2009
@@ -19,10 +19,6 @@
package org.apache.shindig.gadgets;
import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.isA;
-
-import static org.junit.Assert.assertEquals;
-
import org.apache.shindig.common.EasyMockTestCase;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.spec.GadgetSpec;
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java?rev=781169&r1=781168&r2=781169&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java
Tue Jun 2 21:08:45 2009
@@ -43,14 +43,12 @@
private Gadget makeGadget(boolean wantsLocked, String url) {
String gadgetXml;
- List<String> features = new ArrayList<String>();
List<GadgetFeature> gadgetFeatures = new ArrayList<GadgetFeature>();
if (wantsLocked) {
gadgetXml =
"<Module><ModulePrefs title=''>" +
" <Require feature='locked-domain'/>" +
"</ModulePrefs><Content/></Module>";
- features = Arrays.asList("locked-domain");
gadgetFeatures = Arrays.asList(new GadgetFeature("locked-domain",
new ArrayList<JsLibrary>(), null));
} else {
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=781169&r1=781168&r2=781169&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
Tue Jun 2 21:08:45 2009
@@ -131,7 +131,7 @@
preloader.createPreloadTasks(gadget);
assertEquals(1, preloaded.size());
- PreloadedData data = preloaded.iterator().next().call();
+ preloaded.iterator().next().call();
HttpRequest request = oauthFetcher.requests.get(0);
assertTrue("request should ignore cache", request.getIgnoreCache());
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java?rev=781169&r1=781168&r2=781169&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/render/DefaultRpcServiceLookupTest.java
Tue Jun 2 21:08:45 2009
@@ -52,7 +52,7 @@
public void testGetServicesForContainer_Null() throws Exception {
String container = null;
try {
- Multimap<String, String> services = svcLookup.getServicesFor(container,
host);
+ svcLookup.getServicesFor(container, host);
fail("Should have thrown an exception for an invalid container");
} catch (Exception e) {
@@ -69,7 +69,7 @@
Multimap<String, String> actualServices =
svcLookup.getServicesFor(container, host);
assertEquals(1, actualServices.size());
assertTrue(actualServices.containsKey(socialEndpoint));
- Set actualServiceMethods = (Set) actualServices.get(socialEndpoint);
+ Set<String> actualServiceMethods = (Set<String>)
actualServices.get(socialEndpoint);
assertEquals(expectedServiceMethods, actualServiceMethods);
}
@@ -112,7 +112,7 @@
Multimap<String, String> actualServices =
svcLookup.getServicesFor(container, host);
assertEquals(expectedServiceCount, actualServices.keySet().size());
assertTrue(actualServices.containsKey(socialEndpoint));
- Set actualServiceMethods = (Set) actualServices.get(socialEndpoint);
+ Set<String> actualServiceMethods = (Set<String>)
actualServices.get(socialEndpoint);
assertEquals(expectedServiceMethods, actualServiceMethods);
}
}
Modified:
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/RenderTagHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/RenderTagHandlerTest.java?rev=781169&r1=781168&r2=781169&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/RenderTagHandlerTest.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/templates/RenderTagHandlerTest.java
Tue Jun 2 21:08:45 2009
@@ -40,7 +40,6 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
-import com.google.common.collect.Lists;
import java.io.IOException;
import java.util.Map;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java?rev=781169&r1=781168&r2=781169&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthAuthenticationHandler.java
Tue Jun 2 21:08:45 2009
@@ -25,7 +25,6 @@
import net.oauth.OAuthConsumer;
import net.oauth.OAuthException;
import net.oauth.OAuthMessage;
-import net.oauth.OAuthServiceProvider;
import net.oauth.SimpleOAuthValidator;
import net.oauth.OAuthProblemException;
import net.oauth.server.OAuthServlet;
