svn commit: r698623 - in /incubator/shindig/trunk/java/social-api/src: main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java

[doll]

Author: doll
Date: Wed Sep 24 09:07:26 2008
New Revision: 698623

URL: http://svn.apache.org/viewvc?rev=698623&view=rev
Log:
SHINDIG-617
Modified patch from Dave Johnson. Adds support for primitive types into 
BeanJsonConverter.


Modified:
    
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
    
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java

Modified: 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java?rev=698623&r1=698622&r2=698623&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/core/util/BeanJsonConverter.java
 Wed Sep 24 09:07:26 2008
@@ -327,13 +327,13 @@
     } else if (expectedType.equals(Date.class)) {
       // Use JODA ISO parsing for the conversion
       value = new DateTime(jsonObject.getString(fieldName)).toDate();
-    } else if (expectedType.equals(Long.class)) {
+    } else if (expectedType.equals(Long.class) || 
expectedType.equals(Long.TYPE)) {
       value = jsonObject.getLong(fieldName);
-    } else if (expectedType.equals(Integer.class)) {
+    } else if (expectedType.equals(Integer.class) || 
expectedType.equals(Integer.TYPE)) {
       value = jsonObject.getInt(fieldName);
-    } else if (expectedType.equals(Boolean.class)) {
+    } else if (expectedType.equals(Boolean.class) || 
expectedType.equals(Boolean.TYPE)) {
       value = jsonObject.getBoolean(fieldName);
-    } else if (expectedType.equals(Float.class)) {
+    } else if (expectedType.equals(Float.class) || 
expectedType.equals(Float.TYPE)) {
       String stringFloat = jsonObject.getString(fieldName);
       value = new Float(stringFloat);
     } else {

Modified: 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java?rev=698623&r1=698622&r2=698623&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
 (original)
+++ 
incubator/shindig/trunk/java/social-api/src/test/java/org/apache/shindig/social/opensocial/util/BeanJsonConverterTest.java
 Wed Sep 24 09:07:26 2008
@@ -226,11 +226,12 @@
   }
 
   public void testJsonToPerson() throws Exception {
-    String jsonPerson = "{age : '10', hasApp : 'true'}";
+    String jsonPerson = "{age : '10', hasApp : 'true', isViewer : 'true'}";
     Person result = beanJsonConverter.convertToObject(jsonPerson, 
Person.class);
 
     assertEquals(10, result.getAge().intValue());
     assertEquals(true, result.getHasApp().booleanValue());
+    assertEquals(true, result.getIsViewer());
   }
 
 }