Enhanced XPathParser to include new constructor options and type specific evaluators.

Author: cbegin

src/main/java/org/apache/ibatis/builder/xml/XMLConfigBuilder.java

@@ -44,7 +44,7 @@ public XMLConfigBuilder(Reader reader, String environment, Properties props) {
     this.configuration.setVariables(props);
     this.parsed = false;
     this.environment = environment;
-    this.parser = new XPathParser(reader, true, new XMLMapperEntityResolver(), props);
+    this.parser = new XPathParser(reader, true, props, new XMLMapperEntityResolver());
   }
 
   public Configuration parse() {

src/main/java/org/apache/ibatis/builder/xml/XMLMapperBuilder.java

@@ -28,7 +28,7 @@ public XMLMapperBuilder(Reader reader, Configuration configuration, String resou
   public XMLMapperBuilder(Reader reader, Configuration configuration, String resource, Map<String, XNode> sqlFragments) {
     super(configuration);
     this.builderAssistant = new MapperBuilderAssistant(configuration, resource);
-    this.parser = new XPathParser(reader, true, new XMLMapperEntityResolver(), configuration.getVariables());
+    this.parser = new XPathParser(reader, true, configuration.getVariables(), new XMLMapperEntityResolver());
     this.sqlFragments = sqlFragments;
     this.resource = resource;
   }

src/main/java/org/apache/ibatis/parsing/XPathParser.java

@@ -13,6 +13,7 @@
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
 import java.io.Reader;
+import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -25,22 +26,52 @@ public class XPathParser {
   private Properties variables;
   private XPath xpath;
 
-  public XPathParser(Reader reader, boolean validation, EntityResolver entityResolver, Properties variables) {
-    this.validation = validation;
-    this.entityResolver = entityResolver;
-    this.variables = variables;
-    this.document = createDocument(reader);
-    XPathFactory factory = XPathFactory.newInstance();
-    this.xpath = factory.newXPath();
+  public XPathParser(String xml) {
+    commonConstructor(createDocument(new StringReader(xml)), false, null, null);
   }
 
-  public XPathParser(Document document, boolean validation, EntityResolver entityResolver, Properties variables) {
-    this.validation = validation;
-    this.entityResolver = entityResolver;
-    this.variables = variables;
-    this.document = document;
-    XPathFactory factory = XPathFactory.newInstance();
-    this.xpath = factory.newXPath();
+  public XPathParser(Reader reader) {
+    commonConstructor(createDocument(reader), false, null, null);
+  }
+
+  public XPathParser(Document document) {
+    commonConstructor(document, false, null, null);
+  }
+
+  public XPathParser(String xml, boolean validation) {
+    commonConstructor(createDocument(new StringReader(xml)), validation, null, null);
+  }
+
+  public XPathParser(Reader reader, boolean validation) {
+    commonConstructor(createDocument(reader), validation, null, null);
+  }
+
+  public XPathParser(Document document, boolean validation) {
+    commonConstructor(document, validation, null, null);
+  }
+
+  public XPathParser(String xml, boolean validation, Properties variables) {
+    commonConstructor(createDocument(new StringReader(xml)), validation, variables, null);
+  }
+
+  public XPathParser(Reader reader, boolean validation, Properties variables) {
+    commonConstructor(createDocument(reader), validation, variables, null);
+  }
+
+  public XPathParser(Document document, boolean validation, Properties variables) {
+    commonConstructor(document, validation, variables, null);
+  }
+
+  public XPathParser(String xml, boolean validation, Properties variables, EntityResolver entityResolver) {
+    commonConstructor(createDocument(new StringReader(xml)), validation, variables, entityResolver);
+  }
+
+  public XPathParser(Reader reader, boolean validation, Properties variables, EntityResolver entityResolver) {
+    commonConstructor(createDocument(reader), validation, variables, entityResolver);
+  }
+
+  public XPathParser(Document document, boolean validation, Properties variables, EntityResolver entityResolver) {
+    commonConstructor(document, validation, variables, entityResolver);
   }
 
   public void setVariables(Properties variables) {
@@ -65,6 +96,38 @@ public Boolean evalBoolean(Object root, String expression) {
     return (Boolean) evaluate(expression, root, XPathConstants.BOOLEAN);
   }
 
+  public Short evalShort(String expression) {
+    return evalShort(document, expression);
+  }
+
+  public Short evalShort(Object root, String expression) {
+    return Short.valueOf(evalString(root, expression));
+  }
+
+  public Integer evalInteger(String expression) {
+    return evalInteger(document, expression);
+  }
+
+  public Integer evalInteger(Object root, String expression) {
+    return Integer.valueOf(evalString(root, expression));
+  }
+
+  public Long evalLong(String expression) {
+    return evalLong(document, expression);
+  }
+
+  public Long evalLong(Object root, String expression) {
+    return Long.valueOf(evalString(root, expression));
+  }
+
+  public Float evalFloat(String expression) {
+    return evalFloat(document, expression);
+  }
+
+  public Float evalFloat(Object root, String expression) {
+    return Float.valueOf(evalString(root, expression));
+  }
+
   public Double evalDouble(String expression) {
     return evalDouble(document, expression);
   }
@@ -137,4 +200,13 @@ public void warning(SAXParseException exception) throws SAXException {
     }
   }
 
+  private void commonConstructor(Document document, boolean validation, Properties variables, EntityResolver entityResolver) {
+    this.validation = validation;
+    this.entityResolver = entityResolver;
+    this.variables = variables;
+    this.document = document;
+    XPathFactory factory = XPathFactory.newInstance();
+    this.xpath = factory.newXPath();
+  }
+
 }

src/test/java/com/ibatis/common/util/NodeEventParser.java

@@ -51,7 +51,7 @@ public void addNodeletHandler(Object handler) {
   public void parse(Reader reader) throws ParsingException {
     try {
       Document doc = createDocument(reader);
-      xpathParser = new XPathParser(doc,validation,entityResolver,variables);
+      xpathParser = new XPathParser(doc,validation, variables, entityResolver);
       parse(doc.getLastChild());
     } catch (Exception e) {
       throw new ParsingException("Error parsing XML.  Cause: " + e, e);

src/test/java/org/apache/ibatis/parsing/XPathParserTest.java

@@ -13,7 +13,11 @@ public void shouldTestXPathParserMethods() throws Exception {
     String resource = "resources/nodelet_test.xml";
     Reader reader = Resources.getResourceAsReader(resource);
     XPathParser parser = new XPathParser(reader, false, null, null);
-    assertEquals((Double) 5.8d, parser.evalDouble("/employee/height"));
+    assertEquals((long)1970, parser.evalLong("/employee/birth_date/year"));
+    assertEquals((short)6, parser.evalShort("/employee/birth_date/month"));
+    assertEquals(15, parser.evalInteger("/employee/birth_date/day"));
+    assertEquals(5.8f, parser.evalFloat("/employee/height"));
+    assertEquals(5.8d, parser.evalDouble("/employee/height"));
     assertEquals("${id_var}", parser.evalString("/employee/@id"));
     assertEquals(Boolean.TRUE, parser.evalBoolean("/employee/active"));
     assertEquals("<id>${id_var}</id>", parser.evalNode("/employee/@id").toString().trim());