practicalxml-commits

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

Revision: 130
          http://practicalxml.svn.sourceforge.net/practicalxml/?rev=130&view=rev
Author:   kdgregory
Date:     2009-09-14 23:52:20 +0000 (Mon, 14 Sep 2009)

Log Message:
-----------
BeanConverter: convert to Document, not Element

Modified Paths:
--------------
    branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/BeanConverter.java
    branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBeanConverter.java

Property Changed:
----------------
    branches/dev-1.1/


Property changes on: branches/dev-1.1
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk:128

Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/BeanConverter.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/BeanConverter.java	2009-09-14 23:38:49 UTC (rev 129)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/BeanConverter.java	2009-09-14 23:52:20 UTC (rev 130)
@@ -174,6 +174,7 @@
         _inputDriver = new Xml2BeanDriver();
     }
 
+
     /**
      *  Creates an instance to be used for XML -> Bean conversion.
      */
@@ -197,9 +198,10 @@
      *                      generated document. If a qualified name, all child
      *                      elements will inherit its prefix.
      */
-    public Element convertToXml(Object bean, String nsUri, String rootName)
+    public Document convertToXml(Object bean, String nsUri, String rootName)
     {
-        return _outputDriver.convert(bean, nsUri, rootName);
+        return _outputDriver.convert(bean, nsUri, rootName)
+               .getOwnerDocument();
     }
 
 
@@ -211,9 +213,10 @@
      *   @param rootName    The name given to the root element of the produced
      *                      document.
      */
-    public Element convertToXml(Object bean, String rootName)
+    public Document convertToXml(Object bean, String rootName)
     {
-        return _outputDriver.convert(bean, rootName);
+        return _outputDriver.convert(bean, rootName)
+               .getOwnerDocument();
     }
 
 
