You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/03/29 09:07:35 UTC

cayenne git commit: Cleanup code Return missing method in FormattedSlf4jJdbcEventLogger

Repository: cayenne
Updated Branches:
  refs/heads/master 3da70e282 -> 4cd1bea28


Cleanup code
Return missing method in FormattedSlf4jJdbcEventLogger


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4cd1bea2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4cd1bea2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4cd1bea2

Branch: refs/heads/master
Commit: 4cd1bea28d246e3f820d5887572eb30876f29c94
Parents: 3da70e2
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Mar 29 12:07:23 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Mar 29 12:07:23 2018 +0300

----------------------------------------------------------------------
 .../log/FormattedSlf4jJdbcEventLogger.java      | 12 +++++++----
 .../org/apache/cayenne/log/JdbcEventLogger.java |  3 ---
 .../apache/cayenne/log/NoopJdbcEventLogger.java |  6 ++----
 .../cayenne/log/Slf4jJdbcEventLogger.java       | 21 --------------------
 4 files changed, 10 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/4cd1bea2/cayenne-server/src/main/java/org/apache/cayenne/log/FormattedSlf4jJdbcEventLogger.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/log/FormattedSlf4jJdbcEventLogger.java b/cayenne-server/src/main/java/org/apache/cayenne/log/FormattedSlf4jJdbcEventLogger.java
index aa8e7e6..fb9d28a 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/log/FormattedSlf4jJdbcEventLogger.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/log/FormattedSlf4jJdbcEventLogger.java
@@ -20,17 +20,15 @@ package org.apache.cayenne.log;
 
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import org.apache.cayenne.access.translator.ParameterBinding;
 import org.apache.cayenne.configuration.RuntimeProperties;
 import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.map.DbAttribute;
 
 /**
- * A {@link Slf4jJdbcEventLogger} extension that provides pretty formatting of the
- * logged SQL messages.
+ * A {@link Slf4jJdbcEventLogger} extension that provides pretty formatting of the logged SQL messages.
  * 
  * @since 3.1
  * @since 4.0 renamed from FormattedCommonsJdbcEventLogger to FormattedSlf4jJdbcEventLogger as part of migration to SLF4J
@@ -121,4 +119,10 @@ public class FormattedSlf4jJdbcEventLogger extends Slf4jJdbcEventLogger {
         return result;
     }
 
+    @Override
+    public void logQuery(String sql, ParameterBinding[] bindings) {
+        if (isLoggable()) {
+            super.logQuery(formatQuery(sql), bindings);
+        }
+    }
 }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4cd1bea2/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java b/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java
index 28fd49e..5a5cc7b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/log/JdbcEventLogger.java
@@ -18,10 +18,7 @@
  ****************************************************************/
 package org.apache.cayenne.log;
 
-import java.util.List;
-
 import org.apache.cayenne.access.translator.ParameterBinding;
-import org.apache.cayenne.conn.DataSourceInfo;
 import org.apache.cayenne.map.DbAttribute;
 
 /**

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4cd1bea2/cayenne-server/src/main/java/org/apache/cayenne/log/NoopJdbcEventLogger.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/log/NoopJdbcEventLogger.java b/cayenne-server/src/main/java/org/apache/cayenne/log/NoopJdbcEventLogger.java
index abe6adf..787ac6a 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/log/NoopJdbcEventLogger.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/log/NoopJdbcEventLogger.java
@@ -18,13 +18,12 @@
  ****************************************************************/
 package org.apache.cayenne.log;
 
-import java.util.List;
-
 import org.apache.cayenne.access.translator.ParameterBinding;
-import org.apache.cayenne.conn.DataSourceInfo;
 import org.apache.cayenne.map.DbAttribute;
 
 /**
+ * Noop implementation of JdbcEventLogger
+ *
  * @since 3.1
  */
 public class NoopJdbcEventLogger implements JdbcEventLogger {
@@ -36,7 +35,6 @@ public class NoopJdbcEventLogger implements JdbcEventLogger {
 	}
 
 	private NoopJdbcEventLogger() {
-
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/cayenne/blob/4cd1bea2/cayenne-server/src/main/java/org/apache/cayenne/log/Slf4jJdbcEventLogger.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/log/Slf4jJdbcEventLogger.java b/cayenne-server/src/main/java/org/apache/cayenne/log/Slf4jJdbcEventLogger.java
index 9eef8e9..3cdf779 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/log/Slf4jJdbcEventLogger.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/log/Slf4jJdbcEventLogger.java
@@ -19,23 +19,17 @@
 package org.apache.cayenne.log;
 
 import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.ExtendedEnumeration;
 import org.apache.cayenne.access.translator.DbAttributeBinding;
 import org.apache.cayenne.access.translator.ParameterBinding;
 import org.apache.cayenne.configuration.Constants;
 import org.apache.cayenne.configuration.RuntimeProperties;
-import org.apache.cayenne.conn.DataSourceInfo;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.util.IDUtil;
 import org.apache.cayenne.util.Util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.lang.reflect.Array;
 import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.List;
 
 /**
  * A {@link JdbcEventLogger} built on top of slf4j-api logger.
@@ -47,11 +41,6 @@ public class Slf4jJdbcEventLogger implements JdbcEventLogger {
 
 	private static final Logger logger = LoggerFactory.getLogger(JdbcEventLogger.class);
 
-    /**
-     * @deprecated since 4.0
-     */
-	private static final int TRIM_VALUES_THRESHOLD = 30;
-
 	protected long queryExecutionTimeLoggingThreshold;
 
 	public Slf4jJdbcEventLogger(@Inject RuntimeProperties runtimeProperties) {
@@ -74,16 +63,6 @@ public class Slf4jJdbcEventLogger implements JdbcEventLogger {
 		}
 	}
 
-	private boolean isInserting(String query) {
-		if (query == null || query.length() == 0) {
-			return false;
-		}
-
-		char firstCharacter = query.charAt(0);
-
-		return firstCharacter == 'I' || firstCharacter == 'i';
-	}
-
 	@Override
 	public void logQuery(String sql, ParameterBinding[] bindings) {
 		if (isLoggable()) {