You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wink.apache.org by rf...@apache.org on 2011/03/12 08:12:02 UTC
svn commit: r1080876 - in /incubator/wink/trunk/wink-json4j/src:
main/java/org/apache/wink/json4j/internal/BeanSerializer.java
test/java/org/apache/wink/json4j/tests/XMLTests.java
Author: rfeng
Date: Sat Mar 12 07:12:02 2011
New Revision: 1080876
URL: http://svn.apache.org/viewvc?rev=1080876&view=rev
Log:
Clean up the code to avoid compiler warnings
Modified:
incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/BeanSerializer.java
incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/XMLTests.java
Modified: incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/BeanSerializer.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/BeanSerializer.java?rev=1080876&r1=1080875&r2=1080876&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/BeanSerializer.java (original)
+++ incubator/wink/trunk/wink-json4j/src/main/java/org/apache/wink/json4j/internal/BeanSerializer.java Sat Mar 12 07:12:02 2011
@@ -125,7 +125,7 @@ public class BeanSerializer {
String attr = mName.substring(3, mName.length());
attr = Character.toLowerCase(attr.charAt(0)) + attr.substring(1, attr.length());
try {
- Object val = m.invoke(obj, null);
+ Object val = m.invoke(obj);
if (val == null) {
ja.put(attr, (Object)null);
} else {
@@ -550,7 +550,7 @@ public class BeanSerializer {
}
} else {
try {
- m = clazz.getMethod(setter, null);
+ m = clazz.getMethod(setter); // FIXME: [rfeng] This doesn't make much sense
} catch (NoSuchMethodException nmex){
// Ignore, no setter.
}
Modified: incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/XMLTests.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/XMLTests.java?rev=1080876&r1=1080875&r2=1080876&view=diff
==============================================================================
--- incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/XMLTests.java (original)
+++ incubator/wink/trunk/wink-json4j/src/test/java/org/apache/wink/json4j/tests/XMLTests.java Sat Mar 12 07:12:02 2011
@@ -381,7 +381,7 @@ public class XMLTests extends TestCase {
fos.flush();
fos.close();
- is = fileOut.toURL().openStream();// this.getClass().getClassLoader().getResourceAsStream("json_output/utf8-lowerchar.json");
+ is = fileOut.toURI().toURL().openStream();// this.getClass().getClassLoader().getResourceAsStream("json_output/utf8-lowerchar.json");
JSONObject jObject = new JSONObject(is);
is.close();
String str = (String)jObject.get("hi");
@@ -414,7 +414,7 @@ public class XMLTests extends TestCase {
fos.flush();
fos.close();
- is = fileOut.toURL().openStream(); //this.getClass().getClassLoader().getResourceAsStream("utf8-array.json");
+ is = fileOut.toURI().toURL().openStream(); //this.getClass().getClassLoader().getResourceAsStream("utf8-array.json");
JSONObject jObject = new JSONObject(is);
is.close();
String expected="\u592a\u548c\u6bbf";