Code cleaning

Author: emacarron

src/main/java/org/apache/ibatis/scripting/defaults/RawLanguageDriver.java

@@ -15,22 +15,11 @@
  */
 package org.apache.ibatis.scripting.defaults;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.ibatis.builder.BuilderException;
-import org.apache.ibatis.executor.parameter.ParameterHandler;
-import org.apache.ibatis.mapping.BoundSql;
-import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.SqlSource;
 import org.apache.ibatis.parsing.XNode;
-import org.apache.ibatis.scripting.LanguageDriver;
-import org.apache.ibatis.scripting.xmltags.MixedSqlNode;
-import org.apache.ibatis.scripting.xmltags.SqlNode;
-import org.apache.ibatis.scripting.xmltags.StaticTextSqlNode;
+import org.apache.ibatis.scripting.xmltags.XMLLanguageDriver;
 import org.apache.ibatis.session.Configuration;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
 /**
  * As of 3.2.4 the default XML language is able to identify static statements
@@ -39,32 +28,26 @@
  * 
  * @since 3.2.0
  */
-public class RawLanguageDriver implements LanguageDriver {
-
-  public ParameterHandler createParameterHandler(MappedStatement mappedStatement, Object parameterObject, BoundSql boundSql) {
-    return new DefaultParameterHandler(mappedStatement, parameterObject, boundSql);
-  }
+public class RawLanguageDriver extends XMLLanguageDriver {
 
+  @Override
   public SqlSource createSqlSource(Configuration configuration, XNode script, Class<?> parameterType) {
-    return new RawSqlSource(configuration, parseXML(script), parameterType);
+    SqlSource source = super.createSqlSource(configuration, script, parameterType);
+    checkIsNotDynamic(source);
+    return source;
   }
 
+  @Override
   public SqlSource createSqlSource(Configuration configuration, String script, Class<?> parameterType) {
-    return new RawSqlSource(configuration, script, parameterType);
+    SqlSource source = super.createSqlSource(configuration, script, parameterType);
+    checkIsNotDynamic(source);
+    return source;
   }
 
-  private static SqlNode parseXML(XNode script) {
-    List<SqlNode> contents = new ArrayList<SqlNode>();
-    NodeList children = script.getNode().getChildNodes();
-    for (int i = 0; i < children.getLength(); i++) {
-      XNode child = script.newXNode(children.item(i));
-      if (child.getNode().getNodeType() == Node.CDATA_SECTION_NODE || child.getNode().getNodeType() == Node.TEXT_NODE) {
-        contents.add(new StaticTextSqlNode(child.getStringBody("")));
-      } else if (child.getNode().getNodeType() == Node.ELEMENT_NODE) {
-        throw new BuilderException("Found an invalid element <" + child.getNode().getNodeName() + "> for RAW language.");
-      }
+  private void checkIsNotDynamic(SqlSource source) {
+    if (!RawSqlSource.class.equals(source.getClass())) {
+      throw new BuilderException("Dynamic content is not allowed when using RAW language");
     }
-    return new MixedSqlNode(contents);
   }
 
 }

src/main/java/org/apache/ibatis/scripting/xmltags/XMLLanguageDriver.java

@@ -15,12 +15,14 @@
  */
 package org.apache.ibatis.scripting.xmltags;
 
+import org.apache.ibatis.builder.xml.XMLMapperEntityResolver;
 import org.apache.ibatis.executor.parameter.ParameterHandler;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.SqlSource;
 import org.apache.ibatis.parsing.PropertyParser;
 import org.apache.ibatis.parsing.XNode;
+import org.apache.ibatis.parsing.XPathParser;
 import org.apache.ibatis.scripting.LanguageDriver;
 import org.apache.ibatis.scripting.defaults.DefaultParameterHandler;
 import org.apache.ibatis.scripting.defaults.RawSqlSource;
@@ -39,8 +41,8 @@ public SqlSource createSqlSource(Configuration configuration, XNode script, Clas
 
   public SqlSource createSqlSource(Configuration configuration, String script, Class<?> parameterType) {
     if (script.startsWith("<script>")) { // issue #3
-      XMLScriptBuilder builder = new XMLScriptBuilder(configuration, script, parameterType);
-      return builder.parseScriptNode();
+      XPathParser parser = new XPathParser(script, false, configuration.getVariables(), new XMLMapperEntityResolver());
+      return createSqlSource(configuration, parser.evalNode("/script"), parameterType);
     } else {
       script = PropertyParser.parse(script, configuration.getVariables()); // issue #127
       TextSqlNode textSqlNode = new TextSqlNode(script);

src/main/java/org/apache/ibatis/scripting/xmltags/XMLScriptBuilder.java

@@ -22,10 +22,8 @@
 
 import org.apache.ibatis.builder.BaseBuilder;
 import org.apache.ibatis.builder.BuilderException;
-import org.apache.ibatis.builder.xml.XMLMapperEntityResolver;
 import org.apache.ibatis.mapping.SqlSource;
 import org.apache.ibatis.parsing.XNode;
-import org.apache.ibatis.parsing.XPathParser;
 import org.apache.ibatis.scripting.defaults.RawSqlSource;
 import org.apache.ibatis.session.Configuration;
 import org.w3c.dom.Node;
@@ -41,23 +39,12 @@ public XMLScriptBuilder(Configuration configuration, XNode context) {
     this(configuration, context, null);
   }
 
-  public XMLScriptBuilder(Configuration configuration, String context) {
-    this(configuration, context, null);
-  }
-
   public XMLScriptBuilder(Configuration configuration, XNode context, Class<?> parameterType) {
     super(configuration);
     this.context = context;
     this.parameterType = parameterType;
   }
 
-  public XMLScriptBuilder(Configuration configuration, String context, Class<?> parameterType) {
-    super(configuration);
-    XPathParser parser = new XPathParser(context, false, configuration.getVariables(), new XMLMapperEntityResolver());
-    this.context = parser.evalNode("/script");
-    this.parameterType = parameterType;
-  }
-  
   public SqlSource parseScriptNode() {
     List<SqlNode> contents = parseDynamicTags(context);
     MixedSqlNode rootSqlNode = new MixedSqlNode(contents);
@@ -75,7 +62,6 @@ private List<SqlNode> parseDynamicTags(XNode node) {
     NodeList children = node.getNode().getChildNodes();
     for (int i = 0; i < children.getLength(); i++) {
       XNode child = node.newXNode(children.item(i));
-      String nodeName = child.getNode().getNodeName();
       if (child.getNode().getNodeType() == Node.CDATA_SECTION_NODE || child.getNode().getNodeType() == Node.TEXT_NODE) {
         String data = child.getStringBody("");
         TextSqlNode textSqlNode = new TextSqlNode(data);
@@ -86,6 +72,7 @@ private List<SqlNode> parseDynamicTags(XNode node) {
           contents.add(new StaticTextSqlNode(data));
         }
       } else if (child.getNode().getNodeType() == Node.ELEMENT_NODE) { // issue #628
+        String nodeName = child.getNode().getNodeName();
         NodeHandler handler = nodeHandlers.get(nodeName);
         if (handler == null) {
           throw new BuilderException("Unknown element <" + nodeName + "> in SQL statement.");