Moved the method to SqlSourceBuilder and removed trim() call

Author: harawata

src/main/java/org/apache/ibatis/builder/SqlSourceBuilder.java

@@ -18,11 +18,11 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.StringTokenizer;
 
 import org.apache.ibatis.mapping.ParameterMapping;
 import org.apache.ibatis.mapping.SqlSource;
 import org.apache.ibatis.parsing.GenericTokenParser;
-import org.apache.ibatis.parsing.StringParser;
 import org.apache.ibatis.parsing.TokenHandler;
 import org.apache.ibatis.reflection.MetaClass;
 import org.apache.ibatis.reflection.MetaObject;
@@ -45,13 +45,27 @@ public SqlSource parse(String originalSql, Class<?> parameterType, Map<String, O
     GenericTokenParser parser = new GenericTokenParser("#{", "}", handler);
     String sql;
     if (configuration.isShrinkWhitespacesInSql()) {
-      sql = parser.parse(StringParser.removeBreakingWhitespace(originalSql));
+      sql = parser.parse(removeExtraWhitespaces(originalSql));
     } else {
       sql = parser.parse(originalSql);
     }
     return new StaticSqlSource(configuration, sql, handler.getParameterMappings());
   }
 
+  public static String removeExtraWhitespaces(String original) {
+    StringTokenizer tokenizer = new StringTokenizer(original);
+    StringBuilder builder = new StringBuilder();
+    boolean hasMoreTokens = tokenizer.hasMoreTokens();
+    while (hasMoreTokens) {
+      builder.append(tokenizer.nextToken());
+      hasMoreTokens = tokenizer.hasMoreTokens();
+      if (hasMoreTokens) {
+        builder.append(' ');
+      }
+    }
+    return builder.toString();
+  }
+
   private static class ParameterMappingTokenHandler extends BaseBuilder implements TokenHandler {
 
     private List<ParameterMapping> parameterMappings = new ArrayList<>();

src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java

@@ -28,8 +28,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.apache.ibatis.builder.SqlSourceBuilder;
 import org.apache.ibatis.logging.Log;
-import org.apache.ibatis.parsing.StringParser;
 import org.apache.ibatis.reflection.ArrayUtil;
 
 /**
@@ -120,8 +120,8 @@ protected void clearColumnInfo() {
     columnValues.clear();
   }
 
-  protected String removeBreakingWhitespace(String original) {
-    return StringParser.removeBreakingWhitespace(original);
+  protected String removeExtraWhitespace(String original) {
+    return SqlSourceBuilder.removeExtraWhitespaces(original);
   }
 
   protected boolean isDebugEnabled() {

src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java

@@ -50,7 +50,7 @@ public Object invoke(Object proxy, Method method, Object[] params)
       }
       if ("prepareStatement".equals(method.getName()) || "prepareCall".equals(method.getName())) {
         if (isDebugEnabled()) {
-          debug(" Preparing: " + removeBreakingWhitespace((String) params[0]), true);
+          debug(" Preparing: " + removeExtraWhitespace((String) params[0]), true);
         }
         PreparedStatement stmt = (PreparedStatement) method.invoke(connection, params);
         stmt = PreparedStatementLogger.newInstance(stmt, statementLog, queryStack);

src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java

@@ -48,7 +48,7 @@ public Object invoke(Object proxy, Method method, Object[] params) throws Throwa
       }
       if (EXECUTE_METHODS.contains(method.getName())) {
         if (isDebugEnabled()) {
-          debug(" Executing: " + removeBreakingWhitespace((String) params[0]), true);
+          debug(" Executing: " + removeExtraWhitespace((String) params[0]), true);
         }
         if ("executeQuery".equals(method.getName())) {
           ResultSet rs = (ResultSet) method.invoke(statement, params);