@@ -232,7 +235,9 @@
 
 
     /**
-     *  Creates a new Java object from the the passed DOM <code>Element</code>.
+     *  Creates a new Java object from the the passed <code>Element</code>.
+     *  This is useful when a DOM contains a tree of objects and you just
+     *  want to convert one of them.
      *
      *   @param dom         The source element -- this may or may not be the
      *                      root element of its document.

Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBeanConverter.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBeanConverter.java	2009-09-14 23:38:49 UTC (rev 129)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBeanConverter.java	2009-09-14 23:52:20 UTC (rev 130)
@@ -60,11 +60,12 @@
 //----------------------------------------------------------------------------
 
     private static void assertConversionFailure(
-            String message, BeanConverter converter, Element elem, Class<?> klass)
+            String message, BeanConverter converter,
+            Document dom, Class<?> klass)
     {
         try
         {
-            converter.convertToJava(elem, klass);
+            converter.convertToJava(dom, klass);
             fail(message);
         }
         catch (ConversionException ee)
@@ -84,11 +85,12 @@
         BeanConverter inConverter = new BeanConverter();
 
         String obj = "this is a test";
-        Element root = outConverter.convertToXml(obj, "test");
-//            System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(obj, "test");
+//        System.out.println(OutputUtil.compactString(dom));
+        Element root = dom.getDocumentElement();
         assertEquals("test", DomUtil.getLocalName(root));
 
-        Object result = inConverter.convertToJava(root, String.class);
+        Object result = inConverter.convertToJava(dom, String.class);
         assertEquals(obj, result);
     }
 
@@ -101,10 +103,10 @@
         for (PrimitiveValue value : PRIMITIVE_VALUES)
         {
             Object obj = value.getValue();
-            Element root = outConverter.convertToXml(obj, "test");
-//            System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+            Document dom = outConverter.convertToXml(obj, "test");
+//            System.out.println(OutputUtil.compactString(dom));
 
-            Object result = inConverter.convertToJava(root, value.getKlass());
+            Object result = inConverter.convertToJava(dom, value.getKlass());
             assertEquals(obj, result);
         }
     }
@@ -118,10 +120,10 @@
         for (PrimitiveValue value : PRIMITIVE_VALUES)
         {
             Object obj = value.getValue();
-            Element root = outConverter.convertToXml(obj, "test");
-//            System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+            Document dom = outConverter.convertToXml(obj, "test");
+//            System.out.println(OutputUtil.compactString(dom));
 
-            Object result = inConverter.convertToJava(root, value.getKlass());
+            Object result = inConverter.convertToJava(dom, value.getKlass());
             assertEquals(obj, result);
         }
     }
@@ -132,10 +134,10 @@
         BeanConverter outConverter = new BeanConverter();
         BeanConverter inConverter = new BeanConverter();
 
-        Element root = outConverter.convertToXml(null, "test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(null, "test");
+//        System.out.println(OutputUtil.compactString(dom));
 
-        Object result = inConverter.convertToJava(root, String.class);
+        Object result = inConverter.convertToJava(dom, String.class);
         assertNull(result);
     }
 
@@ -145,10 +147,10 @@
         BeanConverter outConverter = new BeanConverter(Bean2XmlOptions.XSI_NIL);
         BeanConverter inConverter = new BeanConverter(Xml2BeanOptions.REQUIRE_XSI_NIL);
 
-        Element root = outConverter.convertToXml(null, "test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(null, "test");
+//        System.out.println(OutputUtil.compactString(dom));
 
-        Object result = inConverter.convertToJava(root, String.class);
+        Object result = inConverter.convertToJava(dom, String.class);
         assertNull(result);
     }
 
@@ -158,11 +160,12 @@
         BeanConverter outConverter = new BeanConverter();
         BeanConverter inConverter = new BeanConverter(Xml2BeanOptions.REQUIRE_XSI_NIL);
 
-        Element root = outConverter.convertToXml(null, "test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(null, "test");
+//        System.out.println(OutputUtil.compactString(dom));
 
-        assertConversionFailure("accepted DOM with null entry but no xsi:nil",
-                              inConverter, root, String.class);
+        assertConversionFailure(
+                "accepted DOM with null entry but no xsi:nil",
+                inConverter, dom, String.class);
     }
 
 
@@ -173,10 +176,10 @@
         BeanConverter outConverter = new BeanConverter();
         BeanConverter inConverter = new BeanConverter();
 
-        Element root = outConverter.convertToXml(data, "test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(data, "test");
+//        System.out.println(OutputUtil.compactString(dom));
 
-        int[] result = inConverter.convertToJava(root, int[].class);
+        int[] result = inConverter.convertToJava(dom, int[].class);
         assertTrue(Arrays.equals(data, result));
     }
 
@@ -188,10 +191,10 @@
         BeanConverter outConverter = new BeanConverter();
         BeanConverter inConverter = new BeanConverter();
 
-        Element root = outConverter.convertToXml(data, "test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(data, "test");
+//        System.out.println(OutputUtil.compactString(dom));
 
-        List<String> result = inConverter.convertToJava(root, List.class);
+        List<String> result = inConverter.convertToJava(dom, List.class);
         assertEquals(data, result);
     }
 
@@ -206,10 +209,10 @@
         BeanConverter outConverter = new BeanConverter();
         BeanConverter inConverter = new BeanConverter();
 
-        Element root = outConverter.convertToXml(data, "test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(data, "test");
+//        System.out.println(OutputUtil.compactString(dom));
 
-        List<?> result = inConverter.convertToJava(root, List.class);
+        List<?> result = inConverter.convertToJava(dom, List.class);
         assertTrue(result instanceof List);
         assertTrue(result.get(0) instanceof String);
     }
@@ -224,10 +227,10 @@
         BeanConverter outConverter = new BeanConverter(Bean2XmlOptions.ADD_XSI_TYPE);
         BeanConverter inConverter = new BeanConverter();
 
-        Element root = outConverter.convertToXml(data, "test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(data, "test");
+//        System.out.println(OutputUtil.compactString(dom));
 
-        List<?> result = inConverter.convertToJava(root, List.class);
+        List<?> result = inConverter.convertToJava(dom, List.class);
         assertEquals(data, result);
     }
 
@@ -240,10 +243,10 @@
         BeanConverter outConverter = new BeanConverter();
         BeanConverter inConverter = new BeanConverter();
 
-        Element root = outConverter.convertToXml(data, "test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(data, "test");
+//        System.out.println(OutputUtil.compactString(dom));
 
-        Set<?> result = inConverter.convertToJava(root, SortedSet.class);
+        Set<?> result = inConverter.convertToJava(dom, SortedSet.class);
         Iterator<?> itx = result.iterator();
         assertEquals("bar", itx.next());
         assertEquals("baz", itx.next());
@@ -262,14 +265,14 @@
         BeanConverter outConverter = new BeanConverter();
         BeanConverter inConverter = new BeanConverter();
 
-        Element root = outConverter.convertToXml(data, "test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(data, "test");
+//        System.out.println(OutputUtil.compactString(dom));
 
-        DomAsserts.assertCount(3, root, "/test/data");
-        DomAsserts.assertCount(1, root, "/test/data[@key='foo']");
-        DomAsserts.assertEquals("argle", root, "/test/data[@key='foo']");
+        DomAsserts.assertCount(3, dom, "/test/data");
+        DomAsserts.assertCount(1, dom, "/test/data[@key='foo']");
+        DomAsserts.assertEquals("argle", dom, "/test/data[@key='foo']");
 
-        Map<?,?> result = inConverter.convertToJava(root, Map.class);
+        Map<?,?> result = inConverter.convertToJava(dom, Map.class);
         assertEquals(data, result);
     }
 
@@ -285,14 +288,14 @@
         BeanConverter outConverter = new BeanConverter(Bean2XmlOptions.INTROSPECT_MAPS);
         BeanConverter inConverter = new BeanConverter();
 
-        Element root = outConverter.convertToXml(data, "test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(data, "test");
+//        System.out.println(OutputUtil.compactString(dom));
 
-        DomAsserts.assertCount(0, root, "/test/data");
-        DomAsserts.assertCount(1, root, "/test/foo");
-        DomAsserts.assertEquals("argle", root, "/test/foo");
+        DomAsserts.assertCount(0, dom, "/test/data");
+        DomAsserts.assertCount(1, dom, "/test/foo");
+        DomAsserts.assertEquals("argle", dom, "/test/foo");
 
-        Map<?,?> result = inConverter.convertToJava(root, Map.class);
+        Map<?,?> result = inConverter.convertToJava(dom, Map.class);
         assertEquals(data, result);
     }
 
@@ -304,10 +307,10 @@
         BeanConverter outConverter = new BeanConverter();
         BeanConverter inConverter = new BeanConverter();
 
-        Element root = outConverter.convertToXml(data, "test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(data, "test");
+//        System.out.println(OutputUtil.compactString(dom));
 
-        SimpleBean result = inConverter.convertToJava(root, SimpleBean.class);
+        SimpleBean result = inConverter.convertToJava(dom, SimpleBean.class);
         data.assertEquals(result);
     }
 
@@ -320,17 +323,18 @@
         BeanConverter outconverter2 = new BeanConverter();
         BeanConverter inConverter = new BeanConverter(Xml2BeanOptions.REQUIRE_XSI_TYPE);
 
-        Element valid = outconverter1.convertToXml(data, "test");
-//        System.out.println(OutputUtil.compactString(valid.getOwnerDocument()));
+        Document valid = outconverter1.convertToXml(data, "test");
+//        System.out.println(OutputUtil.compactString(valid));
 
         SimpleBean result = inConverter.convertToJava(valid, SimpleBean.class);
         data.assertEquals(result);
 
-        Element invalid = outconverter2.convertToXml(data, "test");
-//        System.out.println(OutputUtil.compactString(invalid.getOwnerDocument()));
+        Document invalid = outconverter2.convertToXml(data, "test");
+//        System.out.println(OutputUtil.compactString(invalid));
 
-        assertConversionFailure("converter requiring xsi:type accepted XML without",
-                              inConverter, invalid, SimpleBean.class);
+        assertConversionFailure(
+                "converter requiring xsi:type accepted XML without",
+                inConverter, invalid, SimpleBean.class);
     }
 
 
@@ -343,10 +347,10 @@
         BeanConverter outConverter = new BeanConverter(Bean2XmlOptions.ADD_XSI_TYPE);
         BeanConverter inConverter = new BeanConverter();
 
-        Element root = outConverter.convertToXml(data, "test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(data, "test");
+//        System.out.println(OutputUtil.compactString(dom));
 
-        List<SimpleBean> result = inConverter.convertToJava(root, List.class);
+        List<SimpleBean> result = inConverter.convertToJava(dom, List.class);
         assertEquals(2, result.size());
         bean1.assertEquals(result.get(0));
         bean2.assertEquals(result.get(1));
@@ -364,10 +368,10 @@
         BeanConverter outConverter = new BeanConverter();
         BeanConverter inConverter = new BeanConverter();
 
-        Element root = outConverter.convertToXml(data, "test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(data, "test");
+//        System.out.println(OutputUtil.compactString(dom));
 
-        SimpleBean[] result = inConverter.convertToJava(root, SimpleBean[].class);
+        SimpleBean[] result = inConverter.convertToJava(dom, SimpleBean[].class);
         assertEquals(2, result.length);
         bean1.assertEquals(result[0]);
         bean2.assertEquals(result[1]);
@@ -384,10 +388,10 @@
         BeanConverter outConverter = new BeanConverter();
         BeanConverter inConverter = new BeanConverter();
 
-        Element root = outConverter.convertToXml(data, "test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(data, "test");
+//        System.out.println(OutputUtil.compactString(dom));
 
-        CompoundBean result = inConverter.convertToJava(root, CompoundBean.class);
+        CompoundBean result = inConverter.convertToJava(dom, CompoundBean.class);
         data.assertEquals(result);
     }
 
@@ -399,29 +403,14 @@
         BeanConverter outConverter = new BeanConverter();
         BeanConverter inConverter = new BeanConverter();
 
-        Element root = outConverter.convertToXml(data, "urn:foo", "bar:test");
-//        System.out.println(OutputUtil.compactString(root.getOwnerDocument()));
+        Document dom = outConverter.convertToXml(data, "urn:foo", "bar:test");
+//        System.out.println(OutputUtil.compactString(dom));
 
+        Element root = dom.getDocumentElement();
         Element child = DomUtil.getChild(root, "sval");
         assertEquals("urn:foo", child.getNamespaceURI());
         assertEquals("bar", child.getPrefix());
 
-        SimpleBean result = inConverter.convertToJava(root, SimpleBean.class);
-        data.assertEquals(result);
-    }
-
-
-    // this one is here just for coverage
-    public void testSimpleBeanFromDocument() throws Exception
-    {
-        SimpleBean data = new SimpleBean("abc", 123, new BigDecimal("456.789"), true);
-
-        BeanConverter outConverter = new BeanConverter();
-        BeanConverter inConverter = new BeanConverter();
-
-        Document dom = outConverter.convertToXml(data, "test").getOwnerDocument();
-//        System.out.println(OutputUtil.compactString(dom));
-
         SimpleBean result = inConverter.convertToJava(dom, SimpleBean.class);
         data.assertEquals(result);
     }


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