Author: doll
Date: Tue May 20 08:05:31 2008
New Revision: 658271
URL: http://svn.apache.org/viewvc?rev=658271&view=rev
Log:
Fixed random warnings in the social code (mostly in the gross json stuff that
we need to overhaul)
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RestServerServlet.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONFilter.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONStream.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONUtil.java
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONWriter.java
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java?rev=658271&r1=658270&r2=658271&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/GadgetDataServlet.java
Tue May 20 08:05:31 2008
@@ -24,20 +24,18 @@
import org.apache.shindig.social.opensocial.util.BeanJsonConverter;
import com.google.inject.Inject;
-
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* Servlet for handling gadget requests for data. The request accepts one json
* parameter of the format:
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RestServerServlet.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RestServerServlet.java?rev=658271&r1=658270&r2=658271&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RestServerServlet.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/RestServerServlet.java
Tue May 20 08:05:31 2008
@@ -65,17 +65,17 @@
e.printStackTrace();
return null;
}
-
+
//setup my NamedWriter for "json"
getAbdera().getConfiguration().addNamedWriter(new JSONWriter());
-
+
// print all the writers available
- Map<String, NamedWriter> writersMap =
+ Map<String, NamedWriter> writersMap =
getAbdera().getConfiguration().getNamedWriters();
for (NamedWriter writer : writersMap.values()) {
StringBuilder sbuf = new StringBuilder();
for (String s : writer.getOutputFormats()) {
- sbuf.append(s + ", ");
+ sbuf.append(s).append(", ");
}
logger.fine("NamedWriter: " + writer.getClass().getName() +
" is for writing '" + writer.getName() + "'" +
@@ -98,7 +98,7 @@
// all providers should implement initialize() so injection could happen
try {
Method m = provider.getClass().getMethod("initialize", new Class<?>[0]);
- m.invoke(provider, new Object[0]);
+ m.invoke(provider);
} catch (IllegalArgumentException e) {
logger.severe(e.getMessage());
e.printStackTrace();
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java?rev=658271&r1=658270&r2=658271&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/RestServerCollectionAdapter.java
Tue May 20 08:05:31 2008
@@ -26,7 +26,6 @@
import org.apache.shindig.social.opensocial.util.BeanXmlConverter;
import com.google.inject.Inject;
-
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
import org.apache.abdera.protocol.server.ProviderHelper;
@@ -36,7 +35,6 @@
import org.apache.abdera.protocol.server.impl.AbstractCollectionAdapter;
import org.json.JSONException;
-import java.text.Format;
import java.util.Date;
import java.util.List;
import java.util.logging.Logger;
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONFilter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONFilter.java?rev=658271&r1=658270&r2=658271&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONFilter.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONFilter.java
Tue May 20 08:05:31 2008
@@ -17,10 +17,6 @@
*/
package org.apache.shindig.social.abdera.json;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-
import org.apache.abdera.Abdera;
import org.apache.abdera.model.Document;
import org.apache.abdera.model.Element;
@@ -32,8 +28,12 @@
import org.apache.abdera.protocol.server.context.ResponseContextWrapper;
import org.apache.abdera.writer.Writer;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+
/**
- * TODO: This file is copied and modified from Abdera code as we needed
+ * TODO: This file is copied and modified from Abdera code as we needed
* functionality different from the Abdera Json writer code base.
* This file definitely needs cleanup and heavy refactoring
*
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONStream.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONStream.java?rev=658271&r1=658270&r2=658271&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONStream.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONStream.java
Tue May 20 08:05:31 2008
@@ -17,17 +17,16 @@
*/
package org.apache.shindig.social.abdera.json;
+import org.apache.abdera.i18n.iri.IRI;
+import org.apache.abdera.model.AtomDate;
+import org.apache.abdera.util.EntityTag;
+
+import javax.activation.MimeType;
import java.io.IOException;
import java.io.Writer;
import java.util.Date;
import java.util.Stack;
-import javax.activation.MimeType;
-
-import org.apache.abdera.i18n.iri.IRI;
-import org.apache.abdera.model.AtomDate;
-import org.apache.abdera.util.EntityTag;
-
/*
* TODO: This file is copied and modified from Abdera code as we needed
* functionality different from the Abdera Json writer code base.
@@ -241,7 +240,7 @@
default:
if (c < ' ' || c > 127) {
t = "000" + Integer.toHexString(c);
- buf.append("\\u" + t.substring(t.length() - 4));
+ buf.append("\\u").append(t.substring(t.length() - 4));
} else {
buf.append(c);
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONUtil.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONUtil.java?rev=658271&r1=658270&r2=658271&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONUtil.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONUtil.java
Tue May 20 08:05:31 2008
@@ -17,12 +17,6 @@
*/
package org.apache.shindig.social.abdera.json;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
import org.apache.abdera.Abdera;
import org.apache.abdera.ext.bidi.BidiHelper;
import org.apache.abdera.ext.html.HtmlHelper;
@@ -50,6 +44,11 @@
import org.apache.abdera.model.TextValue;
import org.apache.abdera.xpath.XPath;
+import javax.xml.namespace.QName;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.List;
+
/*
* TODO: This file is copied and modified from Abdera code as we needed
* functionality different from the Abdera Json writer code base.
@@ -76,7 +75,7 @@
IRI parentbase = null;
if (element.getParentElement() != null) {
parentbase = element instanceof Document ?
- ((Document)element).getBaseUri() :
+ element.getBaseUri() :
element.getResolvedBaseUri();
}
IRI base = element.getResolvedBaseUri();
@@ -354,7 +353,6 @@
jstream.writeField("type",irt.getMimeType());
jstream.writeField("source",irt.getResolvedSource());
jstream.endObject();
- return;
}
}
Modified:
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONWriter.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONWriter.java?rev=658271&r1=658270&r2=658271&view=diff
==============================================================================
---
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONWriter.java
(original)
+++
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/abdera/json/JSONWriter.java
Tue May 20 08:05:31 2008
@@ -17,17 +17,17 @@
*/
package org.apache.shindig.social.abdera.json;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-
import org.apache.abdera.model.Base;
import org.apache.abdera.util.AbstractNamedWriter;
import org.apache.abdera.util.AbstractWriterOptions;
import org.apache.abdera.writer.NamedWriter;
import org.apache.abdera.writer.WriterOptions;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
/*
* TODO: This file is copied and modified from Abdera code as we needed
* functionality different from the Abdera Json writer code base.
