Fixed use of the XPath text() function which would truncate long text strings. Added a unit test to prove the point.

Author: Eric/Terry

src/main/java/com/t11e/discovery/datatool/ConfigurationManager.java

@@ -218,9 +218,9 @@ private GenericApplicationContext createApplicationContext(final InputStream is)
       final Class<Driver> clazz = loadDataSource(node.valueOf("@class"), node.valueOf("@jar"));
       final BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(SimpleDriverDataSource.class);
       builder.addPropertyValue("driverClass", clazz);
-      builder.addPropertyValue("url", node.valueOf("c:url/text()".replace("c:", ns)));
-      addPropertyIfExists(builder, "username", node, "c:username/text()".replace("c:", ns));
-      addPropertyIfExists(builder, "password", node, "c:password/text()".replace("c:", ns));
+      builder.addPropertyValue("url", node.valueOf("c:url".replace("c:", ns)));
+      addPropertyIfExists(builder, "username", node, "c:username".replace("c:", ns));
+      addPropertyIfExists(builder, "password", node, "c:password".replace("c:", ns));
       {
         final Map<String, String> properties = new HashMap<String, String>();
         for (final Node child : (List<Node>) node.selectNodes("c:properties/*".replace("c:", ns)))
@@ -239,11 +239,11 @@ private GenericApplicationContext createApplicationContext(final InputStream is)
     {
       final BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(SqlChangesetProfileService.class);
       builder.addPropertyReference("dataSource", "dataSource-" + node.valueOf("@dataSource"));
-      builder.addPropertyValue("createSql", node.valueOf("c:createSql/text()".replace("c:", ns)));
+      builder.addPropertyValue("createSql", node.valueOf("c:createSql".replace("c:", ns)));
       builder.addPropertyValue("retrieveStartColumn", node.valueOf("c:retrieveSql/@startColumn".replace("c:", ns)));
       builder.addPropertyValue("retrieveEndColumn", node.valueOf("c:retrieveSql/@endColumn".replace("c:", ns)));
-      builder.addPropertyValue("retrieveSql", node.valueOf("c:retrieveSql/text()".replace("c:", ns)));
-      builder.addPropertyValue("updateSql", node.valueOf("c:updateSql/text()".replace("c:", ns)));
+      builder.addPropertyValue("retrieveSql", node.valueOf("c:retrieveSql".replace("c:", ns)));
+      builder.addPropertyValue("updateSql", node.valueOf("c:updateSql".replace("c:", ns)));
       applicationContext.registerBeanDefinition("profile-" + node.valueOf("@name"), builder.getBeanDefinition());
     }
 

src/test/java/com/t11e/discovery/datatool/Dom4JTest.java

@@ -0,0 +1,41 @@
+package com.t11e.discovery.datatool;
+
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.io.SAXReader;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class Dom4JTest
+{
+  @Test
+  public void testCharacterReading()
+    throws DocumentException
+  {
+    final SAXReader saxReader = new SAXReader();
+    final Document doc =
+      saxReader.read(getClass().getResourceAsStream("Dom4JTest.xml"));
+    Assert.assertEquals(
+      "abc",
+      doc.valueOf("/test/one-line"));
+    Assert.assertEquals(
+      "\nabc\ndef",
+      doc.valueOf("/test/two-lines"));
+    Assert.assertEquals(
+      "\nThere was a young rustic named Mallory,\n" +
+      "who drew but a very small salary.\n" +
+      "When he went to the show,\n" +
+      "his purse made him go\n" +
+      "to a seat in the uppermost gallery.\n" +
+      "Tune, wont you come to Limerick.",
+      doc.valueOf("/test/many-lines"));
+    Assert.assertFalse(
+      ("\nThere was a young rustic named Mallory,\n" +
+      "who drew but a very small salary.\n" +
+      "When he went to the show,\n" +
+      "his purse made him go\n" +
+      "to a seat in the uppermost gallery.\n" +
+      "Tune, wont you come to Limerick.")
+      .equals(doc.valueOf("/test/many-lines/text()")));
+  }
+}

src/test/java/com/t11e/discovery/datatool/Dom4JTest.xml

@@ -0,0 +1,13 @@
+<test>
+  <one-line>abc</one-line>
+  <two-lines>
+abc
+def</two-lines>
+  <many-lines>
+There was a young rustic named Mallory,
+who drew but a very small salary.
+When he went to the show,
+his purse made him go
+to a seat in the uppermost gallery.
+Tune, wont you come to Limerick.</many-lines>
+</test>