[Practicalxml-commits] SF.net SVN: practicalxml:[153] branches/dev-1.1/src
Brought to you by:
kdgregory
Menu
▾
▴
[Practicalxml-commits] SF.net SVN: practicalxml:[153] branches/dev-1.1/src
|
From: Auto-Generated S. C. M. <pra...@li...> - 2009-09-23 21:25:41
|
Revision: 153
http://practicalxml.svn.sourceforge.net/practicalxml/?rev=153&view=rev
Author: kdgregory
Date: 2009-09-23 21:25:10 +0000 (Wed, 23 Sep 2009)
Log Message:
-----------
Bean2XmlOptions: renames
Modified Paths:
--------------
branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlAppenders.java
branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlConverter.java
branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlOptions.java
branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlAppenders.java
branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlConverter.java
branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBeanConverter.java
Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlAppenders.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlAppenders.java 2009-09-23 18:58:50 UTC (rev 152)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlAppenders.java 2009-09-23 21:25:10 UTC (rev 153)
@@ -93,7 +93,7 @@
protected void setType(Element elem, String type)
{
- if (isOptionSet(Bean2XmlOptions.ADD_XSI_TYPE))
+ if (isOptionSet(Bean2XmlOptions.XSI_TYPE))
DomUtilToo.setXsiType(elem, type);
}
Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlConverter.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlConverter.java 2009-09-23 18:58:50 UTC (rev 152)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlConverter.java 2009-09-23 21:25:10 UTC (rev 153)
@@ -114,7 +114,7 @@
private boolean shouldUseXsdFormatting()
{
return _options.contains(Bean2XmlOptions.XSD_FORMAT)
- || _options.contains(Bean2XmlOptions.ADD_XSI_TYPE);
+ || _options.contains(Bean2XmlOptions.XSI_TYPE);
}
@@ -137,7 +137,7 @@
private void doXsiNamespaceHack(Element root)
{
if (_options.contains(Bean2XmlOptions.XSI_NIL)
- && !_options.contains(Bean2XmlOptions.ADD_XSI_TYPE))
+ && !_options.contains(Bean2XmlOptions.XSI_TYPE))
{
DomUtilToo.setXsiNil(root, false);
}
Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlOptions.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlOptions.java 2009-09-23 18:58:50 UTC (rev 152)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlOptions.java 2009-09-23 21:25:10 UTC (rev 153)
@@ -22,17 +22,6 @@
public enum Bean2XmlOptions
{
/**
- * Will add an <code>xsi:type</code> attribute to each element. For values
- * covered by the XML Schema simple types, this attribute's value will be
- * "<code>xsd:TYPE</code>", where TYPE is the XSD type name. For complex
- * types, this attribute's value will be "<code>java:TYPE</code>", where
- * TYPE is the fully-qualified classname.
- * <p>
- * <em>This option implies {@link #XSD_FORMAT} for simple types</em>.
- */
- ADD_XSI_TYPE,
-
- /**
* Output maps in an "introspected" format, where the name of each item
* is the map key (rather than "data"), and the "key" attribute is omitted.
* If any key is not a valid XML identifier, the converter will throw.
@@ -57,6 +46,14 @@
SEQUENCE_NAMED_BY_PARENT,
/**
+ * Outputs values using formats defined by XML Schema, rather than Java's
+ * <code>String.valueOf()</code> method. Note that these formats are not
+ * flagged in the element, so sender and receiver will have to agree on
+ * the format.
+ */
+ XSD_FORMAT,
+
+ /**
* Add null values into the tree, as an element without content, with the
* attribute <code>xsi:nil</code> set to "true". If not present, null
* values are ignored, and not added to DOM tree.
@@ -64,10 +61,13 @@
XSI_NIL,
/**
- * Outputs values using formats defined by XML Schema, rather than Java's
- * <code>String.valueOf()</code> method. Note that these formats are not
- * flagged in the element, so sender and receiver will have to agree on
- * the format.
+ * Will add an <code>xsi:type</code> attribute to each element. For values
+ * covered by the XML Schema simple types, this attribute's value will be
+ * "<code>xsd:TYPE</code>", where TYPE is the XSD type name. For complex
+ * types, this attribute's value will be "<code>java:TYPE</code>", where
+ * TYPE is the fully-qualified classname.
+ * <p>
+ * <em>This option implies {@link #XSD_FORMAT} for simple types</em>.
*/
- XSD_FORMAT
+ XSI_TYPE
}
Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlAppenders.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlAppenders.java 2009-09-23 18:58:50 UTC (rev 152)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlAppenders.java 2009-09-23 21:25:10 UTC (rev 153)
@@ -72,7 +72,7 @@
{
Element root = DomUtil.newDocument("root");
- Appender appender = new BasicAppender(root, useOptions(Bean2XmlOptions.ADD_XSI_TYPE));
+ Appender appender = new BasicAppender(root, useOptions(Bean2XmlOptions.XSI_TYPE));
Element child = appender.appendValue("foo", "bar", "baz");
assertNull(child.getNamespaceURI());
@@ -128,7 +128,7 @@
{
Element root = DomUtil.newDocument("root");
- Appender appender = new BasicAppender(root, useOptions(Bean2XmlOptions.ADD_XSI_TYPE));
+ Appender appender = new BasicAppender(root, useOptions(Bean2XmlOptions.XSI_TYPE));
Element child0 = appender.appendContainer("foo", "bar");
Element child1 = appender.appendContainer("argle", "bargle");
@@ -297,7 +297,7 @@
{
Element root = DomUtil.newDocument("root");
- Appender appender = new DirectAppender(root, useOptions(Bean2XmlOptions.ADD_XSI_TYPE));
+ Appender appender = new DirectAppender(root, useOptions(Bean2XmlOptions.XSI_TYPE));
Element child = appender.appendValue("foo", "bar", "baz");
assertSame(root, child);
@@ -361,7 +361,7 @@
{
Element root = DomUtil.newDocument("root");
- Appender appender = new DirectAppender(root, useOptions(Bean2XmlOptions.ADD_XSI_TYPE));
+ Appender appender = new DirectAppender(root, useOptions(Bean2XmlOptions.XSI_TYPE));
Element child0 = appender.appendContainer("foo", "bar");
assertSame(root, child0);
Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlConverter.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlConverter.java 2009-09-23 18:58:50 UTC (rev 152)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBean2XmlConverter.java 2009-09-23 21:25:10 UTC (rev 153)
@@ -142,7 +142,7 @@
public void testConvertPrimitivesWithXsiType() throws Exception
{
- Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.ADD_XSI_TYPE);
+ Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.XSI_TYPE);
for (int idx = 0 ; idx < PRIMITIVE_VALUES.length ; idx++)
{
PrimitiveValue value = PRIMITIVE_VALUES[idx];
@@ -198,7 +198,7 @@
public void testConvertArrayWithXsiType() throws Exception
{
- Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.ADD_XSI_TYPE);
+ Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.XSI_TYPE);
Object[] data = new Object[] { Integer.valueOf(1), new BigDecimal("2"), "3" };
Element root = driver.convert(data, "test");
@@ -297,7 +297,7 @@
public void testConvertListWithXsiType() throws Exception
{
- Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.ADD_XSI_TYPE);
+ Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.XSI_TYPE);
List<String> data = Arrays.asList("foo", "bar", "baz");
@@ -409,7 +409,7 @@
public void testConvertSetWithXsiType() throws Exception
{
- Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.ADD_XSI_TYPE);
+ Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.XSI_TYPE);
// TreeSet will order output
Set<String> data = new TreeSet<String>();
@@ -481,7 +481,7 @@
public void testConvertMapDefaultWithXsiType() throws Exception
{
- Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.ADD_XSI_TYPE);
+ Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.XSI_TYPE);
// TreeMap means that the data will be re-ordered
Map<String,Integer> data = new TreeMap<String,Integer>();
@@ -506,7 +506,7 @@
public void testConvertMapIntrospectWithXsiType() throws Exception
{
- Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.INTROSPECT_MAPS, Bean2XmlOptions.ADD_XSI_TYPE);
+ Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.INTROSPECT_MAPS, Bean2XmlOptions.XSI_TYPE);
// TreeMap means that the data will be re-ordered
Map<String,Integer> data = new TreeMap<String,Integer>();
@@ -560,7 +560,7 @@
public void testConvertSimpleBeanWithXsiType() throws Exception
{
- Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.ADD_XSI_TYPE);
+ Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.XSI_TYPE);
SimpleBean bean = new SimpleBean("zippy", 123, new BigDecimal("456.78"), true);
Element root = driver.convert(bean, "test");
@@ -608,7 +608,7 @@
public void testConvertSimpleBeanXsiNilAndXsiType() throws Exception
{
- Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.XSI_NIL, Bean2XmlOptions.ADD_XSI_TYPE);
+ Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.XSI_NIL, Bean2XmlOptions.XSI_TYPE);
SimpleBean bean = new SimpleBean(null, 123, null, true);
Element root = driver.convert(bean, "test");
@@ -624,7 +624,7 @@
public void testConvertBeanArrayWithXsiType() throws Exception
{
- Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.ADD_XSI_TYPE);
+ Bean2XmlConverter driver = new Bean2XmlConverter(Bean2XmlOptions.XSI_TYPE);
SimpleBean bean1 = new SimpleBean("foo", 123, new BigDecimal("456.789"), true);
SimpleBean bean2 = new SimpleBean("bar", 456, new BigDecimal("0.0"), false);
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-23 18:58:50 UTC (rev 152)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/bean/TestBeanConverter.java 2009-09-23 21:25:10 UTC (rev 153)
@@ -202,7 +202,7 @@
List<Integer> data = Arrays.asList(1, 2, 3);
assertTrue(data.get(0) instanceof Integer);
- Document dom = BeanConverter.convertToXml(data, "test", Bean2XmlOptions.ADD_XSI_TYPE);
+ Document dom = BeanConverter.convertToXml(data, "test", Bean2XmlOptions.XSI_TYPE);
// System.out.println(OutputUtil.compactString(dom));
List<?> result = BeanConverter.convertToJava(dom, List.class);
@@ -306,7 +306,7 @@
{
SimpleBean data = new SimpleBean("abc", 123, new BigDecimal("456.789"), true);
- Document valid = BeanConverter.convertToXml(data, "test", Bean2XmlOptions.ADD_XSI_TYPE);
+ Document valid = BeanConverter.convertToXml(data, "test", Bean2XmlOptions.XSI_TYPE);
// System.out.println(OutputUtil.compactString(valid));
SimpleBean result = BeanConverter.convertToJava(valid, SimpleBean.class, Xml2BeanOptions.REQUIRE_XSI_TYPE);
@@ -327,7 +327,7 @@
SimpleBean bean2 = new SimpleBean("zyx", 987, null, false);
List<SimpleBean> data = Arrays.asList(bean1, bean2);
- Document dom = BeanConverter.convertToXml(data, "test", Bean2XmlOptions.ADD_XSI_TYPE);
+ Document dom = BeanConverter.convertToXml(data, "test", Bean2XmlOptions.XSI_TYPE);
// System.out.println(OutputUtil.compactString(dom));
List<SimpleBean> result = BeanConverter.convertToJava(dom, List.class);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
