Minor optimization on TrimSqlNode and it's subclasses.

Author: harawata

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

@@ -15,12 +15,17 @@
  */
 package org.apache.ibatis.scripting.xmltags;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.apache.ibatis.session.Configuration;
 
 public class SetSqlNode extends TrimSqlNode {
 
+  private static List<String> suffixList = Arrays.asList(",");
+
   public SetSqlNode(Configuration configuration,SqlNode contents) {
-    super(configuration, contents, "SET", null, null, ",");
+    super(configuration, contents, "SET", null, null, suffixList);
   }
 
 }

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

@@ -29,16 +29,20 @@ public class TrimSqlNode implements SqlNode {
   private SqlNode contents;
   private String prefix;
   private String suffix;
-  private List<String> prefixesToOverride = new ArrayList<String>();
-  private List<String> suffixesToOverride = new ArrayList<String>();
+  private List<String> prefixesToOverride;
+  private List<String> suffixesToOverride;
   private Configuration configuration;
 
   public TrimSqlNode(Configuration configuration, SqlNode contents, String prefix, String prefixesToOverride, String suffix, String suffixesToOverride) {
+    this(configuration, contents, prefix, parseOverrides(prefixesToOverride), suffix, parseOverrides(suffixesToOverride));;
+  }
+
+  protected TrimSqlNode(Configuration configuration, SqlNode contents, String prefix, List<String> prefixesToOverride, String suffix, List<String> suffixesToOverride) {
     this.contents = contents;
     this.prefix = prefix;
-    this.prefixesToOverride = parseOverrides(prefixesToOverride);
+    this.prefixesToOverride = prefixesToOverride;
     this.suffix = suffix;
-    this.suffixesToOverride = parseOverrides(suffixesToOverride);
+    this.suffixesToOverride = suffixesToOverride;
     this.configuration = configuration;
   }
 
@@ -49,7 +53,7 @@ public boolean apply(DynamicContext context) {
     return result;
   }
 
-  private List<String> parseOverrides(String overrides) {
+  private static List<String> parseOverrides(String overrides) {
     if (overrides != null) {
       final StringTokenizer parser = new StringTokenizer(overrides, "|", false);
       return new ArrayList<String>() {
@@ -117,10 +121,12 @@ public String getSql() {
     private void applyPrefix(StringBuilder sql, String trimmedUppercaseSql) {
       if (!prefixApplied) {
         prefixApplied = true;
-        for (String toRemove : prefixesToOverride) {
-          if (trimmedUppercaseSql.startsWith(toRemove)) {
-            sql.delete(0, toRemove.trim().length());
-            break;
+        if (prefixesToOverride != null) {
+          for (String toRemove : prefixesToOverride) {
+            if (trimmedUppercaseSql.startsWith(toRemove)) {
+              sql.delete(0, toRemove.trim().length());
+              break;
+            }
           }
         }
         if (prefix != null) {
@@ -133,12 +139,14 @@ private void applyPrefix(StringBuilder sql, String trimmedUppercaseSql) {
     private void applySuffix(StringBuilder sql, String trimmedUppercaseSql) {
       if (!suffixApplied) {
         suffixApplied = true;
-        for (String toRemove : suffixesToOverride) {
-          if (trimmedUppercaseSql.endsWith(toRemove) || trimmedUppercaseSql.endsWith(toRemove.trim())) {
-            int start = sql.length() - toRemove.trim().length();
-            int end = sql.length();
-            sql.delete(start, end);
-            break;
+        if (suffixesToOverride != null) {
+          for (String toRemove : suffixesToOverride) {
+            if (trimmedUppercaseSql.endsWith(toRemove) || trimmedUppercaseSql.endsWith(toRemove.trim())) {
+              int start = sql.length() - toRemove.trim().length();
+              int end = sql.length();
+              sql.delete(start, end);
+              break;
+            }
           }
         }
         if (suffix != null) {

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

@@ -15,13 +15,17 @@
  */
 package org.apache.ibatis.scripting.xmltags;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.apache.ibatis.session.Configuration;
 
 public class WhereSqlNode extends TrimSqlNode {
 
+  private static List<String> prefixList = Arrays.asList("AND ","OR ","AND\n", "OR\n", "AND\r", "OR\r", "AND\t", "OR\t");
+
   public WhereSqlNode(Configuration configuration, SqlNode contents) {
-    super(configuration, contents, "WHERE", "AND |OR |AND\n|OR\n|AND\r|OR\r|AND\t|OR\t", null, null);
+    super(configuration, contents, "WHERE", prefixList, null, null);
   }
 
-
 }