From 89539ecbf36128cb54401909a964029ef645d18e Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Tue, 23 May 2017 13:47:21 +0200
Subject: [PATCH] [#6077] Reverted fast-path regular expressions on split()
 usage

---
 jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java         | 4 +---
 jOOQ/src/main/java/org/jooq/tools/LoggerListener.java        | 5 +----
 jOOQ/src/main/java/org/jooq/tools/StringUtils.java           | 4 +---
 jOOQ/src/main/java/org/jooq/tools/jdbc/MockFileDatabase.java | 3 +--
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
index 3b5a3b4be5..f3e58a27d9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
@@ -2218,8 +2218,6 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
         }
     }
 
-    private static final Pattern WHITESPACE = Pattern.compile(" ");
-
     private static final long parse(Class<? extends java.util.Date> type, String date) throws SQLException {
 
         // Try reading a plain number first
@@ -2235,7 +2233,7 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
 
             // Dates may come with " 00:00:00". This is safely trimming time information
             if (type == Date.class)
-                return Date.valueOf(WHITESPACE.split(date)[0]).getTime();
+                return Date.valueOf(date.split(" ")[0]).getTime();
 
             if (type == Time.class)
                 return Time.valueOf(date).getTime();
diff --git a/jOOQ/src/main/java/org/jooq/tools/LoggerListener.java b/jOOQ/src/main/java/org/jooq/tools/LoggerListener.java
index c2282ceb23..78843e765e 100644
--- a/jOOQ/src/main/java/org/jooq/tools/LoggerListener.java
+++ b/jOOQ/src/main/java/org/jooq/tools/LoggerListener.java
@@ -44,7 +44,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
-import java.util.regex.Pattern;
 
 import org.jooq.Configuration;
 import org.jooq.ExecuteContext;
@@ -194,10 +193,8 @@ public class LoggerListener extends DefaultExecuteListener {
         return result;
     }
 
-    private static final Pattern NEW_LINE = Pattern.compile("\n");
-
     private void logMultiline(String comment, String message, Level level) {
-        for (String line : NEW_LINE.split(message)) {
+        for (String line : message.split("\n")) {
             if (level == Level.FINE) {
                 log.debug(comment, line);
             }
diff --git a/jOOQ/src/main/java/org/jooq/tools/StringUtils.java b/jOOQ/src/main/java/org/jooq/tools/StringUtils.java
index c15c31719d..88e87ca97b 100644
--- a/jOOQ/src/main/java/org/jooq/tools/StringUtils.java
+++ b/jOOQ/src/main/java/org/jooq/tools/StringUtils.java
@@ -1262,8 +1262,6 @@ public final class StringUtils {
     // XXX: The following methods are not part of Apache's commons-lang library
     // -------------------------------------------------------------------------
 
-    private static final Pattern UNDERSCORE = Pattern.compile("_");
-
     /**
      * Convert a string to camel case
      */
@@ -1271,7 +1269,7 @@ public final class StringUtils {
         StringBuilder result = new StringBuilder();
 
         // [#2515] - Keep trailing underscores
-        for (String word : UNDERSCORE.split(string, -1)) {
+        for (String word : string.split("_", -1)) {
 
             // Uppercase first letter of a word
             if (word.length() > 0) {
diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockFileDatabase.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockFileDatabase.java
index fa437d879f..25ca85cbc4 100644
--- a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockFileDatabase.java
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockFileDatabase.java
@@ -172,7 +172,6 @@ public class MockFileDatabase implements MockDataProvider {
     }
 
     private static final Pattern END_OF_STATEMENT = Pattern.compile("^(.*?);[ \t]*$");
-    private static final Pattern NEW_LINE         = Pattern.compile("\n");
 
     private void load() throws FileNotFoundException, IOException {
 
@@ -286,7 +285,7 @@ public class MockFileDatabase implements MockDataProvider {
                 if (log.isDebugEnabled()) {
                     String comment = "Loaded Result";
 
-                    for (String l : NEW_LINE.split(mock.data.format(5))) {
+                    for (String l : mock.data.format(5).split("\n")) {
                         log.debug(comment, l);
                         comment = "";
                     }