diff --git a/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java b/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java index 26894bf913..1dab2dc312 100644 --- a/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java +++ b/src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java @@ -15,28 +15,11 @@ */ package com.alibaba.druid.filter; -import java.io.InputStream; -import java.io.Reader; -import java.math.BigDecimal; -import java.net.URL; -import java.sql.Array; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Date; -import java.sql.NClob; -import java.sql.Ref; -import java.sql.RowId; import java.sql.SQLException; -import java.sql.SQLXML; -import java.sql.Time; -import java.sql.Timestamp; -import java.sql.Types; -import java.util.Calendar; import java.util.Properties; import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -import com.alibaba.druid.proxy.jdbc.JdbcParameter.TYPE; import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; import com.alibaba.druid.proxy.jdbc.ResultSetProxy; import com.alibaba.druid.proxy.jdbc.StatementProxy; @@ -566,367 +549,6 @@ public abstract class FilterEventAdapter extends FilterAdapter { } - // //// - @Override - public void preparedStatement_setArray(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Array x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.ARRAY, x); - chain.preparedStatement_setArray(statement, parameterIndex, x); - } - - @Override - public void preparedStatement_setAsciiStream(FilterChain chain, PreparedStatementProxy statement, - int parameterIndex, InputStream x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, TYPE.AsciiInputStream, x); - chain.preparedStatement_setAsciiStream(statement, parameterIndex, x); - } - - @Override - public void preparedStatement_setAsciiStream(FilterChain chain, PreparedStatementProxy statement, - int parameterIndex, InputStream x, int length) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, TYPE.AsciiInputStream, x, length); - chain.preparedStatement_setAsciiStream(statement, parameterIndex, x, length); - - } - - @Override - public void preparedStatement_setAsciiStream(FilterChain chain, PreparedStatementProxy statement, - int parameterIndex, InputStream x, long length) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, TYPE.AsciiInputStream, x, length); - chain.preparedStatement_setAsciiStream(statement, parameterIndex, x, length); - - } - - @Override - public void preparedStatement_setBigDecimal(FilterChain chain, PreparedStatementProxy statement, - int parameterIndex, BigDecimal x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.DECIMAL, x); - chain.preparedStatement_setBigDecimal(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setBinaryStream(FilterChain chain, PreparedStatementProxy statement, - int parameterIndex, InputStream x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, TYPE.BinaryInputStream, x); - chain.preparedStatement_setBinaryStream(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setBinaryStream(FilterChain chain, PreparedStatementProxy statement, - int parameterIndex, InputStream x, int length) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, TYPE.BinaryInputStream, x, length); - chain.preparedStatement_setBinaryStream(statement, parameterIndex, x, length); - - } - - @Override - public void preparedStatement_setBinaryStream(FilterChain chain, PreparedStatementProxy statement, - int parameterIndex, InputStream x, long length) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, TYPE.BinaryInputStream, x, length); - chain.preparedStatement_setBinaryStream(statement, parameterIndex, x, length); - - } - - @Override - public void preparedStatement_setBlob(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Blob x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.BLOB, x); - chain.preparedStatement_setBlob(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setBlob(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - InputStream x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.BLOB, x); - chain.preparedStatement_setBlob(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setBlob(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - InputStream x, long length) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.BLOB, x, length); - chain.preparedStatement_setBlob(statement, parameterIndex, x, length); - - } - - @Override - public void preparedStatement_setBoolean(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - boolean x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.BOOLEAN, x); - chain.preparedStatement_setBoolean(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setByte(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - byte x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.TINYINT, x); - chain.preparedStatement_setByte(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setBytes(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - byte[] x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.BINARY, x); - chain.preparedStatement_setBytes(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setCharacterStream(FilterChain chain, PreparedStatementProxy statement, - int parameterIndex, Reader x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, TYPE.CharacterInputStream, x); - chain.preparedStatement_setCharacterStream(statement, parameterIndex, x); - } - - @Override - public void preparedStatement_setCharacterStream(FilterChain chain, PreparedStatementProxy statement, - int parameterIndex, Reader x, int length) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, TYPE.CharacterInputStream, x, length); - chain.preparedStatement_setCharacterStream(statement, parameterIndex, x, length); - } - - @Override - public void preparedStatement_setCharacterStream(FilterChain chain, PreparedStatementProxy statement, - int parameterIndex, Reader x, long length) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, TYPE.CharacterInputStream, x, length); - chain.preparedStatement_setCharacterStream(statement, parameterIndex, x, length); - } - - @Override - public void preparedStatement_setClob(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Clob x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.CLOB, x); - chain.preparedStatement_setClob(statement, parameterIndex, x); - } - - @Override - public void preparedStatement_setClob(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Reader x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.CLOB, x); - chain.preparedStatement_setClob(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setClob(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Reader x, long length) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.CLOB, x, length); - chain.preparedStatement_setClob(statement, parameterIndex, x, length); - - } - - @Override - public void preparedStatement_setDate(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Date x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.DATE, x); - chain.preparedStatement_setDate(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setDate(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Date x, Calendar cal) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.DATE, x, cal); - chain.preparedStatement_setDate(statement, parameterIndex, x, cal); - - } - - @Override - public void preparedStatement_setDouble(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - double x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.DOUBLE, x); - chain.preparedStatement_setDouble(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setFloat(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - float x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.FLOAT, x); - chain.preparedStatement_setFloat(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setInt(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, int x) - throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.INTEGER, x); - chain.preparedStatement_setInt(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setLong(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - long x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.BIGINT, x); - chain.preparedStatement_setLong(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setNCharacterStream(FilterChain chain, PreparedStatementProxy statement, - int parameterIndex, Reader x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, TYPE.NCharacterInputStream, x); - chain.preparedStatement_setNCharacterStream(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setNCharacterStream(FilterChain chain, PreparedStatementProxy statement, - int parameterIndex, Reader x, long length) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, TYPE.NCharacterInputStream, x, length); - chain.preparedStatement_setNCharacterStream(statement, parameterIndex, x, length); - - } - - @Override - public void preparedStatement_setNClob(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - NClob x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.NCLOB, x); - chain.preparedStatement_setNClob(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setNClob(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Reader x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.NCLOB, x); - chain.preparedStatement_setNClob(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setNClob(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Reader x, long length) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.NCLOB, x, length); - chain.preparedStatement_setNClob(statement, parameterIndex, x, length); - - } - - @Override - public void preparedStatement_setNString(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - String x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.NVARCHAR, x); - chain.preparedStatement_setNString(statement, parameterIndex, x); - - } - - @Override - public void preparedStatement_setNull(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - int sqlType) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.NULL); - chain.preparedStatement_setNull(statement, parameterIndex, sqlType); - } - - @Override - public void preparedStatement_setNull(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - int sqlType, String typeName) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.NULL, sqlType, typeName); - chain.preparedStatement_setNull(statement, parameterIndex, sqlType, typeName); - } - - @Override - public void preparedStatement_setObject(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Object x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.JAVA_OBJECT, x); - chain.preparedStatement_setObject(statement, parameterIndex, x); - } - - @Override - public void preparedStatement_setObject(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Object x, int targetSqlType) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.JAVA_OBJECT, x, targetSqlType); - chain.preparedStatement_setObject(statement, parameterIndex, x, targetSqlType); - } - - @Override - public void preparedStatement_setObject(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Object x, int targetSqlType, int scaleOrLength) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.JAVA_OBJECT, x, targetSqlType, - scaleOrLength); - chain.preparedStatement_setObject(statement, parameterIndex, x, targetSqlType, scaleOrLength); - } - - @Override - public void preparedStatement_setRef(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, Ref x) - throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.REF, x); - chain.preparedStatement_setRef(statement, parameterIndex, x); - } - - @Override - public void preparedStatement_setRowId(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - RowId x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.ROWID, x); - chain.preparedStatement_setRowId(statement, parameterIndex, x); - } - - @Override - public void preparedStatement_setSQLXML(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - SQLXML x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.SQLXML, x); - chain.preparedStatement_setSQLXML(statement, parameterIndex, x); - } - - @Override - public void preparedStatement_setShort(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - short x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.SMALLINT, x); - chain.preparedStatement_setShort(statement, parameterIndex, x); - } - - @Override - public void preparedStatement_setString(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - String x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.VARCHAR, x); - chain.preparedStatement_setString(statement, parameterIndex, x); - } - - @Override - public void preparedStatement_setTime(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Time x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.TIME, x); - chain.preparedStatement_setTime(statement, parameterIndex, x); - } - - @Override - public void preparedStatement_setTime(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Time x, Calendar cal) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.TIME, x, cal); - chain.preparedStatement_setTime(statement, parameterIndex, x, cal); - } - - @Override - public void preparedStatement_setTimestamp(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Timestamp x) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.TIMESTAMP, x); - chain.preparedStatement_setTimestamp(statement, parameterIndex, x); - } - - @Override - public void preparedStatement_setTimestamp(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, - Timestamp x, Calendar cal) throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, Types.TIMESTAMP, x, cal); - chain.preparedStatement_setTimestamp(statement, parameterIndex, x, cal); - } - - @Override - public void preparedStatement_setURL(FilterChain chain, PreparedStatementProxy statement, int parameterIndex, URL x) - throws SQLException { - preparedStatement_setParameterBefore(statement, parameterIndex, TYPE.URL, x); - chain.preparedStatement_setURL(statement, parameterIndex, x); - } - - protected void preparedStatement_setParameterBefore(PreparedStatementProxy statement, int parameterIndex, - int sqlType, Object... values) { - } - protected void statement_executeErrorAfter(StatementProxy statement, String sql, Throwable error) { } diff --git a/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java b/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java index e10154e53a..092c360101 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java +++ b/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java @@ -328,7 +328,6 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM } } - @Override protected void statementExecuteAfter(StatementProxy statement, String sql, boolean firstResult) { if (statementExecuteAfterLogEnable && isStatementLogEnabled()) { @@ -519,11 +518,6 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM return buf.toString(); } - protected void preparedStatement_setParameterBefore(PreparedStatementProxy statement, int parameterIndex, - int sqlType, Object... values) { - - } - protected void logParameter(PreparedStatementProxy statement) { if (statementParameterSetLogEnable && isStatementLogEnabled()) { {