[Practicalxml-commits] SF.net SVN: practicalxml:[114] branches/dev-1.1/src
Brought to you by:
kdgregory
Menu
▾
▴
[Practicalxml-commits] SF.net SVN: practicalxml:[114] branches/dev-1.1/src
|
From: Auto-Generated S. C. M. <pra...@li...> - 2009-08-18 18:10:51
|
Revision: 114
http://practicalxml.svn.sourceforge.net/practicalxml/?rev=114&view=rev
Author: kdgregory
Date: 2009-08-18 18:10:39 +0000 (Tue, 18 Aug 2009)
Log Message:
-----------
rename conversion options; remove unused options
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/Bean2XmlDriver.java
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/Xml2BeanOptions.java
branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/TestBean2XmlAppenders.java
branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/TestBean2XmlDriver.java
branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/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-08-18 17:57:48 UTC (rev 113)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlAppenders.java 2009-08-18 18:10:39 UTC (rev 114)
@@ -93,7 +93,7 @@
protected void setType(Element elem, String type)
{
- if (isOptionSet(Bean2XmlOptions.XSI_TYPE))
+ if (isOptionSet(Bean2XmlOptions.ADD_XSI_TYPE))
elem.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "type", type);
}
Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlDriver.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlDriver.java 2009-08-18 17:57:48 UTC (rev 113)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlDriver.java 2009-08-18 18:10:39 UTC (rev 114)
@@ -114,7 +114,7 @@
private boolean shouldUseXsdFormatting()
{
return _options.contains(Bean2XmlOptions.XSD_FORMAT)
- || _options.contains(Bean2XmlOptions.XSI_TYPE);
+ || _options.contains(Bean2XmlOptions.ADD_XSI_TYPE);
}
@@ -143,7 +143,7 @@
private void doXsiNamespaceHack(Element root)
{
if (_options.contains(Bean2XmlOptions.XSI_NIL)
- && !_options.contains(Bean2XmlOptions.XSI_TYPE))
+ && !_options.contains(Bean2XmlOptions.ADD_XSI_TYPE))
{
root.setAttributeNS(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, "nil", "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-08-18 17:57:48 UTC (rev 113)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlOptions.java 2009-08-18 18:10:39 UTC (rev 114)
@@ -17,39 +17,40 @@
/**
* Options used by {@link Bean2XmlHandler} to control the structure of the
- * DOM tree.
+ * generated DOM tree.
*/
public enum Bean2XmlOptions
{
/**
- * 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,
-
- /**
* 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:XXX</code>", where XXX is the XSD type name. For complex
- * types, this attribute's value will be "<code>java:XXX</code>", where
- * XXX is the fully-qualified classname.
+ * "<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>.
*/
- XSI_TYPE,
+ ADD_XSI_TYPE,
/**
- * Report null values using the <code>xsi:nil="true"</code> attribute. If
- * not present, null values are ignored, and not added to DOM tree.
+ * 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.
*/
+ INTROSPECT_MAPS,
+
+ /**
+ * 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.
+ */
XSI_NIL,
/**
- * 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.
+ * 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.
*/
- INTROSPECT_MAPS
+ XSD_FORMAT
}
Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanOptions.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanOptions.java 2009-08-18 17:57:48 UTC (rev 113)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanOptions.java 2009-08-18 18:10:39 UTC (rev 114)
@@ -29,13 +29,11 @@
*/
CONVERT_BLANK_AS_NULL,
-
/**
* Expect data (in particular, dates) to be formatted per XML Schema spec.
*/
EXPECT_XSD_FORMAT,
-
/**
* If present, the converter ignores elements that don't correspond to
* settable properties of the bean.
@@ -44,21 +42,12 @@
/**
- * If present, the converter will look for a setter method taking a
- * <code>String</code>, in preference to a non-string method returned
- * from the bean introspector.
- */
- PREFER_STRING_SETTER,
-
-
- /**
* If present, the converter requires an <code>xsi:nil</code> attribute
* on any empty nodes, and will throw if it's not present. Default is to
* treat empty nodes as <code>null</code>.
*/
REQUIRE_XSI_NIL,
-
/**
* If present, the converter requires an <code>xsi:type</code> attribute
* on each element, and will throw if it's not present. Default behavior
Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/TestBean2XmlAppenders.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/TestBean2XmlAppenders.java 2009-08-18 17:57:48 UTC (rev 113)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/TestBean2XmlAppenders.java 2009-08-18 18:10:39 UTC (rev 114)
@@ -72,7 +72,7 @@
{
Element root = DomUtil.newDocument("root");
- Appender appender = new BasicAppender(root, useOptions(Bean2XmlOptions.XSI_TYPE));
+ Appender appender = new BasicAppender(root, useOptions(Bean2XmlOptions.ADD_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.XSI_TYPE));
+ Appender appender = new BasicAppender(root, useOptions(Bean2XmlOptions.ADD_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.XSI_TYPE));
+ Appender appender = new DirectAppender(root, useOptions(Bean2XmlOptions.ADD_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.XSI_TYPE));
+ Appender appender = new DirectAppender(root, useOptions(Bean2XmlOptions.ADD_XSI_TYPE));
Element child0 = appender.appendContainer("foo", "bar");
assertSame(root, child0);
Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/TestBean2XmlDriver.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/TestBean2XmlDriver.java 2009-08-18 17:57:48 UTC (rev 113)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/TestBean2XmlDriver.java 2009-08-18 18:10:39 UTC (rev 114)
@@ -128,7 +128,7 @@
public void testConvertPrimitivesWithXsiType() throws Exception
{
- Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.XSI_TYPE);
+ Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.ADD_XSI_TYPE);
for (int idx = 0 ; idx < PRIMITIVE_VALUES.length ; idx++)
{
PrimitiveValue value = PRIMITIVE_VALUES[idx];
@@ -164,7 +164,7 @@
public void testConvertPrimitiveArrayWithXsiType() throws Exception
{
- Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.XSI_TYPE);
+ Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.ADD_XSI_TYPE);
int[] data = new int[] { 1, 2, 3 };
Element root = driver.convert(data, "test");
@@ -188,7 +188,7 @@
public void testConvertStringArrayWithXsiType() throws Exception
{
- Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.XSI_TYPE);
+ Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.ADD_XSI_TYPE);
String[] data = new String[] { "foo", "bar", "baz" };
Element root = driver.convert(data, "test");
@@ -212,7 +212,7 @@
public void testConvertStringListWithXsiType() throws Exception
{
- Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.XSI_TYPE);
+ Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.ADD_XSI_TYPE);
List<String> data = new ArrayList<String>();
data.add("foo");
@@ -240,7 +240,7 @@
public void testConvertStringSetWithXsiType() throws Exception
{
- Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.XSI_TYPE);
+ Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.ADD_XSI_TYPE);
// TreeSet means that the data will be re-ordered
Set<String> data = new TreeSet<String>();
@@ -269,7 +269,7 @@
public void testConvertMapDefaultWithXsiType() throws Exception
{
- Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.XSI_TYPE);
+ Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.ADD_XSI_TYPE);
// TreeMap means that the data will be re-ordered
Map<String,Integer> data = new TreeMap<String,Integer>();
@@ -294,7 +294,7 @@
public void testConvertMapIntrospectWithXsiType() throws Exception
{
- Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.INTROSPECT_MAPS, Bean2XmlOptions.XSI_TYPE);
+ Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.INTROSPECT_MAPS, Bean2XmlOptions.ADD_XSI_TYPE);
// TreeMap means that the data will be re-ordered
Map<String,Integer> data = new TreeMap<String,Integer>();
@@ -335,7 +335,7 @@
public void testConvertSimpleBeanWithXsiType() throws Exception
{
- Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.XSI_TYPE);
+ Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.ADD_XSI_TYPE);
SimpleBean bean = new SimpleBean("zippy", 123, new BigDecimal("456.78"), true);
Element root = driver.convert(bean, "test");
@@ -383,7 +383,7 @@
public void testConvertSimpleBeanXsiNilAndXsiType() throws Exception
{
- Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.XSI_NIL, Bean2XmlOptions.XSI_TYPE);
+ Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.XSI_NIL, Bean2XmlOptions.ADD_XSI_TYPE);
SimpleBean bean = new SimpleBean(null, 123, null, true);
Element root = driver.convert(bean, "test");
@@ -399,7 +399,7 @@
public void testConvertBeanArrayWithXsiType() throws Exception
{
- Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.XSI_TYPE);
+ Bean2XmlDriver driver = new Bean2XmlDriver(Bean2XmlOptions.ADD_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/TestBeanConverter.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/TestBeanConverter.java 2009-08-18 17:57:48 UTC (rev 113)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/TestBeanConverter.java 2009-08-18 18:10:39 UTC (rev 114)
@@ -216,7 +216,7 @@
List<Integer> data = Arrays.asList(1, 2, 3);
assert(data.get(0) instanceof Integer);
- BeanConverter outConverter = new BeanConverter(Bean2XmlOptions.XSI_TYPE);
+ BeanConverter outConverter = new BeanConverter(Bean2XmlOptions.ADD_XSI_TYPE);
BeanConverter inConverter = new BeanConverter();
Element root = outConverter.convertToXml(data, "test");
@@ -311,7 +311,7 @@
{
SimpleBean data = new SimpleBean("abc", 123, new BigDecimal("456.789"), true);
- BeanConverter outconverter1 = new BeanConverter(Bean2XmlOptions.XSI_TYPE);
+ BeanConverter outconverter1 = new BeanConverter(Bean2XmlOptions.ADD_XSI_TYPE);
BeanConverter outconverter2 = new BeanConverter();
BeanConverter inConverter = new BeanConverter(Xml2BeanOptions.REQUIRE_XSI_TYPE);
@@ -335,7 +335,7 @@
SimpleBean bean2 = new SimpleBean("zyx", 987, null, false);
List<SimpleBean> data = Arrays.asList(bean1, bean2);
- BeanConverter outConverter = new BeanConverter(Bean2XmlOptions.XSI_TYPE);
+ BeanConverter outConverter = new BeanConverter(Bean2XmlOptions.ADD_XSI_TYPE);
BeanConverter inConverter = new BeanConverter();
Element root = outConverter.convertToXml(data, "test");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
