You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by aw...@apache.org on 2009/02/24 21:19:39 UTC
svn commit: r747535 - in /incubator/shindig/trunk/java:
common/src/main/java/org/apache/shindig/auth/
common/src/main/java/org/apache/shindig/expressions/
common/src/main/java/org/apache/shindig/protocol/
common/src/main/java/org/apache/shindig/protoco...
Author: awiner
Date: Tue Feb 24 20:19:38 2009
New Revision: 747535
URL: http://svn.apache.org/viewvc?rev=747535&view=rev
Log:
Warning cleanup:
- Eliminate unused imports
- Eliminate unread variables (leaving behind the actual method call where appropriate)
- Eliminate unchecked cast warnings (fixing or suppressing as needed)
- Eliminate uncalled private methods
Modified:
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.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/DataServiceServlet.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/xstream/DataCollectionConverter.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/TestModel.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriBuilderTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/protocol/DataServiceServletTest.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/parse/caja/CajaCssSanitizer.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetSpecFactory.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/parse/HtmlParserTest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.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/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.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/AtomLink.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLinkConverter.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthEntry.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/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/dataservice/integration/RestfulJsonActivityTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/AuthenticationServletFilter.java Tue Feb 24 20:19:38 2009
@@ -33,7 +33,6 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponse;
/**
* Filter that attempts to authenticate an incoming HTTP request. It uses the guice injected
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/expressions/Expressions.java Tue Feb 24 20:19:38 2009
@@ -42,7 +42,6 @@
import com.google.inject.Singleton;
import de.odysseus.el.ExpressionFactoryImpl;
-import de.odysseus.el.util.SimpleContext;
/**
* A facade to the expressions functionality.
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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -74,9 +74,11 @@
BeanJsonConverter jsonConverter) {
try {
this.parameters = Maps.newHashMap();
- Iterator keys = parameters.keys();
+ @SuppressWarnings("unchecked")
+ // JSONObject keys are always strings
+ Iterator<String> keys = parameters.keys();
while (keys.hasNext()) {
- String key = (String)keys.next();
+ String key = keys.next();
this.parameters.put(key, parameters.get(key));
}
this.token = token;
@@ -199,10 +201,10 @@
public String getParameter(String paramName) {
Object param = this.parameters.get(paramName);
if (param instanceof List) {
- if (((List)param).isEmpty()) {
+ if (((List<?>)param).isEmpty()) {
return null;
} else {
- param = ((List)param).get(0);
+ param = ((List<?>)param).get(0);
}
}
if (param == null) {
@@ -230,7 +232,10 @@
return listParam;
}
else if (param instanceof List) {
- return (List<String>)param;
+ // Assume it's a list of strings. This is not type-safe.
+ @SuppressWarnings("unchecked")
+ List<String> listParam = (List<String>) param;
+ return listParam;
} else if (param instanceof JSONArray) {
try {
JSONArray jsonArray = (JSONArray)param;
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java Tue Feb 24 20:19:38 2009
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.io.Reader;
+import java.util.Map;
import java.util.concurrent.Future;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -111,7 +112,9 @@
}
// Execute the request
- Future future = handler.execute(servletRequest.getParameterMap(), bodyReader, token, converter);
+ @SuppressWarnings("unchecked")
+ Map<String, String[]> parameterMap = servletRequest.getParameterMap();
+ Future<?> future = handler.execute(parameterMap, bodyReader, token, converter);
ResponseItem responseItem = getResponseItem(future);
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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -407,7 +407,6 @@
Class<?> requestItemType = inputIsRequestItem ? inputClass : BaseRequestItem.class;
- Class<?> requestItemFirstParamClass = isRest ? Map.class : JSONObject.class;
restRequestItemConstructor = requestItemType.getConstructor(Map.class,
SecurityToken.class, BeanConverter.class, BeanJsonConverter.class);
rpcRequestItemConstructor = requestItemType.getConstructor(JSONObject.class,
Modified: incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java (original)
+++ incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/conversion/xstream/DataCollectionConverter.java Tue Feb 24 20:19:38 2009
@@ -50,6 +50,8 @@
* @see com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter#canConvert(java.lang.Class)
*/
@Override
+ // Base API is inherently unchecked
+ @SuppressWarnings("unchecked")
public boolean canConvert(Class clazz) {
return (DataCollection.class.isAssignableFrom(clazz));
}
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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -51,6 +51,8 @@
* Only checks for the availability of a public default constructor. If you
* need stricter checks, subclass JavaBeanConverter
*/
+ // Base API is inherently unchecked
+ @SuppressWarnings("unchecked")
public boolean canConvert(Class type) {
while (true) {
if (type == null) {
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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -17,8 +17,8 @@
*/
package org.apache.shindig.protocol.conversion.xstream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import java.util.Map;
+import java.util.Map.Entry;
import com.google.common.collect.Maps;
import com.thoughtworks.xstream.converters.MarshallingContext;
@@ -28,9 +28,6 @@
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
import com.thoughtworks.xstream.mapper.Mapper;
-import java.util.Map;
-import java.util.Map.Entry;
-
/**
* converts a map to and from the form <container>
* <key>value</key> <key>value</key> <container>.
@@ -38,10 +35,6 @@
public class MapConverter extends AbstractCollectionConverter {
/**
- * The logger.
- */
- private static final Log log = LogFactory.getLog(MapConverter.class);
- /**
* If true will use a short form of xml serialization.
*/
private final boolean shortform = false;
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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -17,13 +17,12 @@
*/
package org.apache.shindig.protocol.model;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
/**
* Limited model to fully exercise data binding
*/
@@ -61,8 +60,9 @@
private List<Passenger> passengers;
public Car() {
- ArrayList<Enum<Engine>> engines = Lists.<Enum<Engine>>newArrayList(
- new EnumImpl<Engine>(Engine.GAS, null), new EnumImpl<Engine>(Engine.HYBRID, null));
+ List<Enum<Engine>> engines = Lists.newArrayList();
+ engines.add(new EnumImpl<Engine>(Engine.GAS, null));
+ engines.add(new EnumImpl<Engine>(Engine.HYBRID, null));
engine = engines;
parkingTickets = Maps.newHashMap();
parkingTickets.put("BERKELEY", "$120");
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriBuilderTest.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriBuilderTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriBuilderTest.java Tue Feb 24 20:19:38 2009
@@ -19,7 +19,6 @@
import com.google.common.collect.Maps;
import org.junit.Test;
-import org.junit.Assert;
import static org.junit.Assert.*;
import java.util.Arrays;
@@ -266,7 +265,6 @@
@Test
public void equalsAndHashCodeOk() {
UriBuilder uri = UriBuilder.parse("http://example.org/foo/bar/baz?blah=blah#boo");
- Map<String, List<String>> params = UriBuilder.splitParameters("blah=blah");
UriBuilder uri2 = new UriBuilder(Uri.parse("http://example.org/foo/bar/baz?blah=blah#boo"));
assertEquals(uri, uri2);
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriTest.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/uri/UriTest.java Tue Feb 24 20:19:38 2009
@@ -23,8 +23,6 @@
import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import org.junit.Assert;
-
import java.net.URI;
import java.util.Arrays;
import java.util.Collection;
Modified: incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java (original)
+++ incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/util/JsonConversionUtilTest.java Tue Feb 24 20:19:38 2009
@@ -17,14 +17,16 @@
*/
package org.apache.shindig.common.util;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import junit.framework.TestCase;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import java.util.Iterator;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
/**
* Test for conversion of a structured key-value set to a JSON object
@@ -61,7 +63,7 @@
assertJsonEquals(JsonConversionUtil.convertToJsonValue("a,b,c"),
new JSONArray(Lists.newArrayList("a", "b", "c")));
assertJsonEquals(JsonConversionUtil.convertToJsonValue("1,2,3,true,false,null"),
- new JSONArray(Lists.newArrayList(1, 2, 3, true,
+ new JSONArray(Lists.<Object>newArrayList(1, 2, 3, true,
false, null)));
assertJsonEquals(JsonConversionUtil.convertToJsonValue("(1)"),
new JSONArray(Lists.newArrayList(1)));
@@ -96,8 +98,11 @@
public void testJSONToParameterMapParsing()
throws Exception {
- java.util.Map resultMap = JsonConversionUtil
+ Map<String, String> resultMap = JsonConversionUtil
.fromJson(new JSONObject("{a:{b:[{c:\"hello\"},{c:\"hello\"}]}}"));
+ assertEquals(2, resultMap.size());
+ assertEquals("hello", resultMap.get(".a.b(0).c"));
+ assertEquals("hello", resultMap.get(".a.b(1).c"));
}
public static void assertJsonEquals(Object expected, Object actual)
@@ -115,11 +120,10 @@
return;
}
assertEquals(expectedObject.names().length(), actualObject.names().length());
- String key;
- for (Iterator keys = expectedObject.keys(); keys.hasNext();
- assertJsonEquals(expectedObject.get(key), actualObject.get(key))) {
- key = (String) keys.next();
+
+ for (String key : JSONObject.getNames(expectedObject)) {
assertTrue(actualObject.has(key));
+ assertJsonEquals(expectedObject.get(key), actualObject.get(key));
}
} else if (expected instanceof JSONArray) {
JSONArray expectedArray = (JSONArray) expected;
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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -23,22 +23,20 @@
import org.apache.shindig.common.testing.FakeHttpServletRequest;
import org.apache.shindig.protocol.conversion.BeanConverter;
import org.apache.shindig.protocol.conversion.BeanJsonConverter;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
-
-import junit.framework.TestCase;
-
import org.easymock.IMocksControl;
import org.easymock.classextension.EasyMock;
import java.io.IOException;
import java.io.PrintWriter;
-import javax.servlet.ServletInputStream;
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;
+
public class DataServiceServletTest extends TestCase {
private static final FakeGadgetToken FAKE_GADGET_TOKEN = new FakeGadgetToken()
@@ -54,12 +52,6 @@
private IMocksControl mockControl = EasyMock.createNiceControl();
- private final ServletInputStream dummyPostData = new ServletInputStream() {
- @Override public int read() {
- return -1;
- }
- };
-
@Override protected void setUp() throws Exception {
servlet = new DataServiceServlet();
req = mockControl.createMock(HttpServletRequest.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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -19,30 +19,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.EvaluatorException;
import org.mozilla.javascript.Script;
import org.mozilla.javascript.Scriptable;
import org.mozilla.javascript.ScriptableObject;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import com.google.common.collect.Maps;
+
/**
* A class that loads a feature set from features into a Javascript Parser to
* make the model available to validate JSON messages against.
@@ -54,27 +42,6 @@
private ScriptableObject scope;
/**
- * @param feature
- * The name of the feature are eg "opensocial-reference", this
- * is a classpath stub (not starting with /) where the location
- * contains a feature.xml file.
- * @throws SAXException
- * if feature.xml is not parsable
- * @throws ParserConfigurationException
- * if the parsers are invalid
- * @throws IOException
- * if feature.xml or the javascript that represents the
- * feature is missing
- *
- */
- private ApiValidator(String feature) throws IOException,
- ParserConfigurationException, SAXException {
- ctx = Context.enter();
- scope = ctx.initStandardObjects();
- load(feature);
- }
-
- /**
* Load the ApiValidator with no features, this avoids having features in the classpath
* @throws IOException
*/
@@ -294,49 +261,6 @@
}
/**
- * Load a feature based on the spec
- *
- * @param spec
- * The name of the location of the spec in the classpath, must
- * not start with a '/' and must should contain a feature.xml
- * file in the location
- * @throws IOException
- * If any of the resources cant be found
- * @throws ParserConfigurationException
- * If the parser has a problem being constructed
- * @throws SAXException
- * on a parse error on the features.xml
- */
- private void load(String spec) throws IOException, SAXException,
- ParserConfigurationException {
-
- List<String> scripts = getScripts(spec);
-
- List<Script> compiled = Lists.newArrayList();
- for (String script : scripts) {
- String scriptPath = spec + '/' + script;
- InputStream in = this.getClass().getClassLoader().getResourceAsStream(
- scriptPath);
- if (in == null) {
- in = this.getClass().getClassLoader().getResourceAsStream(
- "features/" + scriptPath);
- if (in == null) {
- throw new IOException("Cant load spec " + spec + " or features/"
- + spec + " from classpath");
- }
- }
- InputStreamReader reader = new InputStreamReader(in);
- Script compiledScript = ctx.compileReader(reader, spec, 0, null);
- compiled.add(compiledScript);
- }
-
- for (Script compiledScript : compiled) {
- compiledScript.exec(ctx, scope);
- }
-
- }
-
- /**
* Add some javascript to the context, and execute it. If extra custom
* javascript is wanted in the context or scope then this method will load it.
*
@@ -349,51 +273,6 @@
}
/**
- * Get an ordered list of javascript resources from a feature sets.
- *
- * @param spec
- * The spec location
- * @return An ordered list of javascript resources, these are relative to
- * specification file.
- * @throws IOException
- * If any of the resources can't be loaded.
- * @throws SAXException
- * Where the feature.xml file is not parsable
- * @throws ParserConfigurationException
- * where the parser can't be constructed.
- * @return An ordered list of script that need to be loaded and executed to
- * make the feature available in the context.
- */
- private List<String> getScripts(String spec) throws SAXException,
- IOException, ParserConfigurationException {
- String features = spec + "/feature.xml";
- InputStream in = this.getClass().getClassLoader().getResourceAsStream(
- features);
- if (in == null) {
- in = this.getClass().getClassLoader().getResourceAsStream(
- "features/" + features);
- if (in == null) {
- throw new IOException("Cant find " + features + " or features/"
- + features + " in classpath ");
- }
- }
- DocumentBuilderFactory builderFactory = DocumentBuilderFactory
- .newInstance();
- DocumentBuilder documentBuilder = builderFactory.newDocumentBuilder();
- Document doc = documentBuilder.parse(in);
- NodeList nl = doc.getElementsByTagName("script");
- List<String> scripts = Lists.newArrayList();
- for (int i = 0; i < nl.getLength(); i++) {
- Node scriptNode = nl.item(i);
- NamedNodeMap attributes = scriptNode.getAttributes();
- Node scriptAttr = attributes.getNamedItem("src");
- String script = scriptAttr.getNodeValue();
- scripts.add(script);
- }
- return scripts;
- }
-
- /**
* @param nameJSON
*/
public static void dump(Map<?, ?> nameJSON) {
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/caja/CajaCssSanitizer.java Tue Feb 24 20:19:38 2009
@@ -172,7 +172,7 @@
if (chain.node instanceof CssTree.Declaration ||
chain.node instanceof CssTree.Import) {
// Remove the entire subtree
- ((AbstractParseTreeNode)chain.getParentNode()).removeChild(chain.node);
+ ((AbstractParseTreeNode<?>)chain.getParentNode()).removeChild(chain.node);
} else {
clean(chain.parent);
}
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ContentRewriterFeature.java Tue Feb 24 20:19:38 2009
@@ -20,8 +20,6 @@
import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import com.google.common.base.Objects;
-
import org.apache.shindig.gadgets.spec.Feature;
import org.apache.shindig.gadgets.spec.GadgetSpec;
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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -21,16 +21,11 @@
import org.apache.sanselan.ImageInfo;
import org.apache.sanselan.ImageReadException;
import org.apache.sanselan.Sanselan;
-import org.apache.sanselan.common.IImageMetadata;
import org.apache.sanselan.common.byteSources.ByteSourceInputStream;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.http.HttpResponse;
import org.apache.shindig.gadgets.http.HttpResponseBuilder;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Inject;
-
-import java.awt.color.ICC_Profile;
import java.io.IOException;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
@@ -39,6 +34,9 @@
import javax.imageio.ImageIO;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Inject;
+
/**
* Rewrite images to more efficiently compress their content. Can rewrite images
* from one format to another for better efficiency.
@@ -126,8 +124,8 @@
} else if (imageFormat == ImageFormat.IMAGE_FORMAT_JPEG) {
// We cant use Sanselan to read JPEG but we can use it to read all the metadata which is
// where we have issues anyway
- IImageMetadata imageMetadata = Sanselan.getMetadata(response.getResponse(), null);
- ICC_Profile icc_profile = Sanselan.getICCProfile(response.getResponse(), null);
+ Sanselan.getMetadata(response.getResponse(), null);
+ Sanselan.getICCProfile(response.getResponse(), null);
response = new JPEGOptimizer(config, response)
.rewrite(ImageIO.read(response.getResponse()));
} else if (imageFormat == ImageFormat.IMAGE_FORMAT_BMP) {
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetSpecFactory.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetSpecFactory.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetSpecFactory.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/FakeGadgetSpecFactory.java Tue Feb 24 20:19:38 2009
@@ -22,8 +22,6 @@
import org.apache.shindig.gadgets.oauth.GadgetTokenStoreTest;
import org.apache.shindig.gadgets.spec.GadgetSpec;
-import java.net.URI;
-
/**
* Fakes out a gadget spec factory
*/
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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -17,7 +17,6 @@
*/
package org.apache.shindig.gadgets.oauth;
-import org.junit.Test;
import junitx.extensions.EqualsHashCodeTestCase;
import static junitx.framework.Assert.assertNotEquals;
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlParserTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlParserTest.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlParserTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/HtmlParserTest.java Tue Feb 24 20:19:38 2009
@@ -19,10 +19,9 @@
import org.apache.shindig.gadgets.parse.nekohtml.NekoHtmlParser;
import org.apache.shindig.gadgets.rewrite.XPathWrapper;
+import org.w3c.dom.Document;
import junit.framework.TestCase;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
/**
* Note these tests are of marginal use. Consider removing. More useful tests would exercise
@@ -78,10 +77,4 @@
// TODO: figure out to what extent it makes sense to test "invalid"
// HTML, semi-structured HTML, and comment parsing
-
- // Different parsers either return null or empty child lists.
- // In particular because Caja is a non-w3c compliant parser
- private void assertNullOrEmpty(NodeList l) {
- assertTrue(l == null || l.getLength() == 0);
- }
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/ParseTreeSerializerBenchmark.java Tue Feb 24 20:19:38 2009
@@ -21,24 +21,22 @@
import org.apache.shindig.gadgets.GadgetException;
import org.apache.shindig.gadgets.parse.nekohtml.NekoHtmlParser;
import org.apache.shindig.gadgets.parse.nekohtml.NekoSimplifiedHtmlParser;
-
import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.bootstrap.DOMImplementationRegistry;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.StringWriter;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.StringWriter;
/**
* Benchmarks for HTML parsing and serialization
*/
public class ParseTreeSerializerBenchmark {
- private DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance();
private int numRuns;
private String content;
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/image/JPEGOptimizerTest.java Tue Feb 24 20:19:38 2009
@@ -21,7 +21,6 @@
import org.apache.sanselan.Sanselan;
import org.apache.shindig.gadgets.http.HttpResponse;
-import java.awt.color.ICC_Profile;
import java.io.IOException;
import javax.imageio.ImageIO;
@@ -113,7 +112,8 @@
HttpResponse rewrite(HttpResponse original)
throws IOException, ImageReadException {
- ICC_Profile icc_profile = Sanselan.getICCProfile(original.getResponse(), null);
+ // Get the profile, throwing exceptions if that fails
+ Sanselan.getICCProfile(original.getResponse(), null);
return new JPEGOptimizer(new OptimizerConfig(), original).rewrite(
ImageIO.read(original.getResponse()));
}
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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -234,7 +234,7 @@
private void expectParameters(HttpServletRequest request, String... params) {
final List<String> v = Lists.newArrayList(params);
- expect(request.getParameterNames()).andStubAnswer(new IAnswer<Enumeration>() {
+ expect(request.getParameterNames()).andStubAnswer(new IAnswer<Enumeration<String>>() {
public Enumeration<String> answer() throws Throwable {
return Collections.enumeration(v);
}
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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -20,7 +20,6 @@
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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -39,9 +39,6 @@
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/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/variables/VariableSubstituterTest.java Tue Feb 24 20:19:38 2009
@@ -30,8 +30,6 @@
import org.apache.shindig.gadgets.spec.MessageBundle;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-
import org.junit.Test;
import java.util.Locale;
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/oauth/OAuthConsumerRequestAuthenticationHandler.java Tue Feb 24 20:19:38 2009
@@ -17,17 +17,14 @@
*/
package org.apache.shindig.social.core.oauth;
-import com.google.inject.Inject;
-import com.google.inject.name.Named;
-
import net.oauth.OAuth;
import net.oauth.OAuthAccessor;
import net.oauth.OAuthConsumer;
import net.oauth.OAuthException;
import net.oauth.OAuthMessage;
-import net.oauth.OAuthServiceProvider;
import net.oauth.SimpleOAuthValidator;
import net.oauth.server.OAuthServlet;
+
import org.apache.commons.lang.StringUtils;
import org.apache.shindig.auth.AuthenticationHandler;
import org.apache.shindig.auth.SecurityToken;
@@ -35,8 +32,11 @@
import java.io.IOException;
import java.net.URISyntaxException;
+
import javax.servlet.http.HttpServletRequest;
+import com.google.inject.Inject;
+
/**
* This class only handles "two-legged" OAuth (aka Consumer Request) OAuth requests. The request
* must include a xoauth_requestor_id parameter, which will be the userId of the person the
@@ -46,13 +46,10 @@
public static final String AUTH_OAUTH_CONSUMER_REQUEST = "OAuth-ConsumerRequest";
public static final String REQUESTOR_ID_PARAM = "xoauth_requestor_id";
private OAuthDataStore store;
- private String baseUrl;
@Inject
- public OAuthConsumerRequestAuthenticationHandler(OAuthDataStore store,
- @Named("shindig.oauth.base-url") String baseUrl) {
+ public OAuthConsumerRequestAuthenticationHandler(OAuthDataStore store) {
this.store = store;
- this.baseUrl = baseUrl;
}
public String getName() {
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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -17,8 +17,6 @@
*/
package org.apache.shindig.social.core.util;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.shindig.protocol.conversion.BeanXStreamConverter;
import org.apache.shindig.protocol.conversion.xstream.XStreamConfiguration;
import org.apache.shindig.social.core.util.atom.AtomFeed;
@@ -31,8 +29,6 @@
*/
public class BeanXStreamAtomConverter extends BeanXStreamConverter {
- 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/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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -17,8 +17,6 @@
*/
package org.apache.shindig.social.core.util.atom;
-import com.google.common.base.Preconditions;
-
/**
* represents an atom:link element.
*/
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLinkConverter.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLinkConverter.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLinkConverter.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/atom/AtomLinkConverter.java Tue Feb 24 20:19:38 2009
@@ -66,6 +66,8 @@
*
* @see com.thoughtworks.xstream.converters.ConverterMatcher#canConvert(java.lang.Class)
*/
+ // Base API is inherently unchecked
+ @SuppressWarnings("unchecked")
public boolean canConvert(Class clazz) {
return AtomLink.class.equals(clazz);
}
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthDataStore.java Tue Feb 24 20:19:38 2009
@@ -18,14 +18,9 @@
package org.apache.shindig.social.opensocial.oauth;
import com.google.inject.ImplementedBy;
-import com.google.common.base.Preconditions;
-
import org.apache.shindig.auth.SecurityToken;
import org.apache.shindig.social.sample.oauth.SampleOAuthDataStore;
-import java.util.UUID;
-import java.util.Date;
-
import net.oauth.OAuthConsumer;
@ImplementedBy(SampleOAuthDataStore.class)
Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthEntry.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthEntry.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthEntry.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/opensocial/oauth/OAuthEntry.java Tue Feb 24 20:19:38 2009
@@ -17,8 +17,6 @@
*/
package org.apache.shindig.social.opensocial.oauth;
-import com.google.inject.util.Objects;
-
import java.util.Date;
import java.io.Serializable;
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=747535&r1=747534&r2=747535&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 Tue Feb 24 20:19:38 2009
@@ -93,7 +93,8 @@
HandlerPreconditions.requireNotEmpty(userIds, "No userId specified");
HandlerPreconditions.requireSingular(userIds, "Multiple userIds not supported");
- Map<String, String> values = (Map<String,String>) request.getTypedParameter("data", HashMap.class);
+ @SuppressWarnings("unchecked")
+ Map<String, String> values = 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/sample/spi/JsonDbOpensocialService.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/sample/spi/JsonDbOpensocialService.java Tue Feb 24 20:19:38 2009
@@ -317,10 +317,13 @@
}
// TODO: We can use the converter here to do this for us
- Iterator keys = personData.keys();
+
+ // JSONObject keys are always strings
+ @SuppressWarnings("unchecked")
+ Iterator<String> keys = personData.keys();
Map<String, String> data = Maps.newHashMap();
while (keys.hasNext()) {
- String key = (String) keys.next();
+ String key = keys.next();
data.put(key, personData.getString(key));
}
idToData.put(id, data);
@@ -340,9 +343,12 @@
}
JSONObject newPersonData = new JSONObject();
JSONObject oldPersonData = db.getJSONObject(DATA_TABLE).getJSONObject(user);
- Iterator keys = oldPersonData.keys();
+
+ // JSONObject keys are always strings
+ @SuppressWarnings("unchecked")
+ Iterator<String> keys = oldPersonData.keys();
while (keys.hasNext()) {
- String key = (String) keys.next();
+ String key = keys.next();
if (!fields.contains(key)) {
newPersonData.put(key, oldPersonData.getString(key));
}
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/AbstractLargeRestfulTests.java Tue Feb 24 20:19:38 2009
@@ -49,9 +49,6 @@
import java.util.List;
import java.util.Map;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
public abstract class AbstractLargeRestfulTests extends EasyMockTestCase {
protected static final String XMLSCHEMA = " xmlns=\"http://ns.opensocial.org/2008/opensocial\" \n"
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n"
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/dataservice/integration/RestfulJsonActivityTest.java Tue Feb 24 20:19:38 2009
@@ -113,8 +113,10 @@
@Test
public void testCreateActivity() throws Exception {
String postData = "{title : 'hi mom!', body : 'and dad.'}";
- String createResponse = getResponse("/activities/john.doe/@self", "POST", postData, null, "application/json");
+ // Create the activity
+ getResponse("/activities/john.doe/@self", "POST", postData, null, "application/json");
+ // Verify it can be retrieved
String resp = getResponse("/activities/john.doe/@self", "GET", null, "application/json");
JSONObject result = getJson(resp);
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AppDataHandlerTest.java Tue Feb 24 20:19:38 2009
@@ -136,7 +136,7 @@
verify();
}
- private Future setupPostData(String method) throws SocialSpiException {
+ private Future<?> setupPostData(String method) throws SocialSpiException {
String path = "/appdata/john.doe/@self/appId";
RestHandler operation = registry.getRestHandler(path, method);
Modified: incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java?rev=747535&r1=747534&r2=747535&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java (original)
+++ incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanXStreamAtomConverterTest.java Tue Feb 24 20:19:38 2009
@@ -50,10 +50,6 @@
import java.util.Map;
public class BeanXStreamAtomConverterTest extends TestCase {
- private static final String XMLSCHEMA = " xmlns=\"http://ns.opensocial.org/2008/opensocial\" \n"
- + " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n"
- + " xsi:schemaLocation=\"http://ns.opensocial.org/2008/opensocial classpath:opensocial.xsd\" ";
- private static final String XSDRESOURCE = "opensocial.xsd";
private Person johnDoe;
private Activity activity;