[Practicalxml-commits] SF.net SVN: practicalxml:[174] branches/dev-1.1/src

[Auto-Generated S. C. M. <pra...@li...>]

Revision: 174
          http://practicalxml.svn.sourceforge.net/practicalxml/?rev=174&view=rev
Author:   kdgregory
Date:     2009-10-27 19:20:51 +0000 (Tue, 27 Oct 2009)

Log Message:
-----------
Xml2JsonConverter with USE_XSI_TYPE treats List and Set subclasses as arrays

Modified Paths:
--------------
    branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonConverter.java
    branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/json/TestXml2JsonConverter.java

Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonConverter.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonConverter.java	2009-10-27 18:43:03 UTC (rev 173)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/json/Xml2JsonConverter.java	2009-10-27 19:20:51 UTC (rev 174)
@@ -272,6 +272,10 @@
             return false;
         if (klass.isArray())
             return true;
+        if (List.class.isAssignableFrom(klass))
+            return true;
+        if (Set.class.isAssignableFrom(klass))
+            return true;
 
         return false;
     }

Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/json/TestXml2JsonConverter.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/json/TestXml2JsonConverter.java	2009-10-27 18:43:03 UTC (rev 173)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/json/TestXml2JsonConverter.java	2009-10-27 19:20:51 UTC (rev 174)
@@ -13,6 +13,9 @@
 // limitations under the License.
 package net.sf.practicalxml.converter.json;
 
+import java.util.ArrayList;
+import java.util.TreeSet;
+
 import org.w3c.dom.Element;
 
 import net.sf.practicalxml.builder.ElementNode;
@@ -130,6 +133,30 @@
     }
 
 
+    public void testListPerXsiType() throws Exception
+    {
+        convertAndAssert(
+                "{\"value\": [123, 456]}",
+                element("data",
+                    element("value", conversionType("java:" + ArrayList.class.getName()),
+                        element("foo", text("123"), conversionType("xsd:int")),
+                        element("bar", text("456"), conversionType("xsd:int")))),
+                Xml2JsonOptions.USE_XSI_TYPE);
+    }
+
+
+    public void testSetPerXsiType() throws Exception
+    {
+        convertAndAssert(
+                "{\"value\": [123, 456]}",
+                element("data",
+                    element("value", conversionType("java:" + TreeSet.class.getName()),
+                        element("foo", text("123"), conversionType("xsd:int")),
+                        element("bar", text("456"), conversionType("xsd:int")))),
+                Xml2JsonOptions.USE_XSI_TYPE);
+    }
+
+
     public void testEmptyArrayPerXsiType() throws Exception
     {
         convertAndAssert(


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.