Repository: cayenne Updated Branches: refs/heads/STABLE-4.1 0554aa26d -> 9729bdc40
CAY-2485 Compact Slf4j Logger (cherry picked from commit 26769e966c48382775042813294fa839acd911e4) Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9729bdc4 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9729bdc4 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9729bdc4 Branch: refs/heads/STABLE-4.1 Commit: 9729bdc40caa979a1688034b52fba7294f119033 Parents: 0554aa2 Author: Nikita Timofeev <stari...@gmail.com> Authored: Mon Jan 14 13:35:35 2019 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Mon Jan 14 13:36:05 2019 +0300 ---------------------------------------------------------------------- .../log/CompactSlf4jJdbcEventLogger.java | 25 +++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/9729bdc4/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLogger.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLogger.java b/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLogger.java index b6ea8b3..c74cd7a 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLogger.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/log/CompactSlf4jJdbcEventLogger.java @@ -37,10 +37,10 @@ import java.util.stream.Collectors; */ public class CompactSlf4jJdbcEventLogger extends Slf4jJdbcEventLogger { - private static final String UNION = "UNION"; + private static final String UNION = "UNION"; private static final String SELECT = "SELECT"; - private static final String FROM = "FROM"; - private static final String SPACE = " "; + private static final String FROM = "FROM"; + private static final char SPACE = ' '; public CompactSlf4jJdbcEventLogger(@Inject RuntimeProperties runtimeProperties) { super(runtimeProperties); @@ -63,21 +63,12 @@ public class CompactSlf4jJdbcEventLogger extends Slf4jJdbcEventLogger { } protected String processUnionSql(String sql) { - - String modified = Pattern.compile(UNION.toLowerCase(), Pattern.CASE_INSENSITIVE).matcher(sql).replaceAll(UNION); + String modified = Pattern.compile(UNION.toLowerCase(), Pattern.CASE_INSENSITIVE) + .matcher(sql).replaceAll(UNION); String[] queries = modified.split(UNION); - List<String> formattedQueries = Arrays.stream(queries).map(this::trimSqlSelectColumns).collect(Collectors.toList()); - StringBuilder buffer = new StringBuilder(); - boolean used = false; - for (String q: formattedQueries) { - if(!used){ - used = true; - } else { - buffer.append(SPACE).append(UNION); - } - buffer.append(q); - } - return buffer.toString(); + return Arrays.stream(queries) + .map(this::trimSqlSelectColumns) + .collect(Collectors.joining(SPACE + UNION)); } protected String trimSqlSelectColumns(String sql) {
