[Practicalxml-commits] SF.net SVN: practicalxml:[172] branches/dev-1.1/src
Brought to you by:
kdgregory
Menu
▾
▴
[Practicalxml-commits] SF.net SVN: practicalxml:[172] branches/dev-1.1/src
|
From: Auto-Generated S. C. M. <pra...@li...> - 2009-10-26 15:04:02
|
Revision: 172
http://practicalxml.svn.sourceforge.net/practicalxml/?rev=172&view=rev
Author: kdgregory
Date: 2009-10-26 15:03:54 +0000 (Mon, 26 Oct 2009)
Log Message:
-----------
rename internal functions
Modified Paths:
--------------
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/Xml2BeanConverter.java
branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/internal/JavaConversionUtils.java
branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/internal/TestJavaConversionUtils.java
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-10-24 18:46:31 UTC (rev 171)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Bean2XmlConverter.java 2009-10-26 15:03:54 UTC (rev 172)
@@ -154,7 +154,7 @@
appender.appendValue(
name,
JavaConversionUtils.java2XsiType(obj),
- JavaConversionUtils.java2String(obj, _useXsdFormatting));
+ JavaConversionUtils.stringify(obj, _useXsdFormatting));
}
Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanConverter.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanConverter.java 2009-10-24 18:46:31 UTC (rev 171)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/bean/Xml2BeanConverter.java 2009-10-26 15:03:54 UTC (rev 172)
@@ -131,7 +131,7 @@
if (hasElementChildren(elem))
throw new ConversionException("expecting primitive; has children", elem);
- return JavaConversionUtils.string2Java(getText(elem), klass, _useXsdFormat);
+ return JavaConversionUtils.parse(getText(elem), klass, _useXsdFormat);
}
Modified: branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/internal/JavaConversionUtils.java
===================================================================
--- branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/internal/JavaConversionUtils.java 2009-10-24 18:46:31 UTC (rev 171)
+++ branches/dev-1.1/src/main/java/net/sf/practicalxml/converter/internal/JavaConversionUtils.java 2009-10-26 15:03:54 UTC (rev 172)
@@ -245,7 +245,7 @@
* @throws ConversionException if the passed object does not have a string
* representation (ie, is not a primitive value).
*/
- public static String java2String(Object value, boolean useXsdFormat)
+ public static String stringify(Object value, boolean useXsdFormat)
{
if (value == null)
return null;
@@ -278,7 +278,7 @@
*
* @throws ConversionException if unable to parse.
*/
- public static Object string2Java(String value, Class<?> klass, boolean useXsdFormat)
+ public static Object parse(String value, Class<?> klass, boolean useXsdFormat)
{
if (value == null)
return null;
Modified: branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/internal/TestJavaConversionUtils.java
===================================================================
--- branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/internal/TestJavaConversionUtils.java 2009-10-24 18:46:31 UTC (rev 171)
+++ branches/dev-1.1/src/test/java/net/sf/practicalxml/converter/internal/TestJavaConversionUtils.java 2009-10-26 15:03:54 UTC (rev 172)
@@ -41,7 +41,7 @@
{
try
{
- JavaConversionUtils.string2Java(str, klass, useXsdFormat);
+ JavaConversionUtils.parse(str, klass, useXsdFormat);
fail(message);
}
catch (ConversionException ee)
@@ -81,8 +81,8 @@
public void testConvertNull() throws Exception
{
- assertNull(JavaConversionUtils.java2String(null, false));
- assertNull(JavaConversionUtils.string2Java(null, Object.class, false));
+ assertNull(JavaConversionUtils.stringify(null, false));
+ assertNull(JavaConversionUtils.parse(null, Object.class, false));
}
@@ -90,11 +90,11 @@
{
assertEquals("xsd:string", JavaConversionUtils.java2XsiType(String.class));
- assertEquals("foo", JavaConversionUtils.java2String("foo", false));
- assertEquals("foo", JavaConversionUtils.string2Java("foo", String.class, false));
+ assertEquals("foo", JavaConversionUtils.stringify("foo", false));
+ assertEquals("foo", JavaConversionUtils.parse("foo", String.class, false));
- assertEquals("", JavaConversionUtils.java2String("", false));
- assertEquals("", JavaConversionUtils.string2Java("", String.class, false));
+ assertEquals("", JavaConversionUtils.stringify("", false));
+ assertEquals("", JavaConversionUtils.parse("", String.class, false));
}
@@ -103,12 +103,12 @@
assertEquals("xsd:string", JavaConversionUtils.java2XsiType(Character.class));
Character simple = Character.valueOf('A');
- assertEquals("A", JavaConversionUtils.java2String(simple, false));
- assertEquals(simple, JavaConversionUtils.string2Java("A", Character.class, false));
+ assertEquals("A", JavaConversionUtils.stringify(simple, false));
+ assertEquals(simple, JavaConversionUtils.parse("A", Character.class, false));
Character nul = Character.valueOf('\0');
- assertEquals("", JavaConversionUtils.java2String(nul, false));
- assertEquals(nul, JavaConversionUtils.string2Java("", Character.class, false));
+ assertEquals("", JavaConversionUtils.stringify(nul, false));
+ assertEquals(nul, JavaConversionUtils.parse("", Character.class, false));
assertFailsConversionToObject(
"converted multi-character string",
@@ -122,15 +122,15 @@
assertEquals("xsd:boolean", JavaConversionUtils.java2XsiType(Boolean.class));
String sTrue = Boolean.TRUE.toString();
- assertEquals(sTrue, JavaConversionUtils.java2String(Boolean.TRUE, false));
- assertEquals(Boolean.TRUE, JavaConversionUtils.string2Java(sTrue, Boolean.class, false));
+ assertEquals(sTrue, JavaConversionUtils.stringify(Boolean.TRUE, false));
+ assertEquals(Boolean.TRUE, JavaConversionUtils.parse(sTrue, Boolean.class, false));
String sFalse = Boolean.FALSE.toString();
- assertEquals(sFalse, JavaConversionUtils.java2String(Boolean.FALSE, false));
- assertEquals(Boolean.FALSE, JavaConversionUtils.string2Java(sFalse, Boolean.class, false));
+ assertEquals(sFalse, JavaConversionUtils.stringify(Boolean.FALSE, false));
+ assertEquals(Boolean.FALSE, JavaConversionUtils.parse(sFalse, Boolean.class, false));
- assertEquals(Boolean.FALSE, JavaConversionUtils.string2Java("ix", Boolean.class, false));
- assertEquals(Boolean.FALSE, JavaConversionUtils.string2Java("", Boolean.class, false));
+ assertEquals(Boolean.FALSE, JavaConversionUtils.parse("ix", Boolean.class, false));
+ assertEquals(Boolean.FALSE, JavaConversionUtils.parse("", Boolean.class, false));
}
@@ -138,13 +138,13 @@
{
assertEquals("xsd:boolean", JavaConversionUtils.java2XsiType(Boolean.class));
- assertEquals("true", JavaConversionUtils.java2String(Boolean.TRUE, true));
- assertEquals(Boolean.TRUE, JavaConversionUtils.string2Java("true", Boolean.class, true));
- assertEquals(Boolean.TRUE, JavaConversionUtils.string2Java("1", Boolean.class, true));
+ assertEquals("true", JavaConversionUtils.stringify(Boolean.TRUE, true));
+ assertEquals(Boolean.TRUE, JavaConversionUtils.parse("true", Boolean.class, true));
+ assertEquals(Boolean.TRUE, JavaConversionUtils.parse("1", Boolean.class, true));
- assertEquals("false", JavaConversionUtils.java2String(Boolean.FALSE, true));
- assertEquals(Boolean.FALSE, JavaConversionUtils.string2Java("false", Boolean.class, true));
- assertEquals(Boolean.FALSE, JavaConversionUtils.string2Java("0", Boolean.class, true));
+ assertEquals("false", JavaConversionUtils.stringify(Boolean.FALSE, true));
+ assertEquals(Boolean.FALSE, JavaConversionUtils.parse("false", Boolean.class, true));
+ assertEquals(Boolean.FALSE, JavaConversionUtils.parse("0", Boolean.class, true));
assertFailsConversionToObject(
"converted multi-character string",
@@ -162,17 +162,17 @@
String str1 = "123";
Byte val1 = Byte.valueOf((byte)123);
- assertEquals(str1, JavaConversionUtils.java2String(val1, false));
- assertEquals(val1, JavaConversionUtils.string2Java(str1, Byte.class, false));
+ assertEquals(str1, JavaConversionUtils.stringify(val1, false));
+ assertEquals(val1, JavaConversionUtils.parse(str1, Byte.class, false));
String str2 = "-123";
Byte val2 = Byte.valueOf((byte)-123);
- assertEquals(str2, JavaConversionUtils.java2String(val2, false));
- assertEquals(val2, JavaConversionUtils.string2Java(str2, Byte.class, false));
+ assertEquals(str2, JavaConversionUtils.stringify(val2, false));
+ assertEquals(val2, JavaConversionUtils.parse(str2, Byte.class, false));
String str3 = " -123 ";
Byte val3 = Byte.valueOf((byte)-123);
- assertEquals(val3, JavaConversionUtils.string2Java(str3, Byte.class, false));
+ assertEquals(val3, JavaConversionUtils.parse(str3, Byte.class, false));
assertFailsConversionToObject(
"converted too-large value",
@@ -198,17 +198,17 @@
String str1 = "12345";
Short val1 = Short.valueOf((short)12345);
- assertEquals(str1, JavaConversionUtils.java2String(val1, false));
- assertEquals(val1, JavaConversionUtils.string2Java(str1, Short.class, false));
+ assertEquals(str1, JavaConversionUtils.stringify(val1, false));
+ assertEquals(val1, JavaConversionUtils.parse(str1, Short.class, false));
String str2 = "-12345";
Short val2 = Short.valueOf((short)-12345);
- assertEquals(str2, JavaConversionUtils.java2String(val2, false));
- assertEquals(val2, JavaConversionUtils.string2Java(str2, Short.class, false));
+ assertEquals(str2, JavaConversionUtils.stringify(val2, false));
+ assertEquals(val2, JavaConversionUtils.parse(str2, Short.class, false));
String str3 = " -12345 ";
Short val3 = Short.valueOf((short)-12345);
- assertEquals(val3, JavaConversionUtils.string2Java(str3, Short.class, false));
+ assertEquals(val3, JavaConversionUtils.parse(str3, Short.class, false));
assertFailsConversionToObject(
"converted too-large value",
@@ -234,17 +234,17 @@
String str1 = "1234567";
Integer val1 = Integer.valueOf(1234567);
- assertEquals(str1, JavaConversionUtils.java2String(val1, false));
- assertEquals(val1, JavaConversionUtils.string2Java(str1, Integer.class, false));
+ assertEquals(str1, JavaConversionUtils.stringify(val1, false));
+ assertEquals(val1, JavaConversionUtils.parse(str1, Integer.class, false));
String str2 = "-1234567";
Integer val2 = Integer.valueOf(-1234567);
- assertEquals(str2, JavaConversionUtils.java2String(val2, false));
- assertEquals(val2, JavaConversionUtils.string2Java(str2, Integer.class, false));
+ assertEquals(str2, JavaConversionUtils.stringify(val2, false));
+ assertEquals(val2, JavaConversionUtils.parse(str2, Integer.class, false));
String str3 = " -1234567 ";
Integer val3 = Integer.valueOf(-1234567);
- assertEquals(val3, JavaConversionUtils.string2Java(str3, Integer.class, false));
+ assertEquals(val3, JavaConversionUtils.parse(str3, Integer.class, false));
assertFailsConversionToObject(
"converted too-large value",
@@ -270,17 +270,17 @@
String str1 = "1234567890";
Long val1 = Long.valueOf(1234567890L);
- assertEquals(str1, JavaConversionUtils.java2String(val1, false));
- assertEquals(val1, JavaConversionUtils.string2Java(str1, Long.class, false));
+ assertEquals(str1, JavaConversionUtils.stringify(val1, false));
+ assertEquals(val1, JavaConversionUtils.parse(str1, Long.class, false));
String str2 = "-1234567890";
Long val2 = Long.valueOf(-1234567890L);
- assertEquals(str2, JavaConversionUtils.java2String(val2, false));
- assertEquals(val2, JavaConversionUtils.string2Java(str2, Long.class, false));
+ assertEquals(str2, JavaConversionUtils.stringify(val2, false));
+ assertEquals(val2, JavaConversionUtils.parse(str2, Long.class, false));
String str3 = " -1234567890 ";
Long val3 = Long.valueOf(-1234567890L);
- assertEquals(val3, JavaConversionUtils.string2Java(str3, Long.class, false));
+ assertEquals(val3, JavaConversionUtils.parse(str3, Long.class, false));
assertFailsConversionToObject(
"converted too-large value",
@@ -308,17 +308,17 @@
// note: for default-format tests, strings are generated from values
Float val1 = Float.valueOf(1234f);
String str1 = val1.toString();
- assertEquals(str1, JavaConversionUtils.java2String(val1, false));
- assertEquals(val1, JavaConversionUtils.string2Java(str1, Float.class, false));
+ assertEquals(str1, JavaConversionUtils.stringify(val1, false));
+ assertEquals(val1, JavaConversionUtils.parse(str1, Float.class, false));
Float val2 = Float.valueOf(-1234f);
String str2 = val2.toString();
- assertEquals(str2, JavaConversionUtils.java2String(val2, false));
- assertEquals(val2, JavaConversionUtils.string2Java(str2, Float.class, false));
+ assertEquals(str2, JavaConversionUtils.stringify(val2, false));
+ assertEquals(val2, JavaConversionUtils.parse(str2, Float.class, false));
String str3 = " -1234.5 ";
Float val3 = Float.valueOf(-1234.5f);
- assertEquals(val3, JavaConversionUtils.string2Java(str3, Float.class, false));
+ assertEquals(val3, JavaConversionUtils.parse(str3, Float.class, false));
assertFailsConversionToObject(
"converted non-numeric value",
@@ -336,17 +336,17 @@
String str1 = "1234.0";
Float val1 = Float.valueOf(1234f);
- assertEquals(str1, JavaConversionUtils.java2String(val1, false));
- assertEquals(val1, JavaConversionUtils.string2Java(str1, Float.class, false));
+ assertEquals(str1, JavaConversionUtils.stringify(val1, false));
+ assertEquals(val1, JavaConversionUtils.parse(str1, Float.class, false));
String str2 = "-1234.0";
Float val2 = Float.valueOf(-1234f);
- assertEquals(str2, JavaConversionUtils.java2String(val2, false));
- assertEquals(val2, JavaConversionUtils.string2Java(str2, Float.class, false));
+ assertEquals(str2, JavaConversionUtils.stringify(val2, false));
+ assertEquals(val2, JavaConversionUtils.parse(str2, Float.class, false));
String str3 = " -1234.5 ";
Float val3 = Float.valueOf(-1234.5f);
- assertEquals(val3, JavaConversionUtils.string2Java(str3, Float.class, false));
+ assertEquals(val3, JavaConversionUtils.parse(str3, Float.class, false));
assertFailsConversionToObject(
"converted non-numeric value",
@@ -366,17 +366,17 @@
// note: for default-format tests, strings are generated from values
Double val1 = Double.valueOf(1234567890.5);
String str1 = val1.toString();
- assertEquals(str1, JavaConversionUtils.java2String(val1, false));
- assertEquals(val1, JavaConversionUtils.string2Java(str1, Double.class, false));
+ assertEquals(str1, JavaConversionUtils.stringify(val1, false));
+ assertEquals(val1, JavaConversionUtils.parse(str1, Double.class, false));
Double val2 = Double.valueOf(-1234567890.1);
String str2 = val2.toString();
- assertEquals(str2, JavaConversionUtils.java2String(val2, false));
- assertEquals(val2, JavaConversionUtils.string2Java(str2, Double.class, false));
+ assertEquals(str2, JavaConversionUtils.stringify(val2, false));
+ assertEquals(val2, JavaConversionUtils.parse(str2, Double.class, false));
String str3 = " -1234.5 ";
Double val3 = Double.valueOf(-1234.5);
- assertEquals(val3, JavaConversionUtils.string2Java(str3, Double.class, false));
+ assertEquals(val3, JavaConversionUtils.parse(str3, Double.class, false));
assertFailsConversionToObject(
"converted non-numeric value",
@@ -395,17 +395,17 @@
// while for XSD-format tests, we want to verify the strings
String str1 = "1234567890.5";
Double val1 = Double.valueOf(1234567890.5);
- assertEquals(str1, JavaConversionUtils.java2String(val1, true));
- assertEquals(val1, JavaConversionUtils.string2Java(str1, Double.class, true));
+ assertEquals(str1, JavaConversionUtils.stringify(val1, true));
+ assertEquals(val1, JavaConversionUtils.parse(str1, Double.class, true));
String str2 = "-1234567890.1";
Double val2 = Double.valueOf(-1234567890.1);
- assertEquals(str2, JavaConversionUtils.java2String(val2, true));
- assertEquals(val2, JavaConversionUtils.string2Java(str2, Double.class, true));
+ assertEquals(str2, JavaConversionUtils.stringify(val2, true));
+ assertEquals(val2, JavaConversionUtils.parse(str2, Double.class, true));
String str3 = " -1234.5 ";
Double val3 = Double.valueOf(-1234.5);
- assertEquals(val3, JavaConversionUtils.string2Java(str3, Double.class, true));
+ assertEquals(val3, JavaConversionUtils.parse(str3, Double.class, true));
assertFailsConversionToObject(
"converted non-numeric value",
@@ -423,13 +423,13 @@
String str1 = "123456789012345678901234567890";
BigInteger val1 = new BigInteger(str1);
- assertEquals(str1, JavaConversionUtils.java2String(val1, false));
- assertEquals(val1, JavaConversionUtils.string2Java(str1, BigInteger.class, false));
+ assertEquals(str1, JavaConversionUtils.stringify(val1, false));
+ assertEquals(val1, JavaConversionUtils.parse(str1, BigInteger.class, false));
String str2 = "-123456789012345678901234567890";
BigInteger val2 = new BigInteger(str2);
- assertEquals(str2, JavaConversionUtils.java2String(val2, false));
- assertEquals(val2, JavaConversionUtils.string2Java(str2, BigInteger.class, false));
+ assertEquals(str2, JavaConversionUtils.stringify(val2, false));
+ assertEquals(val2, JavaConversionUtils.parse(str2, BigInteger.class, false));
assertFailsConversionToObject(
"converted non-integer value",
@@ -451,13 +451,13 @@
String str1 = "12345678901234567890.123456789";
BigDecimal val1 = new BigDecimal(str1);
- assertEquals(str1, JavaConversionUtils.java2String(val1, false));
- assertEquals(val1, JavaConversionUtils.string2Java(str1, BigDecimal.class, false));
+ assertEquals(str1, JavaConversionUtils.stringify(val1, false));
+ assertEquals(val1, JavaConversionUtils.parse(str1, BigDecimal.class, false));
String str2 = "-12345678901234567890.123456789";
BigDecimal val2 = new BigDecimal(str2);
- assertEquals(str2, JavaConversionUtils.java2String(val2, false));
- assertEquals(val2, JavaConversionUtils.string2Java(str2, BigDecimal.class, false));
+ assertEquals(str2, JavaConversionUtils.stringify(val2, false));
+ assertEquals(val2, JavaConversionUtils.parse(str2, BigDecimal.class, false));
assertFailsConversionToObject(
"converted non-numeric value",
@@ -478,8 +478,8 @@
// for default conversion, we create string from value
Date val1 = new Date(1247551703000L);
String str1 = val1.toString();
- assertEquals(str1, JavaConversionUtils.java2String(val1, false));
- assertEquals(val1, JavaConversionUtils.string2Java(str1, Date.class, false));
+ assertEquals(str1, JavaConversionUtils.stringify(val1, false));
+ assertEquals(val1, JavaConversionUtils.parse(str1, Date.class, false));
assertFailsConversionToObject(
@@ -498,8 +498,8 @@
Date val1 = new Date(1247551703000L);
String str1 = "2009-07-14T06:08:23";
- assertEquals(str1, JavaConversionUtils.java2String(val1, true));
- assertEquals(val1, JavaConversionUtils.string2Java(str1, Date.class, true));
+ assertEquals(str1, JavaConversionUtils.stringify(val1, true));
+ assertEquals(val1, JavaConversionUtils.parse(str1, Date.class, true));
assertFailsConversionToObject(
"converted non-date value",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
