diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java index 4f14805dff..48d7ab90f5 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java @@ -1557,8 +1557,8 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements // 25 - 29 map.put("ResultSetOpenCount", stat.getResultSetStat().getOpenCount()); - map.put("ResultSetOpenningCount", stat.getResultSetStat().getOpenningCount()); - map.put("ResultSetOpenningMax", stat.getResultSetStat().getOpenningMax()); + map.put("ResultSetOpenningCount", stat.getResultSetStat().getOpeningCount()); + map.put("ResultSetOpenningMax", stat.getResultSetStat().getOpeningMax()); map.put("ResultSetFetchRowCount", stat.getResultSetStat().getFetchRowCount()); map.put("ResultSetLastOpenTime", stat.getResultSetStat().getLastOpenTime()); diff --git a/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java b/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java index 1e30f31077..7174d4cf49 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java +++ b/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java @@ -15,6 +15,13 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; +import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.druid.util.Utils; + +import javax.sql.ConnectionEventListener; +import javax.sql.StatementEventListener; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; @@ -23,14 +30,6 @@ import java.util.Date; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.sql.ConnectionEventListener; -import javax.sql.StatementEventListener; - -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.Utils; -import com.alibaba.druid.util.JdbcConstants; - /** * @author wenshao */ @@ -42,7 +41,7 @@ public final class DruidConnectionHolder { private final Connection conn; private final List connectionEventListeners = new CopyOnWriteArrayList(); private final List statementEventListeners = new CopyOnWriteArrayList(); - private final long connecttimeMillis; + private final long connectTimeMillis; private transient long lastActiveTimeMillis; private long useCount = 0; @@ -66,8 +65,8 @@ public final class DruidConnectionHolder { this.dataSource = dataSource; this.conn = conn; - this.connecttimeMillis = System.currentTimeMillis(); - this.lastActiveTimeMillis = connecttimeMillis; + this.connectTimeMillis = System.currentTimeMillis(); + this.lastActiveTimeMillis = connectTimeMillis; this.underlyingAutoCommit = conn.getAutoCommit(); @@ -192,7 +191,7 @@ public final class DruidConnectionHolder { } public long getTimeMillis() { - return connecttimeMillis; + return connectTimeMillis; } public long getUseCount() { @@ -251,7 +250,7 @@ public final class DruidConnectionHolder { buf.append("{ID:"); buf.append(System.identityHashCode(conn)); buf.append(", ConnectTime:\""); - buf.append(Utils.toString(new Date(this.connecttimeMillis))); + buf.append(Utils.toString(new Date(this.connectTimeMillis))); buf.append("\", UseCount:"); buf.append(useCount); diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index f21df11059..5b543b53c3 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -2133,7 +2133,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat Map stmtInfo = new LinkedHashMap(); stmtInfo.put("sql", stmtHolder.getKey().getSql()); - stmtInfo.put("defaultRowPretch", stmtHolder.getDefaultRowPretch()); + stmtInfo.put("defaultRowPretch", stmtHolder.getDefaultRowPrefetch()); stmtInfo.put("rowPrefetch", stmtHolder.getRowPrefetch()); stmtInfo.put("hitCount", stmtHolder.getHitCount()); diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java b/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java index 257bb3055d..707f9b2370 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java +++ b/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java @@ -513,10 +513,10 @@ public class DruidPooledPreparedStatement extends DruidPooledStatement implement return; } - if (holder.getDefaultRowPretch() == -1) { + if (holder.getDefaultRowPrefetch() == -1) { int defaultRowPretch = OracleUtils.getRowPrefetch(this); - if (defaultRowPretch != holder.getDefaultRowPretch()) { - holder.setDefaultRowPretch(defaultRowPretch); + if (defaultRowPretch != holder.getDefaultRowPrefetch()) { + holder.setDefaultRowPrefetch(defaultRowPretch); holder.setRowPrefetch(defaultRowPretch); } } @@ -525,8 +525,8 @@ public class DruidPooledPreparedStatement extends DruidPooledStatement implement if (fetchRowPeak <= 1) { rowPrefetch = 2; - } else if (fetchRowPeak > holder.getDefaultRowPretch()) { - rowPrefetch = holder.getDefaultRowPretch(); + } else if (fetchRowPeak > holder.getDefaultRowPrefetch()) { + rowPrefetch = holder.getDefaultRowPrefetch(); } else { rowPrefetch = fetchRowPeak + 1; } diff --git a/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java b/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java index 368fb1b625..e3036978a0 100644 --- a/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java +++ b/src/main/java/com/alibaba/druid/pool/GetConnectionTimeoutException.java @@ -25,8 +25,8 @@ public class GetConnectionTimeoutException extends SQLException { super(reason); } - public GetConnectionTimeoutException(String mesage, Throwable cause){ - super(mesage, cause); + public GetConnectionTimeoutException(String message, Throwable cause){ + super(message, cause); } } diff --git a/src/main/java/com/alibaba/druid/pool/PoolableWrapper.java b/src/main/java/com/alibaba/druid/pool/PoolableWrapper.java index 3b1a974d95..10101f90a2 100644 --- a/src/main/java/com/alibaba/druid/pool/PoolableWrapper.java +++ b/src/main/java/com/alibaba/druid/pool/PoolableWrapper.java @@ -15,11 +15,11 @@ */ package com.alibaba.druid.pool; +import com.alibaba.druid.proxy.jdbc.WrapperProxy; + import java.sql.SQLException; import java.sql.Wrapper; -import com.alibaba.druid.proxy.jdbc.WrapperProxy; - /** * @author wenshao */ @@ -33,11 +33,17 @@ public class PoolableWrapper implements Wrapper { @Override public boolean isWrapperFor(Class iface) throws SQLException { + + if (null == wrapper) { + //Best to log error. + return false; + } + if (iface == null) { return false; } - if (wrapper != null && iface == wrapper.getClass()) { + if (iface == wrapper.getClass()) { return true; } @@ -57,11 +63,17 @@ public class PoolableWrapper implements Wrapper { @SuppressWarnings("unchecked") @Override public T unwrap(Class iface) throws SQLException { + + if (null == wrapper) { + //Best to log error. + return null; + } + if (iface == null) { return null; } - if (wrapper != null && iface == wrapper.getClass()) { + if (iface == wrapper.getClass()) { return (T) wrapper; } diff --git a/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java b/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java index 92d16d696e..2d44f80a02 100644 --- a/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java +++ b/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java @@ -15,10 +15,10 @@ */ package com.alibaba.druid.pool; -import java.sql.PreparedStatement; - import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey; +import java.sql.PreparedStatement; + /** * @author wenshao */ @@ -30,7 +30,7 @@ public final class PreparedStatementHolder { private int fetchRowPeak = -1; - private int defaultRowPretch = -1; + private int defaultRowPrefetch = -1; private int rowPrefetch = -1; private boolean enterOracleImplicitCache = false; @@ -51,12 +51,12 @@ public final class PreparedStatementHolder { this.enterOracleImplicitCache = enterOracleImplicitCache; } - public int getDefaultRowPretch() { - return defaultRowPretch; + public int getDefaultRowPrefetch() { + return defaultRowPrefetch; } - public void setDefaultRowPretch(int defaultRowPretch) { - this.defaultRowPretch = defaultRowPretch; + public void setDefaultRowPrefetch(int defaultRowPrefetch) { + this.defaultRowPrefetch = defaultRowPrefetch; } public int getRowPrefetch() { diff --git a/src/main/java/com/alibaba/druid/pool/WrapperAdapter.java b/src/main/java/com/alibaba/druid/pool/WrapperAdapter.java index cb974ae9e4..e7fcd5fc3f 100644 --- a/src/main/java/com/alibaba/druid/pool/WrapperAdapter.java +++ b/src/main/java/com/alibaba/druid/pool/WrapperAdapter.java @@ -24,15 +24,8 @@ public class WrapperAdapter implements Wrapper { @Override public boolean isWrapperFor(Class iface) { - if (iface == null) { - return false; - } + return iface != null && iface.isInstance(this); - if (iface.isInstance(this)) { - return true; - } - - return false; } @SuppressWarnings("unchecked") diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MSSQLValidConnectionChecker.java b/src/main/java/com/alibaba/druid/pool/vendor/MSSQLValidConnectionChecker.java index 838d0696f3..a0c40990b2 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/MSSQLValidConnectionChecker.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/MSSQLValidConnectionChecker.java @@ -15,17 +15,17 @@ */ package com.alibaba.druid.pool.vendor; -import java.io.Serializable; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; - import com.alibaba.druid.pool.ValidConnectionChecker; import com.alibaba.druid.pool.ValidConnectionCheckerAdapter; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.util.JdbcUtils; +import java.io.Serializable; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; + /** * A MSSQLValidConnectionChecker. */ @@ -39,7 +39,7 @@ public class MSSQLValidConnectionChecker extends ValidConnectionCheckerAdapter i } - public boolean isValidConnection(final Connection c, String valiateQuery, int validationQueryTimeout) { + public boolean isValidConnection(final Connection c, String validateQuery, int validationQueryTimeout) { try { if (c.isClosed()) { return false; @@ -54,7 +54,7 @@ public class MSSQLValidConnectionChecker extends ValidConnectionCheckerAdapter i try { stmt = c.createStatement(); stmt.setQueryTimeout(validationQueryTimeout); - stmt.execute(valiateQuery); + stmt.execute(validateQuery); return true; } catch (SQLException e) { if (LOG.isWarnEnabled()) { diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MockExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/MockExceptionSorter.java index ba3a76e9a3..6ef1883ebc 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/MockExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/MockExceptionSorter.java @@ -15,12 +15,12 @@ */ package com.alibaba.druid.pool.vendor; -import java.sql.SQLException; -import java.util.Properties; - import com.alibaba.druid.mock.MockConnectionClosedException; import com.alibaba.druid.pool.ExceptionSorter; +import java.sql.SQLException; +import java.util.Properties; + public class MockExceptionSorter implements ExceptionSorter { private final static MockExceptionSorter instance = new MockExceptionSorter(); @@ -31,10 +31,7 @@ public class MockExceptionSorter implements ExceptionSorter { @Override public boolean isExceptionFatal(SQLException e) { - if (e instanceof MockConnectionClosedException) { - return true; - } - return false; + return e instanceof MockConnectionClosedException; } public void configFromProperties(Properties properties) { diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java index dbec6b9776..8641cbf46a 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java @@ -15,11 +15,11 @@ */ package com.alibaba.druid.pool.vendor; +import com.alibaba.druid.pool.ExceptionSorter; + import java.sql.SQLException; import java.util.Properties; -import com.alibaba.druid.pool.ExceptionSorter; - public class MySqlExceptionSorter implements ExceptionSorter { @Override @@ -63,10 +63,10 @@ public class MySqlExceptionSorter implements ExceptionSorter { if (message != null && message.length() > 0) { final String errorText = message.toUpperCase(); - if ((errorCode == 0 && (errorText.indexOf("COMMUNICATIONS LINK FAILURE") > -1) // - || errorText.indexOf("COULD NOT CREATE CONNECTION") > -1) // - || errorText.indexOf("NO DATASOURCE") > -1 // - || errorText.indexOf("NO ALIVE DATASOURCE") > -1) { + if ((errorCode == 0 && (errorText.contains("COMMUNICATIONS LINK FAILURE")) // + || errorText.contains("COULD NOT CREATE CONNECTION")) // + || errorText.contains("NO DATASOURCE") // + || errorText.contains("NO ALIVE DATASOURCE")) { return true; } } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java b/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java index 84822d0f28..b2e17db560 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java @@ -15,15 +15,6 @@ */ package com.alibaba.druid.pool.vendor; -import java.io.Serializable; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Properties; - import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.ValidConnectionChecker; import com.alibaba.druid.pool.ValidConnectionCheckerAdapter; @@ -33,6 +24,15 @@ import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.Utils; +import java.io.Serializable; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Properties; + public class MySqlValidConnectionChecker extends ValidConnectionCheckerAdapter implements ValidConnectionChecker, Serializable { private static final long serialVersionUID = 1L; @@ -74,7 +74,7 @@ public class MySqlValidConnectionChecker extends ValidConnectionCheckerAdapter i this.usePingMethod = usePingMethod; } - public boolean isValidConnection(Connection conn, String valiateQuery, int validationQueryTimeout) { + public boolean isValidConnection(Connection conn, String validateQuery, int validationQueryTimeout) { try { if (conn.isClosed()) { return false; @@ -119,7 +119,7 @@ public class MySqlValidConnectionChecker extends ValidConnectionCheckerAdapter i if (validationQueryTimeout > 0) { stmt.setQueryTimeout(validationQueryTimeout); } - rs = stmt.executeQuery(valiateQuery); + rs = stmt.executeQuery(validateQuery); return true; } catch (SQLException e) { return false; diff --git a/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java index 6e08cc03a9..7f3e4db030 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java @@ -15,16 +15,16 @@ */ package com.alibaba.druid.pool.vendor; +import com.alibaba.druid.pool.ExceptionSorter; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; + import java.io.Serializable; import java.sql.SQLException; import java.util.HashSet; import java.util.Properties; import java.util.Set; -import com.alibaba.druid.pool.ExceptionSorter; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; - /** * Implementation of ExceptionSorter for Oracle. */ @@ -139,11 +139,11 @@ public class OracleExceptionSorter implements ExceptionSorter, Serializable { // certain strings. if ((error_code < 20000 || error_code >= 21000)) { - if ((error_text.indexOf("SOCKET") > -1) // for control socket error - || (error_text.indexOf("套接字") > -1) // for control socket error - || (error_text.indexOf("CONNECTION HAS ALREADY BEEN CLOSED") > -1) // - || (error_text.indexOf("BROKEN PIPE") > -1) // - || (error_text.indexOf("管道已结束") > -1) // + if ((error_text.contains("SOCKET")) // for control socket error + || (error_text.contains("套接字")) // for control socket error + || (error_text.contains("CONNECTION HAS ALREADY BEEN CLOSED")) // + || (error_text.contains("BROKEN PIPE")) // + || (error_text.contains("管道已结束")) // ) { return true; } diff --git a/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java b/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java index b1dc0ad349..0e7a77f055 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java @@ -15,14 +15,6 @@ */ package com.alibaba.druid.pool.vendor; -import java.io.Serializable; -import java.lang.reflect.Method; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Properties; - import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.pool.ValidConnectionChecker; import com.alibaba.druid.pool.ValidConnectionCheckerAdapter; @@ -32,6 +24,14 @@ import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.util.JdbcUtils; import com.alibaba.druid.util.Utils; +import java.io.Serializable; +import java.lang.reflect.Method; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Properties; + public class OracleValidConnectionChecker extends ValidConnectionCheckerAdapter implements ValidConnectionChecker, Serializable { private static final long serialVersionUID = -2227528634302168877L; @@ -70,7 +70,7 @@ public class OracleValidConnectionChecker extends ValidConnectionCheckerAdapter params[0] = timeout; } - public boolean isValidConnection(Connection conn, String valiateQuery, int validationQueryTimeout) { + public boolean isValidConnection(Connection conn, String validateQuery, int validationQueryTimeout) { try { if (conn.isClosed()) { return false; @@ -94,18 +94,14 @@ public class OracleValidConnectionChecker extends ValidConnectionCheckerAdapter Integer status = (Integer) ping.invoke(conn, params); // Error - if (status.intValue() < 0) { - return false; - } - - return true; + return status >= 0; } Statement stmt = null; ResultSet rs = null; try { stmt = conn.createStatement(); - rs = stmt.executeQuery(valiateQuery); + rs = stmt.executeQuery(validateQuery); return true; } catch (SQLException e) { return false; diff --git a/src/main/java/com/alibaba/druid/pool/vendor/SybaseExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/SybaseExceptionSorter.java index 93508383e1..924770f6f7 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/SybaseExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/SybaseExceptionSorter.java @@ -15,12 +15,12 @@ */ package com.alibaba.druid.pool.vendor; +import com.alibaba.druid.pool.ExceptionSorter; + import java.io.Serializable; import java.sql.SQLException; import java.util.Properties; -import com.alibaba.druid.pool.ExceptionSorter; - public class SybaseExceptionSorter implements ExceptionSorter, Serializable { private static final long serialVersionUID = 2742592563671255116L; @@ -38,8 +38,8 @@ public class SybaseExceptionSorter implements ExceptionSorter, Serializable { } errorText = errorText.toUpperCase(); - if ((errorText.indexOf("JZ0C0") > -1) || // ERR_CONNECTION_DEAD - (errorText.indexOf("JZ0C1") > -1) // ERR_IOE_KILLED_CONNECTION + if ((errorText.contains("JZ0C0")) || // ERR_CONNECTION_DEAD + (errorText.contains("JZ0C1")) // ERR_IOE_KILLED_CONNECTION ) { result = true; } diff --git a/src/main/java/com/alibaba/druid/pool/xa/DruidXADataSource.java b/src/main/java/com/alibaba/druid/pool/xa/DruidXADataSource.java index 8fb4fa6a70..0decae1be7 100644 --- a/src/main/java/com/alibaba/druid/pool/xa/DruidXADataSource.java +++ b/src/main/java/com/alibaba/druid/pool/xa/DruidXADataSource.java @@ -15,13 +15,6 @@ */ package com.alibaba.druid.pool.xa; -import java.sql.Connection; -import java.sql.SQLException; - -import javax.sql.XAConnection; -import javax.sql.XADataSource; -import javax.transaction.xa.XAException; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidPooledConnection; import com.alibaba.druid.support.logging.Log; @@ -32,6 +25,12 @@ import com.alibaba.druid.util.MySqlUtils; import com.alibaba.druid.util.OracleUtils; import com.alibaba.druid.util.PGUtils; +import javax.sql.XAConnection; +import javax.sql.XADataSource; +import javax.transaction.xa.XAException; +import java.sql.Connection; +import java.sql.SQLException; + public class DruidXADataSource extends DruidDataSource implements XADataSource { private final static Log LOG = LogFactory.getLog(DruidXADataSource.class); @@ -46,7 +45,7 @@ public class DruidXADataSource extends DruidDataSource implements XADataSource { Connection physicalConn = conn.unwrap(Connection.class); - XAConnection rawXAConnection = createPhysicalXAConnetion(physicalConn); + XAConnection rawXAConnection = createPhysicalXAConnection(physicalConn); return new DruidPooledXAConnection(conn, rawXAConnection); } @@ -59,7 +58,7 @@ public class DruidXADataSource extends DruidDataSource implements XADataSource { } } - private XAConnection createPhysicalXAConnetion(Connection physicalConn) throws SQLException { + private XAConnection createPhysicalXAConnection(Connection physicalConn) throws SQLException { if (JdbcUtils.ORACLE.equals(dbType)) { try { return OracleUtils.OracleXAConnection(physicalConn); diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java index 43176dec5e..78c8589337 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java @@ -15,6 +15,9 @@ */ package com.alibaba.druid.proxy.jdbc; +import com.alibaba.druid.filter.FilterChainImpl; +import com.alibaba.druid.filter.stat.StatFilter; + import java.sql.Array; import java.sql.Blob; import java.sql.CallableStatement; @@ -36,9 +39,6 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.Executor; -import com.alibaba.druid.filter.FilterChainImpl; -import com.alibaba.druid.filter.stat.StatFilter; - /** * @author wenshao */ @@ -52,7 +52,7 @@ public class ConnectionProxyImpl extends WrapperProxyImpl implements ConnectionP private final long connectedTime; - private TransactionInfo transcationInfo; + private TransactionInfo transactionInfo; private int closeCount; @@ -122,8 +122,8 @@ public class ConnectionProxyImpl extends WrapperProxyImpl implements ConnectionP FilterChainImpl chain = createChain(); chain.connection_commit(this); - if (transcationInfo != null) { - transcationInfo.setEndTimeMillis(); + if (transactionInfo != null) { + transactionInfo.setEndTimeMillis(); } recycleFilterChain(chain); } @@ -399,8 +399,8 @@ public class ConnectionProxyImpl extends WrapperProxyImpl implements ConnectionP FilterChainImpl chain = createChain(); chain.connection_rollback(this); recycleFilterChain(chain); - if (transcationInfo != null) { - transcationInfo.setEndTimeMillis(); + if (transactionInfo != null) { + transactionInfo.setEndTimeMillis(); } } @@ -409,21 +409,21 @@ public class ConnectionProxyImpl extends WrapperProxyImpl implements ConnectionP FilterChainImpl chain = createChain(); chain.connection_rollback(this, savepoint); recycleFilterChain(chain); - if (transcationInfo != null) { - transcationInfo.setEndTimeMillis(); + if (transactionInfo != null) { + transactionInfo.setEndTimeMillis(); } } @Override public void setAutoCommit(boolean autoCommit) throws SQLException { if (!autoCommit) { - if (transcationInfo == null) { + if (transactionInfo == null) { long transactionId = this.dataSource.createTransactionId(); - transcationInfo = new TransactionInfo(transactionId); - this.putAttribute(StatFilter.ATTR_TRANSACTION, transcationInfo); // compatible for druid 0.1.18 + transactionInfo = new TransactionInfo(transactionId); + this.putAttribute(StatFilter.ATTR_TRANSACTION, transactionInfo); // compatible for druid 0.1.18 } } else { - transcationInfo = null; + transactionInfo = null; } FilterChainImpl chain = createChain(); @@ -527,7 +527,7 @@ public class ConnectionProxyImpl extends WrapperProxyImpl implements ConnectionP @Override public TransactionInfo getTransactionInfo() { - return transcationInfo; + return transactionInfo; } @Override diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java index 01d1d20021..d735de442c 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/DataSourceProxyImpl.java @@ -251,8 +251,8 @@ public class DataSourceProxyImpl implements DataSourceProxy, DataSourceProxyImpl map.put("ResultSetCloseCount", stat.getResultSetStat().getCloseCount()); map.put("ResultSetOpenCount", stat.getResultSetStat().getOpenCount()); - map.put("ResultSetOpenningCount", stat.getResultSetStat().getOpenningCount()); - map.put("ResultSetOpenningMax", stat.getResultSetStat().getOpenningMax()); + map.put("ResultSetOpenningCount", stat.getResultSetStat().getOpeningCount()); + map.put("ResultSetOpenningMax", stat.getResultSetStat().getOpeningMax()); map.put("ResultSetFetchRowCount", stat.getResultSetStat().getFetchRowCount()); map.put("ResultSetLastOpenTime", stat.getResultSetStat().getLastOpenTime()); diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterDecimal.java b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterDecimal.java index c40eca044f..13202eeffb 100644 --- a/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterDecimal.java +++ b/src/main/java/com/alibaba/druid/proxy/jdbc/JdbcParameterDecimal.java @@ -36,11 +36,11 @@ public final class JdbcParameterDecimal implements JdbcParameter { return NULL; } - if (x == BigDecimal.ZERO) { + if (0 == (x.compareTo(BigDecimal.ZERO))) { return ZERO; } - if (x == BigDecimal.TEN) { + if (0 == (x.compareTo(BigDecimal.TEN))) { return TEN; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java b/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java index 7e7445a52d..0d6d334154 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java @@ -15,11 +15,11 @@ */ package com.alibaba.druid.sql.ast; +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + import java.util.ArrayList; import java.util.List; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; - public class SQLDataTypeImpl extends SQLObjectImpl implements SQLDataType { protected String name; @@ -59,7 +59,7 @@ public class SQLDataTypeImpl extends SQLObjectImpl implements SQLDataType { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((arguments == null) ? 0 : arguments.hashCode()); + result = prime * result + arguments.hashCode(); result = prime * result + ((name == null) ? 0 : name.hashCode()); return result; } @@ -70,9 +70,7 @@ public class SQLDataTypeImpl extends SQLObjectImpl implements SQLDataType { if (obj == null) return false; if (getClass() != obj.getClass()) return false; SQLDataTypeImpl other = (SQLDataTypeImpl) obj; - if (arguments == null) { - if (other.arguments != null) return false; - } else if (!arguments.equals(other.arguments)) return false; + if (!arguments.equals(other.arguments)) return false; if (name == null) { if (other.name != null) return false; } else if (!name.equals(other.name)) return false; diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLName.java b/src/main/java/com/alibaba/druid/sql/ast/SQLName.java index 0c201f04a1..065d001aef 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLName.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLName.java @@ -16,5 +16,5 @@ package com.alibaba.druid.sql.ast; public interface SQLName extends SQLExpr { - String getSimleName(); + String getSimpleName(); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java b/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java index a453b1187a..d0720a961c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java @@ -15,12 +15,12 @@ */ package com.alibaba.druid.sql.ast; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; import com.alibaba.druid.sql.visitor.SQLASTVisitor; +import java.util.ArrayList; +import java.util.List; + public class SQLOrderBy extends SQLObjectImpl { protected final List items = new ArrayList(); @@ -58,7 +58,7 @@ public class SQLOrderBy extends SQLObjectImpl { public int hashCode() { final int prime = 31; int result = 1; - result = prime * result + ((items == null) ? 0 : items.hashCode()); + result = prime * result + items.hashCode(); return result; } @@ -68,10 +68,7 @@ public class SQLOrderBy extends SQLObjectImpl { if (obj == null) return false; if (getClass() != obj.getClass()) return false; SQLOrderBy other = (SQLOrderBy) obj; - if (items == null) { - if (other.items != null) return false; - } else if (!items.equals(other.items)) return false; - return true; + return items.equals(other.items); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLOrderingSpecification.java b/src/main/java/com/alibaba/druid/sql/ast/SQLOrderingSpecification.java index 213ce02d57..f2f1830e1e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLOrderingSpecification.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLOrderingSpecification.java @@ -16,5 +16,5 @@ package com.alibaba.druid.sql.ast; public enum SQLOrderingSpecification { - ASC, DESC; + ASC, DESC } diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java b/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java index c333c9288c..eea217d206 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java @@ -1,10 +1,10 @@ package com.alibaba.druid.sql.ast; +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + import java.util.ArrayList; import java.util.List; -import com.alibaba.druid.sql.visitor.SQLASTVisitor; - /* * Copyright 1999-2011 Alibaba Group Holding Ltd. * @@ -62,7 +62,7 @@ public class SQLOver extends SQLObjectImpl { final int prime = 31; int result = 1; result = prime * result + ((orderBy == null) ? 0 : orderBy.hashCode()); - result = prime * result + ((partitionBy == null) ? 0 : partitionBy.hashCode()); + result = prime * result + partitionBy.hashCode(); return result; } @@ -85,14 +85,7 @@ public class SQLOver extends SQLObjectImpl { } else if (!orderBy.equals(other.orderBy)) { return false; } - if (partitionBy == null) { - if (other.partitionBy != null) { - return false; - } - } else if (!partitionBy.equals(other.partitionBy)) { - return false; - } - return true; + return partitionBy.equals(other.partitionBy); } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java index 3e1a9a368a..e999167a8e 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java @@ -33,7 +33,7 @@ public class SQLIdentifierExpr extends SQLExprImpl implements SQLName { this.name = name; } - public String getSimleName() { + public String getSimpleName() { return name; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java index 07b256ab8a..f54b6256d8 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java @@ -34,7 +34,7 @@ public class SQLPropertyExpr extends SQLExprImpl implements SQLName { } - public String getSimleName() { + public String getSimpleName() { return name; } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/NotNullConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/NotNullConstraint.java index 7f34d64301..329405cd1c 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/NotNullConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/NotNullConstraint.java @@ -17,7 +17,7 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class NotNullConstraint extends SQLConstaintImpl implements SQLColumnConstraint { +public class NotNullConstraint extends SQLConstraintImpl implements SQLColumnConstraint { public NotNullConstraint(){ diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddConstraint.java index 7cce49b190..2ec441662b 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddConstraint.java @@ -20,14 +20,14 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLAlterTableAddConstraint extends SQLObjectImpl implements SQLAlterTableItem { - private SQLConstaint constraint; + private SQLConstraint constraint; private boolean withNoCheck = false; public SQLAlterTableAddConstraint(){ } - public SQLAlterTableAddConstraint(SQLConstaint constraint){ + public SQLAlterTableAddConstraint(SQLConstraint constraint){ this.setConstraint(constraint); } @@ -39,11 +39,11 @@ public class SQLAlterTableAddConstraint extends SQLObjectImpl implements SQLAlte visitor.endVisit(this); } - public SQLConstaint getConstraint() { + public SQLConstraint getConstraint() { return constraint; } - public void setConstraint(SQLConstaint constraint) { + public void setConstraint(SQLConstraint constraint) { if (constraint != null) { constraint.setParent(this); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeinKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeignKey.java similarity index 92% rename from src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeinKey.java rename to src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeignKey.java index c422b6b3aa..bc29778287 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeinKey.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeignKey.java @@ -19,7 +19,7 @@ import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class SQLAlterTableDropForeinKey extends SQLObjectImpl implements SQLAlterTableItem { +public class SQLAlterTableDropForeignKey extends SQLObjectImpl implements SQLAlterTableItem { private SQLName indexName; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharactorDataType.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharacterDataType.java similarity index 90% rename from src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharactorDataType.java rename to src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharacterDataType.java index c02e8a126b..8c6276d9dc 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharactorDataType.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharacterDataType.java @@ -18,7 +18,7 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.ast.SQLDataTypeImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class SQLCharactorDataType extends SQLDataTypeImpl { +public class SQLCharacterDataType extends SQLDataTypeImpl { private String charSetName; private String collate; @@ -28,7 +28,7 @@ public class SQLCharactorDataType extends SQLDataTypeImpl { public final static String CHAR_TYPE_BYTE = "BYTE"; public final static String CHAR_TYPE_CHAR = "CHAR"; - public SQLCharactorDataType(String name){ + public SQLCharacterDataType(String name){ super(name); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java index 4f28a6b100..1f28ef7172 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java @@ -18,7 +18,7 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class SQLCheck extends SQLConstaintImpl implements SQLTableElement { +public class SQLCheck extends SQLConstraintImpl implements SQLTableElement { private SQLExpr expr; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnCheck.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnCheck.java index 082040079d..7d12a7f1bd 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnCheck.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnCheck.java @@ -18,7 +18,7 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class SQLColumnCheck extends SQLConstaintImpl implements SQLColumnConstraint { +public class SQLColumnCheck extends SQLConstraintImpl implements SQLColumnConstraint { private SQLExpr expr; diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnConstraint.java index c9ba04efdb..87617583bc 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnConstraint.java @@ -15,6 +15,6 @@ */ package com.alibaba.druid.sql.ast.statement; -public interface SQLColumnConstraint extends SQLConstaint { +public interface SQLColumnConstraint extends SQLConstraint { } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java index 9cc28348d3..19a0b70217 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java @@ -15,21 +15,21 @@ */ package com.alibaba.druid.sql.ast.statement; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.sql.ast.SQLDataType; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObjectImpl; import com.alibaba.druid.sql.visitor.SQLASTVisitor; +import java.util.ArrayList; +import java.util.List; + public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElement { protected SQLName name; protected SQLDataType dataType; protected SQLExpr defaultExpr; - protected final List constaints = new ArrayList(0); + protected final List constraints = new ArrayList(0); protected SQLExpr comment; protected Boolean enable; @@ -73,8 +73,8 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen this.defaultExpr = defaultExpr; } - public List getConstaints() { - return constaints; + public List getConstraints() { + return constraints; } @Override @@ -94,7 +94,7 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen this.acceptChild(visitor, name); this.acceptChild(visitor, dataType); this.acceptChild(visitor, defaultExpr); - this.acceptChild(visitor, constaints); + this.acceptChild(visitor, constraints); } visitor.endVisit(this); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnPrimaryKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnPrimaryKey.java index c4704eb3fe..27766c74c2 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnPrimaryKey.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnPrimaryKey.java @@ -17,7 +17,7 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class SQLColumnPrimaryKey extends SQLConstaintImpl implements SQLColumnConstraint { +public class SQLColumnPrimaryKey extends SQLConstraintImpl implements SQLColumnConstraint { @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnReference.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnReference.java index 6c4c3ff9da..8e2984ef23 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnReference.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnReference.java @@ -21,7 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class SQLColumnReference extends SQLConstaintImpl implements SQLColumnConstraint { +public class SQLColumnReference extends SQLConstraintImpl implements SQLColumnConstraint { private SQLName table; private List columns = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnUniqueKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnUniqueKey.java index 2d7a96d0cf..c7d4092c5f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnUniqueKey.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnUniqueKey.java @@ -17,7 +17,7 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class SQLColumnUniqueKey extends SQLConstaintImpl implements SQLColumnConstraint { +public class SQLColumnUniqueKey extends SQLConstraintImpl implements SQLColumnConstraint { @Override protected void accept0(SQLASTVisitor visitor) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstaint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraint.java similarity index 91% rename from src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstaint.java rename to src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraint.java index 685f1bf801..beab45a54d 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstaint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraint.java @@ -18,7 +18,7 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObject; -public interface SQLConstaint extends SQLObject { +public interface SQLConstraint extends SQLObject { SQLName getName(); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstaintImpl.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraintImpl.java similarity index 86% rename from src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstaintImpl.java rename to src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraintImpl.java index 2fa9566599..58c4eddaa5 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstaintImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraintImpl.java @@ -18,12 +18,12 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObjectImpl; -public abstract class SQLConstaintImpl extends SQLObjectImpl implements SQLConstaint { +public abstract class SQLConstraintImpl extends SQLObjectImpl implements SQLConstraint { private SQLName name; private Boolean enable; - public SQLConstaintImpl(){ + public SQLConstraintImpl(){ } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java index e0af4155fa..64a16322c5 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java @@ -19,7 +19,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLName; -public interface SQLForeignKeyConstraint extends SQLConstaint, SQLTableElement, SQLTableConstaint { +public interface SQLForeignKeyConstraint extends SQLConstraint, SQLTableElement, SQLTableConstraint { List getReferencingColumns(); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyImpl.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyImpl.java index e37111e6e3..7c9f59e54f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyImpl.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyImpl.java @@ -21,7 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class SQLForeignKeyImpl extends SQLConstaintImpl implements SQLForeignKeyConstraint { +public class SQLForeignKeyImpl extends SQLConstraintImpl implements SQLForeignKeyConstraint { private SQLName referencedTableName; private List referencingColumns = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableConstaint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableConstraint.java similarity index 87% rename from src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableConstaint.java rename to src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableConstraint.java index 488acb863a..104d48798f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableConstaint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTableConstraint.java @@ -15,6 +15,6 @@ */ package com.alibaba.druid.sql.ast.statement; -public interface SQLTableConstaint extends SQLConstaint, SQLTableElement { +public interface SQLTableConstraint extends SQLConstraint, SQLTableElement { } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnique.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnique.java index aaef227906..b51eb7bce2 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnique.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnique.java @@ -21,7 +21,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class SQLUnique extends SQLConstaintImpl implements SQLUniqueConstraint, SQLTableElement { +public class SQLUnique extends SQLConstraintImpl implements SQLUniqueConstraint, SQLTableElement { private final List columns = new ArrayList(); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java index 94b5aba048..7ac17d2be2 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java @@ -19,7 +19,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; -public interface SQLUniqueConstraint extends SQLConstaint { +public interface SQLUniqueConstraint extends SQLConstraint { List getColumns(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlKey.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlKey.java index b0dc3d85c4..b6b685a29e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlKey.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlKey.java @@ -16,13 +16,13 @@ package com.alibaba.druid.sql.dialect.mysql.ast; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.statement.SQLTableConstaint; +import com.alibaba.druid.sql.ast.statement.SQLTableConstraint; import com.alibaba.druid.sql.ast.statement.SQLUnique; import com.alibaba.druid.sql.ast.statement.SQLUniqueConstraint; import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class MySqlKey extends SQLUnique implements SQLUniqueConstraint, SQLTableConstaint { +public class MySqlKey extends SQLUnique implements SQLUniqueConstraint, SQLTableConstraint { private SQLName indexName; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MysqlForeignKey.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MysqlForeignKey.java index 29437bde4d..6ef1906d67 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MysqlForeignKey.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MysqlForeignKey.java @@ -27,7 +27,7 @@ public class MysqlForeignKey extends SQLForeignKeyImpl { private SQLName indexName; - private boolean hasConstaint; + private boolean hasConstraint; private Match referenceMatch; @@ -43,12 +43,12 @@ public class MysqlForeignKey extends SQLForeignKeyImpl { this.indexName = indexName; } - public boolean isHasConstaint() { - return hasConstaint; + public boolean isHasConstraint() { + return hasConstraint; } - public void setHasConstaint(boolean hasConstaint) { - this.hasConstaint = hasConstaint; + public void setHasConstraint(boolean hasConstraint) { + this.hasConstraint = hasConstraint; } @Override diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlUserName.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlUserName.java index 2884903ac7..4de77eb6a4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlUserName.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlUserName.java @@ -45,11 +45,11 @@ public class MySqlUserName extends MySqlExprImpl implements SQLName { visitor.endVisit(this); } - public String getSimleName() { + public String getSimpleName() { return userName + '@' + host; } public String toString() { - return getSimleName(); + return getSimpleName(); } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java index 6d9a818064..0680ae6d1a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java @@ -21,7 +21,7 @@ import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.ast.statement.SQLForeignKeyConstraint; import com.alibaba.druid.sql.ast.statement.SQLSelect; -import com.alibaba.druid.sql.ast.statement.SQLTableConstaint; +import com.alibaba.druid.sql.ast.statement.SQLTableConstraint; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlPrimaryKey; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique; @@ -136,7 +136,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { } else if (lexer.token() == (Token.KEY)) { stmt.getTableElementList().add(parseConstraint()); } else if (lexer.token() == (Token.PRIMARY)) { - SQLTableConstaint pk = parseConstraint(); + SQLTableConstraint pk = parseConstraint(); pk.setParent(stmt); stmt.getTableElementList().add(pk); } else if (lexer.token() == (Token.FOREIGN)) { @@ -595,7 +595,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { return false; } - protected SQLTableConstaint parseConstraint() { + protected SQLTableConstraint parseConstraint() { SQLName name = null; boolean hasConstaint = false; if (lexer.token() == (Token.CONSTRAINT)) { @@ -661,21 +661,21 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { MySqlPrimaryKey pk = this.getExprParser().parsePrimaryKey(); pk.setName(name); pk.setHasConstaint(hasConstaint); - return (SQLTableConstaint) pk; + return (SQLTableConstraint) pk; } if (lexer.token() == Token.UNIQUE) { MySqlUnique uk = this.getExprParser().parseUnique(); uk.setName(name); uk.setHasConstaint(hasConstaint); - return (SQLTableConstaint) uk; + return (SQLTableConstraint) uk; } if (lexer.token() == Token.FOREIGN) { MysqlForeignKey fk = this.getExprParser().parseForeignKey(); fk.setName(name); - fk.setHasConstaint(hasConstaint); - return (SQLTableConstaint) fk; + fk.setHasConstraint(hasConstaint); + return (SQLTableConstraint) fk; } throw new ParserException("TODO :" + lexer.token()); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java index 2ad7da4443..6674793ac5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java @@ -37,7 +37,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableKeys; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropConstraint; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeignKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropPrimaryKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableEnableConstraint; @@ -2206,7 +2206,7 @@ public class MySqlStatementParser extends SQLStatementParser { } else if (lexer.token() == Token.FOREIGN) { MysqlForeignKey fk = this.getExprParser().parseForeignKey(); fk.setName(constraintName); - fk.setHasConstaint(true); + fk.setHasConstraint(true); SQLAlterTableAddConstraint item = new SQLAlterTableAddConstraint(fk); @@ -2430,7 +2430,7 @@ public class MySqlStatementParser extends SQLStatementParser { lexer.nextToken(); accept(Token.KEY); SQLName indexName = this.exprParser.name(); - SQLAlterTableDropForeinKey item = new SQLAlterTableDropForeinKey(); + SQLAlterTableDropForeignKey item = new SQLAlterTableDropForeignKey(); item.setIndexName(indexName); stmt.getItems().add(item); } else if (lexer.token() == Token.PRIMARY) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java index f5f1f16e4a..ca66aaeaaa 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java @@ -31,7 +31,7 @@ import com.alibaba.druid.sql.ast.expr.SQLNullExpr; import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; -import com.alibaba.druid.sql.ast.statement.SQLCharactorDataType; +import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType; import com.alibaba.druid.sql.ast.statement.SQLColumnConstraint; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; @@ -312,7 +312,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV print(" AUTO_INCREMENT"); } - for (SQLColumnConstraint item : x.getConstaints()) { + for (SQLColumnConstraint item : x.getConstraints()) { print(' '); item.accept(this); } @@ -353,8 +353,8 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV } - if (x instanceof SQLCharactorDataType) { - SQLCharactorDataType charType = (SQLCharactorDataType) x; + if (x instanceof SQLCharacterDataType) { + SQLCharacterDataType charType = (SQLCharacterDataType) x; if (charType.getCharSetName() != null) { print(" CHARACTER SET "); print(charType.getCharSetName()); @@ -368,7 +368,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV return false; } - public boolean visit(SQLCharactorDataType x) { + public boolean visit(SQLCharacterDataType x) { print(x.getName()); if (x.getArguments().size() > 0) { print("("); @@ -2838,7 +2838,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV @Override public boolean visit(MysqlForeignKey x) { - if (x.isHasConstaint()) { + if (x.isHasConstraint()) { print("CONSTRAINT "); if (x.getName() != null) { x.getName().accept(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedOutputVisitor.java index 520327e6fa..909e4420be 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlParameterizedOutputVisitor.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.sql.dialect.mysql.visitor; -import java.security.AccessControlException; -import java.util.List; -import java.util.Properties; - import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; import com.alibaba.druid.sql.ast.expr.SQLCharExpr; @@ -37,6 +33,10 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement; import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils; import com.alibaba.druid.sql.visitor.ParameterizedVisitor; +import java.security.AccessControlException; +import java.util.List; +import java.util.Properties; + public class MySqlParameterizedOutputVisitor extends MySqlOutputVisitor implements ParameterizedVisitor { private boolean shardingSupport = true; @@ -51,12 +51,12 @@ public class MySqlParameterizedOutputVisitor extends MySqlOutputVisitor implemen super(appender); try { - configFromPropety(System.getProperties()); + configFromProperty(System.getProperties()); } catch (AccessControlException e) { } } - public void configFromPropety(Properties properties) { + public void configFromProperty(Properties properties) { { String property = properties.getProperty("druid.parameterized.shardingSupport"); if ("true".equals(property)) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDbLinkExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDbLinkExpr.java index 0e9f37c8eb..a58c0f327a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDbLinkExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/expr/OracleDbLinkExpr.java @@ -30,7 +30,7 @@ public class OracleDbLinkExpr extends SQLExprImpl implements SQLName, OracleExpr } - public String getSimleName() { + public String getSimpleName() { return dbLink; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableAddConstaint.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableAddConstaint.java index 992754b554..1045e0c208 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableAddConstaint.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleAlterTableAddConstaint.java @@ -15,12 +15,12 @@ */ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; -import com.alibaba.druid.sql.ast.statement.SQLConstaint; +import com.alibaba.druid.sql.ast.statement.SQLConstraint; import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor; public class OracleAlterTableAddConstaint extends OracleAlterTableItem { - private SQLConstaint constraint; + private SQLConstraint constraint; @Override public void accept0(OracleASTVisitor visitor) { @@ -30,11 +30,11 @@ public class OracleAlterTableAddConstaint extends OracleAlterTableItem { visitor.endVisit(this); } - public SQLConstaint getConstraint() { + public SQLConstraint getConstraint() { return constraint; } - public void setConstraint(SQLConstaint constraint) { + public void setConstraint(SQLConstraint constraint) { this.constraint = constraint; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraint.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraint.java index 129d73818a..fe379676f5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/stmt/OracleConstraint.java @@ -16,11 +16,11 @@ package com.alibaba.druid.sql.dialect.oracle.ast.stmt; import com.alibaba.druid.sql.ast.SQLName; -import com.alibaba.druid.sql.ast.statement.SQLConstaint; +import com.alibaba.druid.sql.ast.statement.SQLConstraint; import com.alibaba.druid.sql.ast.statement.SQLTableElement; import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject; -public interface OracleConstraint extends OracleSQLObject, SQLConstaint, SQLTableElement { +public interface OracleConstraint extends OracleSQLObject, SQLConstraint, SQLTableElement { SQLName getExceptionsInto(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java index 7089bd4071..5727b4d7cf 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleExprParser.java @@ -36,7 +36,7 @@ import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; import com.alibaba.druid.sql.ast.expr.SQLUnaryExpr; import com.alibaba.druid.sql.ast.expr.SQLUnaryOperator; import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; -import com.alibaba.druid.sql.ast.statement.SQLCharactorDataType; +import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType; import com.alibaba.druid.sql.ast.statement.SQLCheck; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.ast.statement.SQLForeignKeyConstraint; @@ -242,7 +242,7 @@ public class OracleExprParser extends SQLExprParser { } if (isCharType(typeName)) { - SQLCharactorDataType charType = new SQLCharactorDataType(typeName); + SQLCharacterDataType charType = new SQLCharacterDataType(typeName); if (lexer.token() == Token.LPAREN) { lexer.nextToken(); @@ -251,10 +251,10 @@ public class OracleExprParser extends SQLExprParser { if (identifierEquals("CHAR")) { lexer.nextToken(); - charType.setCharType(SQLCharactorDataType.CHAR_TYPE_CHAR); + charType.setCharType(SQLCharacterDataType.CHAR_TYPE_CHAR); } else if (identifierEquals("BYTE")) { lexer.nextToken(); - charType.setCharType(SQLCharactorDataType.CHAR_TYPE_BYTE); + charType.setCharType(SQLCharacterDataType.CHAR_TYPE_BYTE); } accept(Token.RPAREN); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java index 80fa646599..c907013ad6 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/visitor/OracleOutputVisitor.java @@ -28,7 +28,7 @@ import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.sql.ast.expr.SQLQueryExpr; import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem; -import com.alibaba.druid.sql.ast.statement.SQLCharactorDataType; +import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType; import com.alibaba.druid.sql.ast.statement.SQLCheck; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; @@ -3141,7 +3141,7 @@ public class OracleOutputVisitor extends SQLASTOutputVisitor implements OracleAS } - public boolean visit(SQLCharactorDataType x) { + public boolean visit(SQLCharacterDataType x) { print(x.getName()); if (x.getArguments().size() > 0) { print("("); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerColumnDefinition.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerColumnDefinition.java index ade575df08..7781c08afe 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerColumnDefinition.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/SQLServerColumnDefinition.java @@ -49,7 +49,7 @@ public class SQLServerColumnDefinition extends SQLColumnDefinition implements SQ this.acceptChild(visitor, name); this.acceptChild(visitor, dataType); this.acceptChild(visitor, defaultExpr); - this.acceptChild(visitor, constaints); + this.acceptChild(visitor, constraints); this.acceptChild(visitor, identity); } visitor.endVisit(this); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/expr/SQLServerObjectReferenceExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/expr/SQLServerObjectReferenceExpr.java index 64d5144c19..62ea8809c4 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/expr/SQLServerObjectReferenceExpr.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/ast/expr/SQLServerObjectReferenceExpr.java @@ -45,7 +45,7 @@ public class SQLServerObjectReferenceExpr extends SQLServerObjectImpl implements } } - public String getSimleName() { + public String getSimpleName() { if (schema != null) { return schema; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java index 70a477331f..6bb20d8fbb 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/visitor/SQLServerOutputVisitor.java @@ -267,7 +267,7 @@ public class SQLServerOutputVisitor extends SQLASTOutputVisitor implements SQLSe visitColumnDefault(x); } - for (SQLColumnConstraint item : x.getConstaints()) { + for (SQLColumnConstraint item : x.getConstraints()) { print(' '); item.accept(this); } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java index ff7029cc4d..9edd4d4176 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLCreateTableParser.java @@ -16,7 +16,7 @@ package com.alibaba.druid.sql.parser; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; -import com.alibaba.druid.sql.ast.statement.SQLConstaint; +import com.alibaba.druid.sql.ast.statement.SQLConstraint; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.ast.statement.SQLTableElement; @@ -76,7 +76,7 @@ public class SQLCreateTableParser extends SQLDDLParser { || lexer.token == Token.UNIQUE // || lexer.token == Token.CHECK // || lexer.token == Token.CONSTRAINT) { - SQLConstaint constraint = this.exprParser.parseConstaint(); + SQLConstraint constraint = this.exprParser.parseConstaint(); constraint.setParent(createTable); createTable.getTableElementList().add((SQLTableElement) constraint); } else if (lexer.token() == Token.TABLESPACE) { @@ -100,7 +100,7 @@ public class SQLCreateTableParser extends SQLDDLParser { // while // (this.tokenList.current().equals(OracleToken.ConstraintToken)) { - // parseConstaint(table.getConstaints()); + // parseConstaint(table.getConstraints()); // // if (this.tokenList.current().equals(OracleToken.CommaToken)) // ; diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLDDLParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLDDLParser.java index 8b7e703cf9..3b7ccb7b25 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLDDLParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLDDLParser.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.sql.parser; -import com.alibaba.druid.sql.ast.statement.SQLTableConstaint; +import com.alibaba.druid.sql.ast.statement.SQLTableConstraint; public class SQLDDLParser extends SQLStatementParser { @@ -27,7 +27,7 @@ public class SQLDDLParser extends SQLStatementParser { super(exprParser); } - protected SQLTableConstaint parseConstraint() { + protected SQLTableConstraint parseConstraint() { if (lexer.token() == Token.CONSTRAINT) { lexer.nextToken(); } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index 08dde1c682..0296518bf5 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -62,14 +62,14 @@ import com.alibaba.druid.sql.ast.expr.SQLUnaryOperator; import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; import com.alibaba.druid.sql.ast.statement.NotNullConstraint; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; -import com.alibaba.druid.sql.ast.statement.SQLCharactorDataType; +import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType; import com.alibaba.druid.sql.ast.statement.SQLCheck; import com.alibaba.druid.sql.ast.statement.SQLColumnCheck; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.ast.statement.SQLColumnPrimaryKey; import com.alibaba.druid.sql.ast.statement.SQLColumnReference; import com.alibaba.druid.sql.ast.statement.SQLColumnUniqueKey; -import com.alibaba.druid.sql.ast.statement.SQLConstaint; +import com.alibaba.druid.sql.ast.statement.SQLConstraint; import com.alibaba.druid.sql.ast.statement.SQLForeignKeyConstraint; import com.alibaba.druid.sql.ast.statement.SQLForeignKeyImpl; import com.alibaba.druid.sql.ast.statement.SQLPrimaryKey; @@ -1314,7 +1314,7 @@ public class SQLExprParser extends SQLParser { String typeName = typeExpr.toString(); if (isCharType(typeName)) { - SQLCharactorDataType charType = new SQLCharactorDataType(typeName); + SQLCharacterDataType charType = new SQLCharacterDataType(typeName); if (lexer.token() == Token.LPAREN) { lexer.nextToken(); @@ -1359,7 +1359,7 @@ public class SQLExprParser extends SQLParser { ; } - protected SQLDataType parseCharTypeRest(SQLCharactorDataType charType) { + protected SQLDataType parseCharTypeRest(SQLCharacterDataType charType) { if (identifierEquals("CHARACTER")) { lexer.nextToken(); @@ -1418,7 +1418,7 @@ public class SQLExprParser extends SQLParser { if (lexer.token() == Token.NOT) { lexer.nextToken(); accept(Token.NULL); - column.getConstaints().add(new NotNullConstraint()); + column.getConstraints().add(new NotNullConstraint()); return parseColumnRest(column); } @@ -1431,7 +1431,7 @@ public class SQLExprParser extends SQLParser { if (lexer.token == Token.PRIMARY) { lexer.nextToken(); accept(Token.KEY); - column.getConstaints().add(new SQLColumnPrimaryKey()); + column.getConstraints().add(new SQLColumnPrimaryKey()); return parseColumnRest(column); } @@ -1440,7 +1440,7 @@ public class SQLExprParser extends SQLParser { if (lexer.token() == Token.KEY) { lexer.nextToken(); } - column.getConstaints().add(new SQLColumnPrimaryKey()); + column.getConstraints().add(new SQLColumnPrimaryKey()); return parseColumnRest(column); } @@ -1454,7 +1454,7 @@ public class SQLExprParser extends SQLParser { accept(Token.KEY); SQLColumnPrimaryKey pk = new SQLColumnPrimaryKey(); pk.setName(name); - column.getConstaints().add(pk); + column.getConstraints().add(pk); return parseColumnRest(column); } @@ -1462,7 +1462,7 @@ public class SQLExprParser extends SQLParser { lexer.nextToken(); SQLColumnUniqueKey uk = new SQLColumnUniqueKey(); uk.setName(name); - column.getConstaints().add(uk); + column.getConstraints().add(uk); return parseColumnRest(column); } @@ -1474,7 +1474,7 @@ public class SQLExprParser extends SQLParser { accept(Token.LPAREN); this.names(ref.getColumns(), ref); accept(Token.RPAREN); - column.getConstaints().add(ref); + column.getConstraints().add(ref); return parseColumnRest(column); } @@ -1483,7 +1483,7 @@ public class SQLExprParser extends SQLParser { accept(Token.NULL); NotNullConstraint notNull = new NotNullConstraint(); notNull.setName(name); - column.getConstaints().add(notNull); + column.getConstraints().add(notNull); return parseColumnRest(column); } @@ -1491,7 +1491,7 @@ public class SQLExprParser extends SQLParser { SQLColumnCheck check = parseColumnCheck(); check.setName(name); check.setParent(column); - column.getConstaints().add(check); + column.getConstraints().add(check); return parseColumnRest(column); } @@ -1507,7 +1507,7 @@ public class SQLExprParser extends SQLParser { if (lexer.token == Token.CHECK) { SQLColumnCheck check = parseColumnCheck(); - column.getConstaints().add(check); + column.getConstraints().add(check); return parseColumnRest(column); } @@ -1590,7 +1590,7 @@ public class SQLExprParser extends SQLParser { } } - public SQLConstaint parseConstaint() { + public SQLConstraint parseConstaint() { SQLName name = null; if (lexer.token() == Token.CONSTRAINT) { @@ -1598,7 +1598,7 @@ public class SQLExprParser extends SQLParser { name = this.name(); } - SQLConstaint constraint; + SQLConstraint constraint; if (lexer.token() == Token.PRIMARY) { constraint = parsePrimaryKey(); } else if (lexer.token() == Token.UNIQUE) { diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java index 18e5007243..f971ee70d5 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java @@ -41,7 +41,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAssignItem; import com.alibaba.druid.sql.ast.statement.SQLCallStatement; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.ast.statement.SQLCommentStatement; -import com.alibaba.druid.sql.ast.statement.SQLConstaint; +import com.alibaba.druid.sql.ast.statement.SQLConstraint; import com.alibaba.druid.sql.ast.statement.SQLCreateDatabaseStatement; import com.alibaba.druid.sql.ast.statement.SQLCreateIndexStatement; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; @@ -705,7 +705,7 @@ public class SQLStatementParser extends SQLParser { lexer.nextToken(); acceptIdentifier("NOCHECK"); acceptIdentifier("ADD"); - SQLConstaint check = this.exprParser.parseConstaint(); + SQLConstraint check = this.exprParser.parseConstaint(); SQLAlterTableAddConstraint addCheck = new SQLAlterTableAddConstraint(); addCheck.setWithNoCheck(true); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index 03edc721b7..c58e34e3f5 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -73,7 +73,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableKeys; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropConstraint; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeignKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropPrimaryKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableEnableConstraint; @@ -83,7 +83,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableRenameColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; import com.alibaba.druid.sql.ast.statement.SQLCallStatement; -import com.alibaba.druid.sql.ast.statement.SQLCharactorDataType; +import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType; import com.alibaba.druid.sql.ast.statement.SQLCheck; import com.alibaba.druid.sql.ast.statement.SQLColumnCheck; import com.alibaba.druid.sql.ast.statement.SQLColumnConstraint; @@ -472,7 +472,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab return false; } - public boolean visit(SQLCharactorDataType x) { + public boolean visit(SQLCharacterDataType x) { visit((SQLDataType) x); return false; } @@ -883,7 +883,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab visitColumnDefault(x); } - for (SQLColumnConstraint item : x.getConstaints()) { + for (SQLColumnConstraint item : x.getConstraints()) { boolean newLine = item instanceof SQLForeignKeyConstraint // || item instanceof SQLPrimaryKey // || item instanceof SQLColumnCheck // @@ -1571,7 +1571,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab } @Override - public boolean visit(SQLAlterTableDropForeinKey x) { + public boolean visit(SQLAlterTableDropForeignKey x) { print("DROP FOREIGN KEY "); x.getIndexName().accept(this); return false; diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java index d3e81f5445..321ad9d43a 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitor.java @@ -58,7 +58,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableKeys; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropConstraint; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeignKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropPrimaryKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableEnableConstraint; @@ -67,7 +67,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableRenameColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; import com.alibaba.druid.sql.ast.statement.SQLCallStatement; -import com.alibaba.druid.sql.ast.statement.SQLCharactorDataType; +import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType; import com.alibaba.druid.sql.ast.statement.SQLCheck; import com.alibaba.druid.sql.ast.statement.SQLColumnCheck; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; @@ -257,9 +257,9 @@ public interface SQLASTVisitor { void endVisit(SQLDataType x); - boolean visit(SQLCharactorDataType x); + boolean visit(SQLCharacterDataType x); - void endVisit(SQLCharactorDataType x); + void endVisit(SQLCharacterDataType x); boolean visit(SQLDeleteStatement x); @@ -425,9 +425,9 @@ public interface SQLASTVisitor { void endVisit(SQLCheck x); - boolean visit(SQLAlterTableDropForeinKey x); + boolean visit(SQLAlterTableDropForeignKey x); - void endVisit(SQLAlterTableDropForeinKey x); + void endVisit(SQLAlterTableDropForeignKey x); boolean visit(SQLAlterTableDropPrimaryKey x); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java index 0cbe8de94f..2c74d0ca1e 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTVisitorAdapter.java @@ -59,7 +59,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableKeys; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropConstraint; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeignKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropPrimaryKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableEnableConstraint; @@ -68,7 +68,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableRenameColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement; import com.alibaba.druid.sql.ast.statement.SQLAssignItem; import com.alibaba.druid.sql.ast.statement.SQLCallStatement; -import com.alibaba.druid.sql.ast.statement.SQLCharactorDataType; +import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType; import com.alibaba.druid.sql.ast.statement.SQLCheck; import com.alibaba.druid.sql.ast.statement.SQLColumnCheck; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; @@ -732,12 +732,12 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor { } @Override - public boolean visit(SQLCharactorDataType x) { + public boolean visit(SQLCharacterDataType x) { return true; } @Override - public void endVisit(SQLCharactorDataType x) { + public void endVisit(SQLCharacterDataType x) { } @@ -762,12 +762,12 @@ public class SQLASTVisitorAdapter implements SQLASTVisitor { } @Override - public boolean visit(SQLAlterTableDropForeinKey x) { + public boolean visit(SQLAlterTableDropForeignKey x) { return true; } @Override - public void endVisit(SQLAlterTableDropForeinKey x) { + public void endVisit(SQLAlterTableDropForeignKey x) { } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java index e7269db0ab..7153bf58cc 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -42,7 +42,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddIndex; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableConstraint; import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropConstraint; -import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey; +import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeignKey; import com.alibaba.druid.sql.ast.statement.SQLAlterTableEnableConstraint; import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem; import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement; @@ -1146,7 +1146,7 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { } @Override - public boolean visit(SQLAlterTableDropForeinKey x) { + public boolean visit(SQLAlterTableDropForeignKey x) { return false; } @@ -1243,13 +1243,13 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { column.accept(this); } - String table = x.getReferencedTableName().getSimleName(); + String table = x.getReferencedTableName().getSimpleName(); setCurrentTable(table); TableStat stat = getTableStat(table); stat.incrementReferencedCount(); for (SQLName column : x.getReferencedColumns()) { - String columnName = column.getSimleName(); + String columnName = column.getSimpleName(); addColumn(table, columnName); } diff --git a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java index 501299ffb1..99bd023a96 100644 --- a/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java +++ b/src/main/java/com/alibaba/druid/stat/DruidDataSourceStatManager.java @@ -15,13 +15,11 @@ */ package com.alibaba.druid.stat; -import java.lang.management.ManagementFactory; -import java.lang.reflect.Method; -import java.util.IdentityHashMap; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.atomic.AtomicLong; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; +import com.alibaba.druid.util.DruidDataSourceUtils; +import com.alibaba.druid.util.JMXUtils; import javax.management.JMException; import javax.management.MBeanServer; @@ -33,12 +31,13 @@ import javax.management.openmbean.SimpleType; import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.DruidDataSourceUtils; -import com.alibaba.druid.util.JMXUtils; +import java.lang.management.ManagementFactory; +import java.lang.reflect.Method; +import java.util.IdentityHashMap; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.atomic.AtomicLong; @SuppressWarnings("rawtypes") public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBean { @@ -53,7 +52,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe private final AtomicLong resetCount = new AtomicLong(); // global instances - private static volatile IdentityHashMap dataSources; + private static volatile IdentityHashMap dataSources; private final static String MBEAN_NAME = "com.alibaba.druid:type=DruidDataSourceStat"; @@ -61,7 +60,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe return instance; } - public static void cear() { + public static void clear() { IdentityHashMap dataSources = getInstances(); synchronized (dataSources) { @@ -85,12 +84,18 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe } @SuppressWarnings("unchecked") - public synchronized static IdentityHashMap getInstances() { - if (dataSources == null) { - if (isRegisterToSystemProperty()) { - dataSources = getInstances0(); - } else { - dataSources = new IdentityHashMap(); + public static IdentityHashMap getInstances() { + IdentityHashMap tmp = dataSources; + if (tmp == null) { + synchronized (DruidDataSourceStatManager.class) { + if (isRegisterToSystemProperty()) { + dataSources = getInstances0(); + } else { + tmp = dataSources; + if (null == tmp) { + dataSources = tmp = new IdentityHashMap(); + } + } } } @@ -99,12 +104,7 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe public static boolean isRegisterToSystemProperty() { String value = System.getProperty(SYS_PROP_REGISTER_SYS_PROPERTY); - - if ("true".equals(value)) { - return true; - } - - return false; + return "true".equals(value); } @SuppressWarnings("unchecked") @@ -189,12 +189,10 @@ public class DruidDataSourceStatManager implements DruidDataSourceStatManagerMBe MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); - if (objectName != null) { - try { - mbeanServer.unregisterMBean(objectName); - } catch (Throwable ex) { - LOG.error("unregister mbean error", ex); - } + try { + mbeanServer.unregisterMBean(objectName); + } catch (Throwable ex) { + LOG.error("unregister mbean error", ex); } if (instances.size() == 0) { diff --git a/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java b/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java index eec45fb690..bf16b6d3ed 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java @@ -15,6 +15,19 @@ */ package com.alibaba.druid.stat; +import com.alibaba.druid.Constants; +import com.alibaba.druid.filter.Filter; +import com.alibaba.druid.filter.stat.StatFilter; +import com.alibaba.druid.proxy.jdbc.DataSourceProxy; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; +import com.alibaba.druid.util.Histogram; + +import javax.management.JMException; +import javax.management.openmbean.CompositeType; +import javax.management.openmbean.TabularData; +import javax.management.openmbean.TabularDataSupport; +import javax.management.openmbean.TabularType; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; @@ -26,20 +39,6 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReentrantReadWriteLock; -import javax.management.JMException; -import javax.management.openmbean.CompositeType; -import javax.management.openmbean.TabularData; -import javax.management.openmbean.TabularDataSupport; -import javax.management.openmbean.TabularType; - -import com.alibaba.druid.Constants; -import com.alibaba.druid.filter.Filter; -import com.alibaba.druid.filter.stat.StatFilter; -import com.alibaba.druid.proxy.jdbc.DataSourceProxy; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.Histogram; - public class JdbcDataSourceStat implements JdbcDataSourceStatMBean { private final static Log LOG = LogFactory.getLog(JdbcDataSourceStat.class); @@ -52,7 +51,7 @@ public class JdbcDataSourceStat implements JdbcDataSourceStatMBean { private final JdbcResultSetStat resultSetStat = new JdbcResultSetStat(); private final JdbcStatementStat statementStat = new JdbcStatementStat(); - private int maxSqlSize = 1000 * 1; + private int maxSqlSize = 1000; private ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); private final LinkedHashMap sqlStatMap; @@ -364,8 +363,7 @@ public class JdbcDataSourceStat implements JdbcDataSourceStatMBean { } List values = new ArrayList(stats.size()); - for (int i = 0; i < stats.size(); ++i) { - JdbcSqlStat stat = stats.get(i); + for (JdbcSqlStat stat : stats) { JdbcSqlStatValue value = stat.getValueAndReset(); if (value.getExecuteCount() == 0 && value.getRunningCount() == 0) { continue; @@ -379,9 +377,7 @@ public class JdbcDataSourceStat implements JdbcDataSourceStatMBean { List stats = new ArrayList(sqlStatMap.size()); lock.readLock().lock(); try { - Iterator> iter = sqlStatMap.entrySet().iterator(); - while (iter.hasNext()) { - Map.Entry entry = iter.next(); + for (Map.Entry entry : sqlStatMap.entrySet()) { JdbcSqlStat stat = entry.getValue(); if (stat.getRunningCount() >= 0) { stats.add(entry.getValue()); @@ -392,8 +388,7 @@ public class JdbcDataSourceStat implements JdbcDataSourceStatMBean { } List values = new ArrayList(stats.size()); - for (int i = 0; i < stats.size(); ++i) { - JdbcSqlStat stat = stats.get(i); + for (JdbcSqlStat stat : stats) { JdbcSqlStatValue value = stat.getValue(false); if (value.getRunningCount() > 0) { values.add(value); diff --git a/src/main/java/com/alibaba/druid/stat/JdbcResultSetStat.java b/src/main/java/com/alibaba/druid/stat/JdbcResultSetStat.java index a7655295a8..5f05ae3564 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcResultSetStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcResultSetStat.java @@ -21,8 +21,8 @@ import java.util.concurrent.atomic.AtomicLong; public class JdbcResultSetStat implements JdbcResultSetStatMBean { - private final AtomicInteger openningCount = new AtomicInteger(); - private final AtomicInteger opeeningtMax = new AtomicInteger(); + private final AtomicInteger openingCount = new AtomicInteger(); + private final AtomicInteger openingMax = new AtomicInteger(); private final AtomicLong openCount = new AtomicLong(); private final AtomicLong errorCount = new AtomicLong(); @@ -39,7 +39,7 @@ public class JdbcResultSetStat implements JdbcResultSetStatMBean { private final AtomicLong closeCount = new AtomicLong(0); // ResultSet打开的计数 public void reset() { - opeeningtMax.set(0); + openingMax.set(0); openCount.set(0); errorCount.set(0); aliveNanoTotal.set(0); @@ -53,15 +53,13 @@ public class JdbcResultSetStat implements JdbcResultSetStatMBean { } public void beforeOpen() { - int invoking = openningCount.incrementAndGet(); + int invoking = openingCount.incrementAndGet(); for (;;) { - int max = opeeningtMax.get(); + int max = openingMax.get(); if (invoking > max) { - if (opeeningtMax.compareAndSet(max, invoking)) { + if (openingMax.compareAndSet(max, invoking)) { break; - } else { - continue; } } else { break; @@ -76,12 +74,12 @@ public class JdbcResultSetStat implements JdbcResultSetStatMBean { return errorCount.get(); } - public int getOpenningCount() { - return openningCount.get(); + public int getOpeningCount() { + return openingCount.get(); } - public int getOpenningMax() { - return opeeningtMax.get(); + public int getOpeningMax() { + return openingMax.get(); } public long getOpenCount() { @@ -113,7 +111,7 @@ public class JdbcResultSetStat implements JdbcResultSetStatMBean { } public void afterClose(long aliveNano) { - openningCount.decrementAndGet(); + openingCount.decrementAndGet(); aliveNanoTotal.addAndGet(aliveNano); @@ -122,8 +120,6 @@ public class JdbcResultSetStat implements JdbcResultSetStatMBean { if (aliveNano > max) { if (aliveNanoMax.compareAndSet(max, aliveNano)) { break; - } else { - continue; } } else { break; @@ -135,8 +131,6 @@ public class JdbcResultSetStat implements JdbcResultSetStatMBean { if (aliveNano < min) { if (aliveNanoMin.compareAndSet(min, aliveNano)) { break; - } else { - continue; } } else { break; diff --git a/src/main/java/com/alibaba/druid/stat/JdbcResultSetStatMBean.java b/src/main/java/com/alibaba/druid/stat/JdbcResultSetStatMBean.java index 90dbc798be..f9424142f3 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcResultSetStatMBean.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcResultSetStatMBean.java @@ -28,9 +28,9 @@ public interface JdbcResultSetStatMBean { long getCloseCount(); - int getOpenningCount(); + int getOpeningCount(); - int getOpenningMax(); + int getOpeningMax(); long getErrorCount(); } diff --git a/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java b/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java index 53b4887cb3..f2a33349a0 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcStatManager.java @@ -15,10 +15,9 @@ */ package com.alibaba.druid.stat; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicLong; +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.proxy.DruidDriver; +import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl; import javax.management.JMException; import javax.management.openmbean.ArrayType; @@ -29,10 +28,10 @@ import javax.management.openmbean.SimpleType; import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; - -import com.alibaba.druid.pool.DruidDataSource; -import com.alibaba.druid.proxy.DruidDriver; -import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicLong; public final class JdbcStatManager implements JdbcStatManagerMBean { @@ -61,16 +60,14 @@ public final class JdbcStatManager implements JdbcStatManagerMBean { } public JdbcStatContext createStatContext() { - JdbcStatContext context = new JdbcStatContext(); - - return context; + return new JdbcStatContext(); } public long generateSqlId() { return sqlIdSeed.incrementAndGet(); } - public static final JdbcStatManager getInstance() { + public static JdbcStatManager getInstance() { return instance; } @@ -82,7 +79,7 @@ public final class JdbcStatManager implements JdbcStatManagerMBean { return resultSetStat; } - public JdbcConnectionStat getConnectionstat() { + public JdbcConnectionStat getConnectionStat() { return connectionStat; } @@ -258,9 +255,8 @@ public final class JdbcStatManager implements JdbcStatManagerMBean { // }; - String[] indexDescriptions = indexNames; COMPOSITE_TYPE = new CompositeType("DataSourceStatistic", "DataSource Statistic", indexNames, - indexDescriptions, indexTypes); + indexNames, indexTypes); return COMPOSITE_TYPE; } diff --git a/src/main/java/com/alibaba/druid/stat/JdbcStatementStat.java b/src/main/java/com/alibaba/druid/stat/JdbcStatementStat.java index aec961b0d6..518ffa9a6c 100644 --- a/src/main/java/com/alibaba/druid/stat/JdbcStatementStat.java +++ b/src/main/java/com/alibaba/druid/stat/JdbcStatementStat.java @@ -15,15 +15,14 @@ */ package com.alibaba.druid.stat; -import java.util.Date; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; +import com.alibaba.druid.util.Histogram; +import com.alibaba.druid.util.JMXUtils; import javax.management.JMException; import javax.management.openmbean.CompositeData; - -import com.alibaba.druid.util.Histogram; -import com.alibaba.druid.util.JMXUtils; +import java.util.Date; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; public class JdbcStatementStat implements JdbcStatementStatMBean { @@ -90,8 +89,6 @@ public class JdbcStatementStat implements JdbcStatementStatMBean { if (invoking > max) { if (concurrentMax.compareAndSet(max, invoking)) { break; - } else { - continue; } } else { break; diff --git a/src/main/java/com/alibaba/druid/stat/TableStat.java b/src/main/java/com/alibaba/druid/stat/TableStat.java index f1adf362fa..a1023353bf 100644 --- a/src/main/java/com/alibaba/druid/stat/TableStat.java +++ b/src/main/java/com/alibaba/druid/stat/TableStat.java @@ -15,13 +15,13 @@ */ package com.alibaba.druid.stat; +import com.alibaba.druid.util.StringUtils; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.alibaba.druid.util.StringUtils; - public class TableStat { int selectCount = 0; @@ -360,26 +360,26 @@ public class TableStat { } public String toString() { - StringBuffer buf = new StringBuffer(); - buf.append(this.column.toString()); - buf.append(' '); - buf.append(this.operator); + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(this.column.toString()); + stringBuilder.append(' '); + stringBuilder.append(this.operator); if (values.size() == 1) { - buf.append(' '); - buf.append(String.valueOf(this.values.get(0))); + stringBuilder.append(' '); + stringBuilder.append(String.valueOf(this.values.get(0))); } else if (values.size() > 0) { - buf.append(" ("); + stringBuilder.append(" ("); for (int i = 0; i < values.size(); ++i) { if (i != 0) { - buf.append(", "); + stringBuilder.append(", "); } - buf.append(String.valueOf(values.get(i))); + stringBuilder.append(String.valueOf(values.get(i))); } - buf.append(")"); + stringBuilder.append(")"); } - return buf.toString(); + return stringBuilder.toString(); } } @@ -484,6 +484,11 @@ public class TableStat { } public boolean equals(Object obj) { + + if (!(obj instanceof Column)) { + return false; + } + Column column = (Column) obj; if (table == null) { diff --git a/src/main/java/com/alibaba/druid/support/console/Option.java b/src/main/java/com/alibaba/druid/support/console/Option.java index 8c93263c7d..9f9948bc6d 100644 --- a/src/main/java/com/alibaba/druid/support/console/Option.java +++ b/src/main/java/com/alibaba/druid/support/console/Option.java @@ -84,8 +84,7 @@ public class Option { private static int parsePositiveInt(String v) { try { - int pid = Integer.parseInt(v); - return pid; + return Integer.parseInt(v); } catch (NumberFormatException e) { return -1; } diff --git a/src/main/java/com/alibaba/druid/support/console/TableFormatter.java b/src/main/java/com/alibaba/druid/support/console/TableFormatter.java index 9d840a5c16..3f60cc5ae0 100644 --- a/src/main/java/com/alibaba/druid/support/console/TableFormatter.java +++ b/src/main/java/com/alibaba/druid/support/console/TableFormatter.java @@ -20,17 +20,16 @@ import java.util.List; public class TableFormatter { public static String format(List rows) { - String[] titlerow = rows.get(0); - int[] maxLens = new int[titlerow.length]; - for (int i=0; i maxLens[j]) { - maxLens[j] = len; - } - } - } + String[] titleRow = rows.get(0); + int[] maxLens = new int[titleRow.length]; + for (String[] row : rows) { + for (int j = 0; j < row.length; j++) { + int len = displayLen(row[j]); + if (len > maxLens[j]) { + maxLens[j] = len; + } + } + } StringBuilder sb = new StringBuilder(); sb.append(makeSplitLine(maxLens)); for (int i=0; i length) { + int vLen = displayLen(old); + if (vLen > length) { return old; } - StringBuffer sb = new StringBuffer(old); - for (int i=0; i< length -vlen ; i++) { + StringBuilder sb = new StringBuilder(old); + for (int i=0; i< length -vLen ; i++) { sb.append(" "); } return sb.toString(); diff --git a/src/main/java/com/alibaba/druid/support/console/TabledDataPrinter.java b/src/main/java/com/alibaba/druid/support/console/TabledDataPrinter.java index aeda7b7041..29885c8ca0 100644 --- a/src/main/java/com/alibaba/druid/support/console/TabledDataPrinter.java +++ b/src/main/java/com/alibaba/druid/support/console/TabledDataPrinter.java @@ -15,13 +15,13 @@ */ package com.alibaba.druid.support.console; +import com.alibaba.druid.sql.SQLUtils; + import java.io.PrintStream; import java.util.ArrayList; import java.util.List; import java.util.Map; -import com.alibaba.druid.sql.SQLUtils; - public class TabledDataPrinter { private static final int SQL_MAX_LEN = 32; @@ -90,7 +90,7 @@ public class TabledDataPrinter { List> matchedContent = new ArrayList>(); for (Map dsStat : content) { Integer idStr = (Integer) dsStat.get("Identity"); - if (idStr.intValue() == opt.getId()) { + if (idStr == opt.getId()) { matchedContent.add(dsStat); break; } @@ -126,7 +126,7 @@ public class TabledDataPrinter { List> matchedContent = new ArrayList>(); for (Map sqlStat : content) { Integer idStr = (Integer) sqlStat.get("ID"); - if (idStr.intValue() == opt.getId()) { + if (idStr == opt.getId()) { matchedContent.add(sqlStat); if (opt.isDetailPrint()) { String dbType = (String) sqlStat.get("DbType"); @@ -160,8 +160,7 @@ public class TabledDataPrinter { } printContents.add(row); } - String formattedStr = TableFormatter.format(printContents); - return formattedStr; + return TableFormatter.format(printContents); } public static String getVerticalFormattedOutput(List> content, String[] titleFields) { @@ -169,18 +168,17 @@ public class TabledDataPrinter { int maxCol = content.size() > MAX_COL ? MAX_COL : content.size(); - for (int i = 0; i < titleFields.length; ++i) { + for (String titleField : titleFields) { String[] row = new String[maxCol + 1]; - row[0] = titleFields[i]; + row[0] = titleField; for (int j = 0; j < maxCol; j++) { Map sqlStat = content.get(j); - Object value = sqlStat.get(titleFields[i]); - row[j + 1] = handleAndConvert(value, titleFields[i]); + Object value = sqlStat.get(titleField); + row[j + 1] = handleAndConvert(value, titleField); } printContents.add(row); } - String formattedStr = TableFormatter.format(printContents); - return formattedStr; + return TableFormatter.format(printContents); } public static String handleAndConvert(Object value, String fieldName) { diff --git a/src/main/java/com/alibaba/druid/support/http/ResourceSerlvet.java b/src/main/java/com/alibaba/druid/support/http/ResourceServlet.java similarity index 90% rename from src/main/java/com/alibaba/druid/support/http/ResourceSerlvet.java rename to src/main/java/com/alibaba/druid/support/http/ResourceServlet.java index dbe0c305b2..3a3874fe11 100644 --- a/src/main/java/com/alibaba/druid/support/http/ResourceSerlvet.java +++ b/src/main/java/com/alibaba/druid/support/http/ResourceServlet.java @@ -15,16 +15,6 @@ */ package com.alibaba.druid.support.http; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - import com.alibaba.druid.support.http.util.IPAddress; import com.alibaba.druid.support.http.util.IPRange; import com.alibaba.druid.support.logging.Log; @@ -32,10 +22,19 @@ import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.util.StringUtils; import com.alibaba.druid.util.Utils; -@SuppressWarnings("serial") -public abstract class ResourceSerlvet extends HttpServlet { +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; - private final static Log LOG = LogFactory.getLog(ResourceSerlvet.class); +@SuppressWarnings("serial") +public abstract class ResourceServlet extends HttpServlet { + + private final static Log LOG = LogFactory.getLog(ResourceServlet.class); public static final String SESSION_USER_KEY = "druid-user"; public static final String PARAM_NAME_USERNAME = "loginUsername"; @@ -54,7 +53,7 @@ public abstract class ResourceSerlvet extends HttpServlet { protected String remoteAddressHeader = null; - public ResourceSerlvet(String resourcePath){ + public ResourceServlet(String resourcePath){ this.resourcePath = resourcePath; } @@ -123,15 +122,7 @@ public abstract class ResourceSerlvet extends HttpServlet { boolean ipV6 = remoteAddress != null && remoteAddress.indexOf(':') != -1; if (ipV6) { - if ("0:0:0:0:0:0:0:1".equals(remoteAddress)) { - return true; - } - - if (denyList.size() == 0 && allowList.size() == 0) { - return true; - } - - return false; + return "0:0:0:0:0:0:0:1".equals(remoteAddress) || (denyList.size() == 0 && allowList.size() == 0); } IPAddress ipAddress = new IPAddress(remoteAddress); @@ -223,7 +214,7 @@ public abstract class ResourceSerlvet extends HttpServlet { || path.startsWith("/css")// || path.startsWith("/js") // || path.startsWith("/img"))) { - if (contextPath == null || contextPath.equals("") || contextPath.equals("/")) { + if (contextPath.equals("") || contextPath.equals("/")) { response.sendRedirect("/druid/login.html"); } else { if ("".equals(path)) { @@ -236,7 +227,7 @@ public abstract class ResourceSerlvet extends HttpServlet { } if ("".equals(path)) { - if (contextPath == null || contextPath.equals("") || contextPath.equals("/")) { + if (contextPath.equals("") || contextPath.equals("/")) { response.sendRedirect("/druid/index.html"); } else { response.sendRedirect("druid/index.html"); @@ -249,7 +240,7 @@ public abstract class ResourceSerlvet extends HttpServlet { return; } - if (path.indexOf(".json") >= 0) { + if (path.contains(".json")) { String fullUrl = path; if (request.getQueryString() != null && request.getQueryString().length() > 0) { fullUrl += "?" + request.getQueryString(); @@ -264,10 +255,7 @@ public abstract class ResourceSerlvet extends HttpServlet { public boolean ContainsUser(HttpServletRequest request) { HttpSession session = request.getSession(false); - if (session == null) { - return false; - } - return session.getAttribute(SESSION_USER_KEY) != null; + return session != null && session.getAttribute(SESSION_USER_KEY) != null; } public boolean isRequireAuth() { @@ -280,17 +268,17 @@ public abstract class ResourceSerlvet extends HttpServlet { } protected String getRemoteAddress(HttpServletRequest request) { - String remoteAddr = null; + String remoteAddress = null; if (remoteAddressHeader != null) { - remoteAddr = request.getHeader(remoteAddressHeader); + remoteAddress = request.getHeader(remoteAddressHeader); } - if (remoteAddr == null) { - remoteAddr = request.getRemoteAddr(); + if (remoteAddress == null) { + remoteAddress = request.getRemoteAddr(); } - return remoteAddr; + return remoteAddress; } protected abstract String process(String url); diff --git a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java index 5bc1acb7b4..7afb472b60 100644 --- a/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java +++ b/src/main/java/com/alibaba/druid/support/http/StatViewServlet.java @@ -35,7 +35,7 @@ import com.alibaba.druid.support.logging.LogFactory; * * @author sandzhang */ -public class StatViewServlet extends ResourceSerlvet { +public class StatViewServlet extends ResourceServlet { private final static Log LOG = LogFactory.getLog(StatViewServlet.class); diff --git a/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java b/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java index bd7691a5c6..4cd4efcda7 100644 --- a/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java +++ b/src/main/java/com/alibaba/druid/support/http/WebStatFilter.java @@ -15,22 +15,6 @@ */ package com.alibaba.druid.support.http; -import java.io.IOException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; - import com.alibaba.druid.filter.stat.StatFilterContext; import com.alibaba.druid.support.http.stat.WebAppStat; import com.alibaba.druid.support.http.stat.WebAppStatManager; @@ -46,6 +30,21 @@ import com.alibaba.druid.util.DruidWebUtils; import com.alibaba.druid.util.PatternMatcher; import com.alibaba.druid.util.ServletPathMatcher; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpServletResponseWrapper; +import java.io.IOException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + /** * 用于配置Web和Druid数据源之间的管理关联监控统计 * @@ -56,7 +55,7 @@ public class WebStatFilter extends AbstractWebStatImpl implements Filter { private final static Log LOG = LogFactory.getLog(WebStatFilter.class); - public final static String PARAM_NAME_PORFILE_ENABLE = "profileEnable"; + public final static String PARAM_NAME_PROFILE_ENABLE = "profileEnable"; public final static String PARAM_NAME_SESSION_STAT_ENABLE = "sessionStatEnable"; public final static String PARAM_NAME_SESSION_STAT_MAX_COUNT = "sessionStatMaxCount"; public static final String PARAM_NAME_EXCLUSIONS = "exclusions"; @@ -250,7 +249,7 @@ public class WebStatFilter extends AbstractWebStatImpl implements Filter { } { - String param = config.getInitParameter(PARAM_NAME_PORFILE_ENABLE); + String param = config.getInitParameter(PARAM_NAME_PROFILE_ENABLE); if (param != null && param.trim().length() != 0) { param = param.trim(); if ("true".equals(param)) { @@ -258,7 +257,7 @@ public class WebStatFilter extends AbstractWebStatImpl implements Filter { } else if ("false".equals(param)) { this.profileEnable = false; } else { - LOG.error("WebStatFilter Parameter '" + PARAM_NAME_PORFILE_ENABLE + "' config error"); + LOG.error("WebStatFilter Parameter '" + PARAM_NAME_PROFILE_ENABLE + "' config error"); } } } diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java index 775d8eb83e..1ee66807ba 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebAppStat.java @@ -15,9 +15,12 @@ */ package com.alibaba.druid.support.http.stat; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; +import com.alibaba.druid.util.LRUCache; import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -28,10 +31,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.LRUCache; -import java.util.Collections; +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; public class WebAppStat { @@ -246,8 +246,6 @@ public class WebAppStat { if (running > max) { if (concurrentMax.compareAndSet(max, running)) { break; - } else { - continue; } } else { break; @@ -282,10 +280,8 @@ public class WebAppStat { return null; } - if (uriStat == null) { - uriStatMap.putIfAbsent(uri, new WebURIStat(uri)); - uriStat = uriStatMap.get(uri); - } + uriStatMap.putIfAbsent(uri, new WebURIStat(uri)); + uriStat = uriStatMap.get(uri); return uriStat; } @@ -592,7 +588,7 @@ public class WebAppStat { computeUserAgentIEWindowsVersion(userAgent); - if (userAgent.indexOf("Windows Phone") != -1) { + if (userAgent.contains("Windows Phone")) { deviceWindowsPhoneCount.incrementAndGet(); } @@ -630,36 +626,36 @@ public class WebAppStat { osWindowsCount.incrementAndGet(); - if (userAgent.indexOf("Windows Phone") != -1) { + if (userAgent.contains("Windows Phone")) { deviceWindowsPhoneCount.incrementAndGet(); } } else if (isMac) { isMac = true; osMacOSXCount.incrementAndGet(); - if (isIpad && userAgent.indexOf("iPad") != -1) { + if (isIpad && userAgent.contains("iPad")) { deviceIpadCount.incrementAndGet(); - } else if (isIPhone || userAgent.indexOf("iPhone") != -1) { + } else if (isIPhone || userAgent.contains("iPhone")) { deviceIphoneCount.incrementAndGet(); } } else if (isLinux) { osLinuxCount.incrementAndGet(); isAndroid = computeUserAgentAndroid(userAgent); - } else if (userAgent.indexOf("Symbian") != -1) { + } else if (userAgent.contains("Symbian")) { osSymbianCount.incrementAndGet(); - } else if (userAgent.indexOf("Ubuntu") != -1) { + } else if (userAgent.contains("Ubuntu")) { osLinuxCount.incrementAndGet(); osLinuxUbuntuCount.incrementAndGet(); isLinux = true; } if (isX11) { - if (userAgent.indexOf("OpenBSD") != -1) { + if (userAgent.contains("OpenBSD")) { osOpenBSDCount.incrementAndGet(); isBSD = true; - } else if (userAgent.indexOf("FreeBSD") != -1) { + } else if (userAgent.contains("FreeBSD")) { osFreeBSDCount.incrementAndGet(); isBSD = true; - } else if ((!isLinux) && userAgent.indexOf("Linux") != -1) { + } else if ((!isLinux) && userAgent.contains("Linux")) { osLinuxCount.incrementAndGet(); isLinux = true; } @@ -668,11 +664,11 @@ public class WebAppStat { boolean isOpera = userAgent.startsWith("Opera"); if (isOpera) { - if (userAgent.indexOf("Windows") != -1) { + if (userAgent.contains("Windows")) { osWindowsCount.incrementAndGet(); - } else if (userAgent.indexOf("Linux") != -1) { + } else if (userAgent.contains("Linux")) { osWindowsCount.incrementAndGet(); - } else if (userAgent.indexOf("Macintosh") != -1) { + } else if (userAgent.contains("Macintosh")) { osMacOSXCount.incrementAndGet(); } browserOperaCount.incrementAndGet(); @@ -684,17 +680,17 @@ public class WebAppStat { } if (isWindows || isMac || isLinux || isBSD) { - if (userAgent.indexOf("Chrome") != -1) { + if (userAgent.contains("Chrome")) { browserChromeCount.incrementAndGet(); return; } - if ((!isAndroid) && userAgent.indexOf("Safari") != -1) { + if ((!isAndroid) && userAgent.contains("Safari")) { browserSafariCount.incrementAndGet(); return; } - if (userAgent.indexOf("Firefox") != -1) { + if (userAgent.contains("Firefox")) { browserFirefoxCount.incrementAndGet(); return; } @@ -786,11 +782,11 @@ public class WebAppStat { botCount.incrementAndGet(); } else if (userAgent.equals("-")) { botCount.incrementAndGet(); - } else if (userAgent.indexOf("Spider") != -1 || userAgent.indexOf("spider") != -1) { + } else if (userAgent.contains("Spider") || userAgent.contains("spider")) { botCount.incrementAndGet(); - } else if (userAgent.indexOf("crawl") != -1 || userAgent.indexOf("Crawl") != -1) { + } else if (userAgent.contains("crawl") || userAgent.contains("Crawl")) { botCount.incrementAndGet(); - } else if (userAgent.indexOf("Bot") != -1 || userAgent.indexOf("bot") != -1) { + } else if (userAgent.contains("Bot") || userAgent.contains("bot")) { botCount.incrementAndGet(); } diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStat.java index aacf7a354e..32e6382835 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStat.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStat.java @@ -15,14 +15,14 @@ */ package com.alibaba.druid.support.http.stat; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; import java.util.Map; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; public class WebSessionStat { @@ -214,8 +214,6 @@ public class WebSessionStat { if (running > max) { if (concurrentMaxUpdater.compareAndSet(this, max, running)) { break; - } else { - continue; } } else { break; @@ -264,7 +262,7 @@ public class WebSessionStat { } if (remoteAddresses.length() > 256) { - LOG.error("sessoin ip change too many"); + LOG.error("session ip change too many"); return; } @@ -387,7 +385,7 @@ public class WebSessionStat { val.jdbcRollbackCount = get(this, jdbcRollbackCountUpdater, reset); val.createTimeMillis = createTimeMillis; val.lastAccessTimeMillis = lastAccessTimeMillis; - val.remoteAddresse = remoteAddresses; + val.remoteAddress = remoteAddresses; val.principal = principal; val.userAgent = userAgent; diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStatValue.java b/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStatValue.java index 4fff026ebc..d5c1a2ac79 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStatValue.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebSessionStatValue.java @@ -36,7 +36,7 @@ public class WebSessionStatValue { long jdbcRollbackCount; long createTimeMillis; long lastAccessTimeMillis; - String remoteAddresse; + String remoteAddress; String principal; String userAgent; @@ -162,12 +162,12 @@ public class WebSessionStatValue { this.lastAccessTimeMillis = lastAccessTimeMillis; } - public String getRemoteAddresse() { - return remoteAddresse; + public String getRemoteAddress() { + return remoteAddress; } - public void setRemoteAddresse(String remoteAddresses) { - this.remoteAddresse = remoteAddresses; + public void setRemoteAddress(String remoteAddresses) { + this.remoteAddress = remoteAddresses; } public String getPrincipal() { @@ -236,7 +236,7 @@ public class WebSessionStatValue { data.put("RequestTimeMillisTotal", this.getRequestTimeMillis()); data.put("CreateTime", this.getCreateTime()); data.put("LastAccessTime", this.getLastAccessTime()); - data.put("RemoteAddress", this.getRemoteAddresse()); + data.put("RemoteAddress", this.getRemoteAddress()); data.put("Principal", this.getPrincipal()); data.put("JdbcCommitCount", this.getJdbcCommitCount()); diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebURIStat.java b/src/main/java/com/alibaba/druid/support/http/stat/WebURIStat.java index 54d18882d6..380bedb109 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebURIStat.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebURIStat.java @@ -15,14 +15,14 @@ */ package com.alibaba.druid.support.http.stat; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; +import com.alibaba.druid.support.profile.ProfileStat; import java.util.Date; import java.util.Map; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.alibaba.druid.support.profile.ProfileStat; +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; public class WebURIStat { @@ -151,8 +151,6 @@ public class WebURIStat { if (running > max) { if (concurrentMaxUpdater.compareAndSet(this, max, running)) { break; - } else { - continue; } } else { break; diff --git a/src/main/java/com/alibaba/druid/support/http/stat/WebURIStatValue.java b/src/main/java/com/alibaba/druid/support/http/stat/WebURIStatValue.java index 7b6b7baac7..242061b18a 100644 --- a/src/main/java/com/alibaba/druid/support/http/stat/WebURIStatValue.java +++ b/src/main/java/com/alibaba/druid/support/http/stat/WebURIStatValue.java @@ -15,17 +15,17 @@ */ package com.alibaba.druid.support.http.stat; +import com.alibaba.druid.support.monitor.annotation.AggregateType; +import com.alibaba.druid.support.monitor.annotation.MField; +import com.alibaba.druid.support.monitor.annotation.MTable; +import com.alibaba.druid.support.profile.ProfileEntryStatValue; + import java.util.ArrayList; import java.util.Date; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.alibaba.druid.support.monitor.annotation.AggregateType; -import com.alibaba.druid.support.monitor.annotation.MField; -import com.alibaba.druid.support.monitor.annotation.MTable; -import com.alibaba.druid.support.profile.ProfileEntryStatValue; - @MTable(name = "druid_weburi") public class WebURIStatValue { @@ -352,8 +352,8 @@ public class WebURIStatValue { if (this.profileEntryStatValueList != null) { int size = profileEntryStatValueList.size(); List> profileDataList = new ArrayList>(size); - for (int i = 0; i < size; ++i) { - profileDataList.add(profileEntryStatValueList.get(i).getData()); + for (ProfileEntryStatValue profileEntryStatValue : profileEntryStatValueList) { + profileDataList.add(profileEntryStatValue.getData()); } data.put("Profiles", profileDataList); } diff --git a/src/main/java/com/alibaba/druid/support/http/util/IPAddress.java b/src/main/java/com/alibaba/druid/support/http/util/IPAddress.java index fb406bdec2..18fb33600e 100644 --- a/src/main/java/com/alibaba/druid/support/http/util/IPAddress.java +++ b/src/main/java/com/alibaba/druid/support/http/util/IPAddress.java @@ -149,7 +149,7 @@ public class IPAddress implements Cloneable { * @return Return the string representation of the IP address. */ public String toString() { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); int temp; temp = ipAddress & 0x000000FF; @@ -275,9 +275,6 @@ public class IPAddress implements Cloneable { } public boolean equals(Object another) { - if (another instanceof IPAddress) { - return ipAddress == ((IPAddress) another).ipAddress; - } - return false; + return another instanceof IPAddress && ipAddress == ((IPAddress) another).ipAddress; } } diff --git a/src/main/java/com/alibaba/druid/support/http/util/IPRange.java b/src/main/java/com/alibaba/druid/support/http/util/IPRange.java index d898797614..e425ae5de4 100644 --- a/src/main/java/com/alibaba/druid/support/http/util/IPRange.java +++ b/src/main/java/com/alibaba/druid/support/http/util/IPRange.java @@ -55,9 +55,9 @@ public class IPRange { /** * Constructor. * - * @param ip String representation of the IP address. The two following formats are supported :
+ * @param range String representation of the IP address. The two following formats are supported :
*
  • xxx.xxx.xxx.xxx/xxx.xxx.xxx.xxx
  • xxx.xxx.xxx.xxx/xx <- extended network prefix - * @exception InvalidIPRangeException Throws this exception when the specified string doesn't represent a valid IP + * @exception IllegalArgumentException Throws this exception when the specified string doesn't represent a valid IP * address. */ public IPRange(String range){ @@ -102,11 +102,7 @@ public class IPRange { * address/extended network prefixs). */ public String toString() { - StringBuffer result = new StringBuffer(ipAddress.toString()); - result.append("/"); - result.append(extendedNetworkPrefix); - - return result.toString(); + return ipAddress.toString() + "/" + extendedNetworkPrefix; } // ------------------------------------------------------------------------- @@ -114,7 +110,7 @@ public class IPRange { * Parse the IP range string representation. * * @param range String representation of the IP range. - * @exception InvalidIPRangeException Throws this exception if the specified range is not a valid IP network range. + * @exception IllegalArgumentException Throws this exception if the specified range is not a valid IP network range. */ final void parseRange(String range) { if (range == null) { @@ -180,19 +176,19 @@ public class IPRange { } public static String toDecimalString(String inBinaryIpAddress) { - StringBuilder decimalip = new StringBuilder(); + StringBuilder decimalIp = new StringBuilder(); String[] binary = new String[4]; for (int i = 0, c = 0; i < 32; i = i + 8, c++) { binary[c] = inBinaryIpAddress.substring(i, i + 8); int octet = Integer.parseInt(binary[c], 2); - decimalip.append(octet); + decimalIp.append(octet); if (c < 3) { - decimalip.append('.'); + decimalIp.append('.'); } } - return decimalip.toString(); + return decimalIp.toString(); } // ------------------------------------------------------------------------- diff --git a/src/main/java/com/alibaba/druid/support/ibatis/DruidDataSourceFactory.java b/src/main/java/com/alibaba/druid/support/ibatis/DruidDataSourceFactory.java index 82a816c3aa..df8ec3a670 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/DruidDataSourceFactory.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/DruidDataSourceFactory.java @@ -30,7 +30,7 @@ public class DruidDataSourceFactory implements com.ibatis.sqlmap.engine.datasour } catch (RuntimeException e) { throw e; } catch (Exception e) { - throw new RuntimeException("init datasource error", e); + throw new RuntimeException("init data source error", e); } } diff --git a/src/main/java/com/alibaba/druid/support/ibatis/IbatisUtils.java b/src/main/java/com/alibaba/druid/support/ibatis/IbatisUtils.java index 02ba2a8c6f..65f756ff07 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/IbatisUtils.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/IbatisUtils.java @@ -15,9 +15,6 @@ */ package com.alibaba.druid.support.ibatis; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; import com.ibatis.sqlmap.client.SqlMapExecutor; @@ -25,6 +22,9 @@ import com.ibatis.sqlmap.engine.impl.SqlMapClientImpl; import com.ibatis.sqlmap.engine.impl.SqlMapSessionImpl; import com.ibatis.sqlmap.engine.scope.SessionScope; +import java.lang.reflect.Field; +import java.lang.reflect.Method; + public class IbatisUtils { private static Log LOG = LogFactory.getLog(IbatisUtils.class); @@ -32,19 +32,20 @@ public class IbatisUtils { private static Method methodGetId = null; private static Method methodGetResource = null; + private static Field sessionField; static { try { Class clazz = Thread.currentThread().getContextClassLoader().loadClass("com.ibatis.sqlmap.engine.mapping.result.AutoResultMap"); Method[] methods = clazz.getMethods(); for (Method method : methods) { - if (method.equals("setResultObjectValues")) { // ibatis 2.3.4 add method 'setResultObjectValues' + if (method.getName().equals("setResultObjectValues")) { // ibatis 2.3.4 add method 'setResultObjectValues' VERSION_2_3_4 = true; break; } } } catch (Throwable e) { - // skip + LOG.error("Error while initializing", e); } } @@ -106,9 +107,7 @@ public class IbatisUtils { return null; } } - - private static Field sessionField; - + public static void set(SqlMapSessionImpl session, SqlMapClientImpl client) { if (sessionField == null) { for (Field field : SqlMapSessionImpl.class.getDeclaredFields()) { diff --git a/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreator.java b/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreator.java index c76ce574eb..934cc00a2d 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreator.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreator.java @@ -15,10 +15,8 @@ */ package com.alibaba.druid.support.ibatis; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - +import com.ibatis.sqlmap.client.SqlMapClient; +import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.aop.TargetSource; @@ -27,8 +25,8 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.FactoryBean; import org.springframework.util.PatternMatchUtils; -import com.ibatis.sqlmap.client.SqlMapClient; -import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient; +import java.util.ArrayList; +import java.util.List; /** * 类BeanTypeAutoProxyCreator.java的实现描述：使用配置类型代替Springframework中配置名称的实现 @@ -50,8 +48,7 @@ public class SpringIbatisBeanTypeAutoProxyCreator extends AbstractAutoProxyCreat */ @SuppressWarnings("rawtypes") protected Object[] getAdvicesAndAdvisorsForBean(Class beanClass, String beanName, TargetSource targetSource) { - for (Iterator it = this.beanNames.iterator(); it.hasNext();) { - String mappedName = (String) it.next(); + for (String mappedName : this.beanNames) { if (FactoryBean.class.isAssignableFrom(beanClass)) { if (!mappedName.startsWith(BeanFactory.FACTORY_BEAN_PREFIX)) { continue; diff --git a/src/main/java/com/alibaba/druid/support/ibatis/SqlMapClientWrapper.java b/src/main/java/com/alibaba/druid/support/ibatis/SqlMapClientWrapper.java index cdff5f1e43..c2ace6e0e0 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/SqlMapClientWrapper.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/SqlMapClientWrapper.java @@ -15,11 +15,6 @@ */ package com.alibaba.druid.support.ibatis; -import java.sql.Connection; -import java.sql.SQLException; - -import javax.sql.DataSource; - import com.ibatis.sqlmap.client.SqlMapClient; import com.ibatis.sqlmap.client.SqlMapSession; import com.ibatis.sqlmap.engine.execution.SqlExecutor; @@ -28,6 +23,10 @@ import com.ibatis.sqlmap.engine.impl.SqlMapExecutorDelegate; import com.ibatis.sqlmap.engine.mapping.result.ResultObjectFactory; import com.ibatis.sqlmap.engine.mapping.statement.MappedStatement; +import javax.sql.DataSource; +import java.sql.Connection; +import java.sql.SQLException; + @SuppressWarnings("deprecation") public class SqlMapClientWrapper extends SqlMapExecutorWrapper implements SqlMapClient, ExtendedSqlMapClient { @@ -59,8 +58,8 @@ public class SqlMapClientWrapper extends SqlMapExecutorWrapper implements SqlMap client.endTransaction(); } - public void setUserConnection(Connection connnection) throws SQLException { - client.setUserConnection(connnection); + public void setUserConnection(Connection connection) throws SQLException { + client.setUserConnection(connection); } public Connection getUserConnection() throws SQLException { diff --git a/src/main/java/com/alibaba/druid/support/ibatis/SqlMapExecutorWrapper.java b/src/main/java/com/alibaba/druid/support/ibatis/SqlMapExecutorWrapper.java index 85c7b96cce..d160223b59 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/SqlMapExecutorWrapper.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/SqlMapExecutorWrapper.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.support.ibatis; -import java.sql.SQLException; -import java.util.List; -import java.util.Map; - import com.ibatis.common.util.PaginatedList; import com.ibatis.sqlmap.client.SqlMapExecutor; import com.ibatis.sqlmap.client.event.RowHandler; @@ -26,6 +22,10 @@ import com.ibatis.sqlmap.engine.execution.BatchException; import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient; import com.ibatis.sqlmap.engine.impl.SqlMapClientImpl; +import java.sql.SQLException; +import java.util.List; +import java.util.Map; + @SuppressWarnings("deprecation") public class SqlMapExecutorWrapper implements SqlMapExecutor { @@ -56,92 +56,81 @@ public class SqlMapExecutorWrapper implements SqlMapExecutor { public int update(String id, Object parameterObject) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - int effectedRowCount = executor.update(id, parameterObject); - return effectedRowCount; + return executor.update(id, parameterObject); } public int update(String id) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - int effectedRowCount = executor.update(id); - return effectedRowCount; + return executor.update(id); } public int delete(String id, Object parameterObject) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - int effectedRowCount = executor.delete(id, parameterObject); - return effectedRowCount; + return executor.delete(id, parameterObject); } public int delete(String id) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - int effectedRowCount = executor.delete(id); - return effectedRowCount; + return executor.delete(id); } public Object queryForObject(String id, Object parameterObject) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - Object object = executor.queryForObject(id, parameterObject); - return object; + return executor.queryForObject(id, parameterObject); } public Object queryForObject(String id) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - Object object = executor.queryForObject(id); - return object; + return executor.queryForObject(id); } public Object queryForObject(String id, Object parameterObject, Object resultObject) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - Object object = executor.queryForObject(id, parameterObject, resultObject); - return object; + return executor.queryForObject(id, parameterObject, resultObject); } @SuppressWarnings("rawtypes") public List queryForList(String id, Object parameterObject) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - List list = executor.queryForList(id, parameterObject); - return list; + return executor.queryForList(id, parameterObject); } @SuppressWarnings("rawtypes") public List queryForList(String id) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - List list = executor.queryForList(id); - return list; + return executor.queryForList(id); } @SuppressWarnings("rawtypes") public List queryForList(String id, Object parameterObject, int skip, int max) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - List list = executor.queryForList(id, parameterObject, skip, max); - return list; + return executor.queryForList(id, parameterObject, skip, max); } @SuppressWarnings("rawtypes") public List queryForList(String id, int skip, int max) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - List list = executor.queryForList(id, skip, max); - return list; + return executor.queryForList(id, skip, max); } public void queryWithRowHandler(String id, Object parameterObject, RowHandler rowHandler) throws SQLException { @@ -159,35 +148,31 @@ public class SqlMapExecutorWrapper implements SqlMapExecutor { public PaginatedList queryForPaginatedList(String id, Object parameterObject, int pageSize) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - PaginatedList list = executor.queryForPaginatedList(id, parameterObject, pageSize); - return list; + return executor.queryForPaginatedList(id, parameterObject, pageSize); } public PaginatedList queryForPaginatedList(String id, int pageSize) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - PaginatedList list = executor.queryForPaginatedList(id, pageSize); - return list; + return executor.queryForPaginatedList(id, pageSize); } @SuppressWarnings("rawtypes") public Map queryForMap(String id, Object parameterObject, String keyProp) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - Map map = executor.queryForMap(id, parameterObject, keyProp); - return map; + return executor.queryForMap(id, parameterObject, keyProp); } @SuppressWarnings("rawtypes") public Map queryForMap(String id, Object parameterObject, String keyProp, String valueProp) throws SQLException { clientImplWrapper.setLocal(id, executor); IbatisUtils.setClientImpl(executor, clientImplWrapper); - Map map = executor.queryForMap(id, parameterObject, keyProp, valueProp); - return map; + return executor.queryForMap(id, parameterObject, keyProp, valueProp); } public void startBatch() throws SQLException { diff --git a/src/main/java/com/alibaba/druid/support/ibatis/SqlMapSessionWrapper.java b/src/main/java/com/alibaba/druid/support/ibatis/SqlMapSessionWrapper.java index 631c82fd01..ec2bf7186f 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/SqlMapSessionWrapper.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/SqlMapSessionWrapper.java @@ -15,14 +15,13 @@ */ package com.alibaba.druid.support.ibatis; -import java.sql.Connection; -import java.sql.SQLException; - -import javax.sql.DataSource; - import com.ibatis.sqlmap.client.SqlMapSession; import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient; +import javax.sql.DataSource; +import java.sql.Connection; +import java.sql.SQLException; + @SuppressWarnings("deprecation") public class SqlMapSessionWrapper extends SqlMapExecutorWrapper implements SqlMapSession { private SqlMapSession session; @@ -48,8 +47,8 @@ public class SqlMapSessionWrapper extends SqlMapExecutorWrapper implements SqlMa session.endTransaction(); } - public void setUserConnection(Connection connnection) throws SQLException { - session.setUserConnection(connnection); + public void setUserConnection(Connection connection) throws SQLException { + session.setUserConnection(connection); } @Deprecated diff --git a/src/main/java/com/alibaba/druid/support/jconsole/DruidDataSourcePanel.java b/src/main/java/com/alibaba/druid/support/jconsole/DruidDataSourcePanel.java index 2d66fd4e3f..ce88687925 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/DruidDataSourcePanel.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/DruidDataSourcePanel.java @@ -73,7 +73,7 @@ public class DruidDataSourcePanel extends DruidPanel { } private void addTable(ColumnData columnData) { - ArrayList>> data = columnData.getTableDatas(); + ArrayList>> data = columnData.getTableData(); int i = 0; ArrayList ids = columnData.getNames(); @@ -98,7 +98,7 @@ public class DruidDataSourcePanel extends DruidPanel { @Override protected void tableDataProcess(ArrayList> data) { - ColumnData columnData = TableDataProcessor.mutilRow2col(data, KEY_WORD_IDENTITY); + ColumnData columnData = TableDataProcessor.multiRow2Col(data, KEY_WORD_IDENTITY); contentPanel = new JPanel(new GridLayout(0, 1)); addTable(columnData); diff --git a/src/main/java/com/alibaba/druid/support/jconsole/DruidDriverPanel.java b/src/main/java/com/alibaba/druid/support/jconsole/DruidDriverPanel.java index b60c9f0fd0..bc32687b77 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/DruidDriverPanel.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/DruidDriverPanel.java @@ -51,7 +51,7 @@ public class DruidDriverPanel extends DruidPanel { @Override protected void tableDataProcess(ArrayList> data) { ColumnData columnData = TableDataProcessor.row2col(data); - tableModel = new DruidTableModel(columnData.getDatas()); + tableModel = new DruidTableModel(columnData.getData()); table.setModel(tableModel); table.getColumnModel().getColumn(0).setCellRenderer(new DruidTableCellRenderer()); diff --git a/src/main/java/com/alibaba/druid/support/jconsole/DruidSQLPanel.java b/src/main/java/com/alibaba/druid/support/jconsole/DruidSQLPanel.java index 6c65ed27c1..f3a711ee8b 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/DruidSQLPanel.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/DruidSQLPanel.java @@ -15,12 +15,11 @@ */ package com.alibaba.druid.support.jconsole; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map.Entry; +import com.alibaba.druid.support.jconsole.model.ColumnGroup; +import com.alibaba.druid.support.jconsole.model.DruidTableModel; +import com.alibaba.druid.support.jconsole.model.GroupableTableHeader; +import com.alibaba.druid.support.jconsole.model.GroupableTableHeaderUI; +import com.alibaba.druid.support.jconsole.model.RowHeaderTable; import javax.swing.JLabel; import javax.swing.JScrollPane; @@ -29,12 +28,12 @@ import javax.swing.SwingConstants; import javax.swing.border.BevelBorder; import javax.swing.table.JTableHeader; import javax.swing.table.TableColumnModel; - -import com.alibaba.druid.support.jconsole.model.ColumnGroup; -import com.alibaba.druid.support.jconsole.model.DruidTableModel; -import com.alibaba.druid.support.jconsole.model.GroupableTableHeader; -import com.alibaba.druid.support.jconsole.model.GroupableTableHeaderUI; -import com.alibaba.druid.support.jconsole.model.RowHeaderTable; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map.Entry; /** * 请求地址 /sql.json @@ -130,7 +129,7 @@ public class DruidSQLPanel extends DruidPanel { add("FetchRowCountHistogram"); } }; - private static final String HISOGRAM = "Histogram"; + private static final String HISTOGRAM = "Histogram"; private static final String Effected_RowCount_HISOGRAM = "EffectedRowCountHistogram"; private static final String ExecuteAndResult_Hold_HISOGRAM = "ExecuteAndResultHoldTimeHistogram"; private static final String FetchRowCount_HISOGRAM = "FetchRowCountHistogram"; @@ -138,7 +137,7 @@ public class DruidSQLPanel extends DruidPanel { private static final long serialVersionUID = 1L; { - add(HISOGRAM); + add(HISTOGRAM); add(Effected_RowCount_HISOGRAM); add(ExecuteAndResult_Hold_HISOGRAM); add(FetchRowCount_HISOGRAM); @@ -164,7 +163,7 @@ public class DruidSQLPanel extends DruidPanel { private void addGroupData(String keyNow, int index) { // System.out.println("keyNow:"+keyNow+"index:"+index); - if (HISOGRAM.equals(keyNow)) { + if (HISTOGRAM.equals(keyNow)) { listHistogram.add(index); } else if (Effected_RowCount_HISOGRAM.equals(keyNow)) { listEffectedRowCountHistogram.add(index); @@ -182,7 +181,7 @@ public class DruidSQLPanel extends DruidPanel { * @return 最终的处理结果 */ private ArrayList> preProcess(ArrayList> data) { - groupHistogram = new ColumnGroup(HISOGRAM); + groupHistogram = new ColumnGroup(HISTOGRAM); groupEffectedRowCountHistogram = new ColumnGroup(Effected_RowCount_HISOGRAM); groupExecuteAndResultHoldTimeHistogram = new ColumnGroup(ExecuteAndResult_Hold_HISOGRAM); groupFetchRowCountHistogram = new ColumnGroup(FetchRowCount_HISOGRAM); @@ -237,8 +236,6 @@ public class DruidSQLPanel extends DruidPanel { } } } - } else { - } }// end of foreach ARRAY_DATA_MAP diff --git a/src/main/java/com/alibaba/druid/support/jconsole/DruidSqlDetailFrame.java b/src/main/java/com/alibaba/druid/support/jconsole/DruidSqlDetailFrame.java index fc8bbb075b..82cfd48e55 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/DruidSqlDetailFrame.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/DruidSqlDetailFrame.java @@ -347,7 +347,7 @@ public class DruidSqlDetailFrame extends JFrame { ColumnData colData = TableDataProcessor.row2col(data); JTable table = new JTable(); - DruidTableModel tableModel = new DruidTableModel(colData.getDatas()); + DruidTableModel tableModel = new DruidTableModel(colData.getData()); table.setModel(tableModel); TableColumn col = table.getColumnModel().getColumn(0); diff --git a/src/main/java/com/alibaba/druid/support/jconsole/model/RowHeaderTable.java b/src/main/java/com/alibaba/druid/support/jconsole/model/RowHeaderTable.java index 739f79af2e..3efdfedb9c 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/model/RowHeaderTable.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/model/RowHeaderTable.java @@ -15,11 +15,6 @@ */ package com.alibaba.druid.support.jconsole.model; -import java.awt.Color; -import java.awt.Component; -import java.awt.Dimension; -import java.util.ArrayList; - import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.ListSelectionModel; @@ -29,6 +24,10 @@ import javax.swing.event.ListSelectionListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.JTableHeader; import javax.swing.table.TableCellRenderer; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.util.ArrayList; /** * 用于显示RowHeader的JTable，只需要将其加入JScrollPane的RowHeaderView即可为JTable生成行标题 @@ -41,7 +40,7 @@ public class RowHeaderTable extends JTable { * 为JTable添加RowHeader， * * @param refTable 需要添加rowHeader的JTable - * @param columnWideth rowHeader的宽度 + * @param columnWidth rowHeader的宽度 */ public RowHeaderTable(JTable refTable, int columnWidth){ this(null, refTable, columnWidth, 1); @@ -66,35 +65,35 @@ public class RowHeaderTable extends JTable { final class RowHeaderRenderer extends JLabel implements TableCellRenderer, ListSelectionListener { private static final long serialVersionUID = 1L; - private JTable reftable; // 需要添加rowHeader的JTable + private JTable refTable; // 需要添加rowHeader的JTable private JTable tableShow; // 用于显示rowHeader的JTable private ArrayList headerList; private int rowHeightNow; private int rowSpan; - public RowHeaderRenderer(JTable reftable, JTable tableShow){ - this(null, reftable, tableShow, 0); + public RowHeaderRenderer(JTable refTable, JTable tableShow){ + this(null, refTable, tableShow, 0); } - public RowHeaderRenderer(ArrayList headerList, JTable reftable, JTable tableShow, int rowSpan){ + public RowHeaderRenderer(ArrayList headerList, JTable refTable, JTable tableShow, int rowSpan){ this.headerList = headerList; - this.reftable = reftable; + this.refTable = refTable; this.tableShow = tableShow; - // 增加监听器，实现当在reftable中选择行时，RowHeader会发生颜色变化 - ListSelectionModel listModel = reftable.getSelectionModel(); + // 增加监听器，实现当在refTable中选择行时，RowHeader会发生颜色变化 + ListSelectionModel listModel = refTable.getSelectionModel(); listModel.addListSelectionListener(this); - rowHeightNow = reftable.getRowCount() * reftable.getRowHeight(); + rowHeightNow = refTable.getRowCount() * refTable.getRowHeight(); this.rowSpan = rowSpan; if (rowSpan > 1) { - rowHeightNow = rowSpan * reftable.getRowHeight(); + rowHeightNow = rowSpan * refTable.getRowHeight(); } } public Component getTableCellRendererComponent(JTable table, Object obj, boolean isSelected, boolean hasFocus, int row, int col) { - int rowCountNow = reftable.getRowCount() / rowSpan; + int rowCountNow = refTable.getRowCount() / rowSpan; ((DefaultTableModel) table.getModel()).setRowCount(rowCountNow); - JTableHeader header = reftable.getTableHeader(); + JTableHeader header = refTable.getTableHeader(); this.setOpaque(true); setBorder(UIManager.getBorder("TableHeader.cellBorder"));// 设置为TableHeader的边框类型 setHorizontalAlignment(CENTER);// 让text居中显示 @@ -135,16 +134,16 @@ final class RowHeaderRenderer extends JLabel implements TableCellRenderer, ListS } private boolean isSelect(int row) { - int[] sel = reftable.getSelectedRows(); + int[] sel = refTable.getSelectedRows(); if (rowSpan <= 1) { - for (int i = 0, len = sel.length; i < len; i++) { - if (sel[i] == row) { + for (int item : sel) { + if (item == row) { return true; } } } else { - for (int i = 0, len = sel.length; i < len; i++) { - if (sel[i] / rowSpan == row) { + for (int item : sel) { + if (item / rowSpan == row) { return true; } } diff --git a/src/main/java/com/alibaba/druid/support/jconsole/util/TableDataProcessor.java b/src/main/java/com/alibaba/druid/support/jconsole/util/TableDataProcessor.java index 0c1a2641de..c06a06b5b4 100644 --- a/src/main/java/com/alibaba/druid/support/jconsole/util/TableDataProcessor.java +++ b/src/main/java/com/alibaba/druid/support/jconsole/util/TableDataProcessor.java @@ -15,19 +15,18 @@ */ package com.alibaba.druid.support.jconsole.util; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; - import com.alibaba.druid.stat.DruidStatService; import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + /** * 表格数据处理类 * @@ -60,17 +59,17 @@ public final class TableDataProcessor { * 将行数据转化为列数据 由于json中的数据是按照一条条的记录返回的， * 而在显示的时候需要按照“名称”、“值”两列显示，所以要做转化。 * - * @param rowDatas 原始数据 + * @param rowData 原始数据 * @param keyword 关键字,可以为null * @return 生成的列数据的对象 */ - public static ColumnData row2col(ArrayList> rowDatas, String keyword) { - ColumnData datas = new ColumnData(); - ArrayList> coldatas = new ArrayList>(); + public static ColumnData row2col(ArrayList> rowData, String keyword) { + ColumnData data = new ColumnData(); + ArrayList> colData = new ArrayList>(); ArrayList colNames = new ArrayList(); int rowCount = 0; int colCount = 0; - for (LinkedHashMap row : rowDatas) { + for (LinkedHashMap row : rowData) { if (keyword != null) { String keyNow = row.remove(keyword).toString(); colNames.add(keyNow); @@ -78,68 +77,68 @@ public final class TableDataProcessor { rowCount++; for (Map.Entry element : row.entrySet()) { - LinkedHashMap colData = new LinkedHashMap(); - colData.put(COLUMN_KEY_NAME, element.getKey()); - colData.put(COLUMN_VALUE_NAME, element.getValue()); - coldatas.add(colData); + LinkedHashMap colDataItem = new LinkedHashMap(); + colDataItem.put(COLUMN_KEY_NAME, element.getKey()); + colDataItem.put(COLUMN_VALUE_NAME, element.getValue()); + colData.add(colDataItem); if (rowCount == 1) { colCount++; } } } - datas.setCount(colCount); - datas.setDatas(coldatas); - datas.setNames(colNames); - return datas; + data.setCount(colCount); + data.setData(colData); + data.setNames(colNames); + return data; } /** * 将行数据转化为多个表格中的列数据 和{@link #row2col(ArrayList>, String)}类似， * 只不过这里是返回多个表格数据 * - * @param rowDatas 原始数据 + * @param rowData 原始数据 * @param keyword the keyword * @return 生成的列数据的对象 */ - public static ColumnData mutilRow2col(ArrayList> rowDatas, String keyword) { - ColumnData datas = new ColumnData(); - ArrayList>> tableDatas = new ArrayList>>(); + public static ColumnData multiRow2Col(ArrayList> rowData, String keyword) { + ColumnData data = new ColumnData(); + ArrayList>> tableData = new ArrayList>>(); ArrayList colNames = new ArrayList(); int rowCount = 0; - for (LinkedHashMap row : rowDatas) { + for (LinkedHashMap row : rowData) { if (keyword != null) { String keyNow = row.remove(keyword).toString(); colNames.add(keyNow); } rowCount++; - ArrayList> coldatas = new ArrayList>(); + ArrayList> colData = new ArrayList>(); for (Map.Entry element : row.entrySet()) { - LinkedHashMap colData = new LinkedHashMap(); - colData.put(COLUMN_KEY_NAME, element.getKey()); - colData.put(COLUMN_VALUE_NAME, element.getValue()); - coldatas.add(colData); + LinkedHashMap colDataItem = new LinkedHashMap(); + colDataItem.put(COLUMN_KEY_NAME, element.getKey()); + colDataItem.put(COLUMN_VALUE_NAME, element.getValue()); + colData.add(colDataItem); } - tableDatas.add(coldatas); + tableData.add(colData); } - datas.setCount(rowCount); - datas.setTableDatas(tableDatas); - datas.setNames(colNames); - return datas; + data.setCount(rowCount); + data.setTableData(tableData); + data.setNames(colNames); + return data; } /** * 将行数据转化为列数据，这里只是调用了{@link #row2col(ArrayList>, String)}， * 将第二个参数置为null。 * - * @param rowDatas 原始数据 + * @param rowData 原始数据 * @return 生成的列数据的对象 */ - public static ColumnData row2col(ArrayList> rowDatas) { - return row2col(rowDatas, null); + public static ColumnData row2col(ArrayList> rowData) { + return row2col(rowData, null); } /** @@ -199,10 +198,10 @@ public final class TableDataProcessor { private ArrayList names; /** 单个表格数据. */ - private ArrayList> datas; + private ArrayList> data; /** 多个表格数据. */ - private ArrayList>> tableDatas; + private ArrayList>> tableData; /** 返回的数据总数，如果返回单个表格，则为表格行数；如果返回多个表格数据，则为表格个数. */ private int count; @@ -235,19 +234,19 @@ public final class TableDataProcessor { /** * 获取单个表格数据 * - * @return the datas + * @return the data */ - public ArrayList> getDatas() { - return datas; + public ArrayList> getData() { + return data; } /** * 设置单个表格数据 * - * @param datas the datas + * @param data the data */ - public void setDatas(ArrayList> datas) { - this.datas = datas; + public void setData(ArrayList> data) { + this.data = data; } /** @@ -271,19 +270,19 @@ public final class TableDataProcessor { /** * 返回多个表格数据 * - * @return the table datas + * @return the table data */ - public ArrayList>> getTableDatas() { - return tableDatas; + public ArrayList>> getTableData() { + return tableData; } /** * 设置多个表格数据 * - * @param tableDatas the table datas + * @param tableData the table data */ - public void setTableDatas(ArrayList>> tableDatas) { - this.tableDatas = tableDatas; + public void setTableData(ArrayList>> tableData) { + this.tableData = tableData; } } diff --git a/src/main/java/com/alibaba/druid/support/json/JSONWriter.java b/src/main/java/com/alibaba/druid/support/json/JSONWriter.java index 3a9bfb085a..2d3f1f60e1 100644 --- a/src/main/java/com/alibaba/druid/support/json/JSONWriter.java +++ b/src/main/java/com/alibaba/druid/support/json/JSONWriter.java @@ -15,21 +15,20 @@ */ package com.alibaba.druid.support.json; +import com.alibaba.druid.util.Utils; + +import javax.management.openmbean.CompositeData; +import javax.management.openmbean.TabularData; import java.text.SimpleDateFormat; import java.util.Collection; import java.util.Date; import java.util.Map; -import javax.management.openmbean.CompositeData; -import javax.management.openmbean.TabularData; - -import com.alibaba.druid.util.Utils; - public class JSONWriter { private StringBuilder out; - private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public JSONWriter(){ this.out = new StringBuilder(); @@ -137,7 +136,8 @@ public class JSONWriter { writeNull(); return; } - + //SimpleDataFormat is not thread-safe, we need to make it local. + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); writeString(dateFormat.format(date)); } diff --git a/src/main/java/com/alibaba/druid/support/logging/LogFactory.java b/src/main/java/com/alibaba/druid/support/logging/LogFactory.java index 2ccaf7e95f..81f6c2e98c 100644 --- a/src/main/java/com/alibaba/druid/support/logging/LogFactory.java +++ b/src/main/java/com/alibaba/druid/support/logging/LogFactory.java @@ -58,10 +58,13 @@ public class LogFactory { } try { - logConstructor.newInstance(LogFactory.class.getName()); + if (null != logConstructor) { + logConstructor.newInstance(LogFactory.class.getName()); + } } catch (Throwable t) { logConstructor = null; } + } catch (Throwable t) { // skip } @@ -73,7 +76,7 @@ public class LogFactory { public static Log getLog(String loggerName) { try { - return (Log) logConstructor.newInstance(new Object[] { loggerName }); + return (Log) logConstructor.newInstance(loggerName); } catch (Throwable t) { throw new RuntimeException("Error creating logger for logger '" + loggerName + "'. Cause: " + t, t); } @@ -86,6 +89,7 @@ public class LogFactory { Class implClass = Resources.classForName("com.alibaba.druid.support.logging.Log4jImpl"); logConstructor = implClass.getConstructor(new Class[] { String.class }); } catch (Throwable t) { + //ignore } } @@ -96,6 +100,7 @@ public class LogFactory { Class implClass = Resources.classForName("com.alibaba.druid.support.logging.Jdk14LoggingImpl"); logConstructor = implClass.getConstructor(new Class[] { String.class }); } catch (Throwable t) { + //ignore } } } diff --git a/src/main/java/com/alibaba/druid/support/monitor/MonitorClient.java b/src/main/java/com/alibaba/druid/support/monitor/MonitorClient.java index 94499b89a3..0131f8c52e 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/MonitorClient.java +++ b/src/main/java/com/alibaba/druid/support/monitor/MonitorClient.java @@ -15,23 +15,6 @@ */ package com.alibaba.druid.support.monitor; -import static com.alibaba.druid.util.Utils.getBoolean; -import static com.alibaba.druid.util.Utils.getInteger; - -import java.lang.management.ManagementFactory; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.util.ArrayList; -import java.util.Date; -import java.util.Enumeration; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.DruidDataSourceStatValue; import com.alibaba.druid.stat.DruidDataSourceStatManager; @@ -50,6 +33,23 @@ import com.alibaba.druid.util.StringUtils; import com.alibaba.druid.util.Utils; import com.alibaba.druid.wall.WallProviderStatValue; +import java.lang.management.ManagementFactory; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.util.ArrayList; +import java.util.Date; +import java.util.Enumeration; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +import static com.alibaba.druid.util.Utils.getBoolean; +import static com.alibaba.druid.util.Utils.getInteger; + public class MonitorClient { private final static Log LOG = LogFactory.getLog(MonitorClient.class); @@ -59,15 +59,15 @@ public class MonitorClient { private ScheduledExecutorService scheduler; private int schedulerThreadSize = 1; - private long timeBeetweenSqlCollect = DEFAULT_TIME_BETWEEN_COLLECT; - private long timeBeetweenSpringCollect = DEFAULT_TIME_BETWEEN_COLLECT; - private long timeBeetweenWebUriCollect = DEFAULT_TIME_BETWEEN_COLLECT; + private long timeBetweenSqlCollect = DEFAULT_TIME_BETWEEN_COLLECT; + private long timeBetweenSpringCollect = DEFAULT_TIME_BETWEEN_COLLECT; + private long timeBetweenWebUriCollect = DEFAULT_TIME_BETWEEN_COLLECT; private TimeUnit timeUnit = TimeUnit.SECONDS; private boolean collectSqlEnable = true; private boolean collectSqlWallEnable = true; - private boolean collectSpringMethodEanble = true; - private boolean collectWebAppEanble = true; + private boolean collectSpringMethodEnable = true; + private boolean collectWebAppEnable = true; private boolean collectWebURIEnable = true; private MonitorDao dao; @@ -88,10 +88,10 @@ public class MonitorClient { host = items[1]; ip = getLocalIPAddress().getHostAddress(); - configFromPropety(System.getProperties()); + configFromProperty(System.getProperties()); } - public void configFromPropety(Properties properties) { + public void configFromProperty(Properties properties) { { Integer value = getInteger(properties, "druid.monitor.client.schedulerThreadSize"); if (value != null) { @@ -100,21 +100,21 @@ public class MonitorClient { } { - Integer value = getInteger(properties, "druid.monitor.client.timeBeetweenSqlCollect"); + Integer value = getInteger(properties, "druid.monitor.client.timeBetweenSqlCollect"); if (value != null) { - this.setTimeBeetweenSqlCollect(value); + this.setTimeBetweenSqlCollect(value); } } { - Integer value = getInteger(properties, "druid.monitor.client.timeBeetweenSpringCollect"); + Integer value = getInteger(properties, "druid.monitor.client.timeBetweenSpringCollect"); if (value != null) { - this.setTimeBeetweenSpringCollect(value); + this.setTimeBetweenSpringCollect(value); } } { - Integer value = getInteger(properties, "druid.monitor.client.timeBeetweenWebUriCollect"); + Integer value = getInteger(properties, "druid.monitor.client.timeBetweenWebUriCollect"); if (value != null) { - this.setTimeBeetweenWebUriCollect(value); + this.setTimeBetweenWebUriCollect(value); } } @@ -133,16 +133,16 @@ public class MonitorClient { } { - Boolean value = getBoolean(properties, "druid.monitor.client.collectSpringMethodEanble"); + Boolean value = getBoolean(properties, "druid.monitor.client.collectSpringMethodEnable"); if (value != null) { - this.setCollectSpringMethodEanble(value); + this.setCollectSpringMethodEnable(value); } } { - Boolean value = getBoolean(properties, "druid.monitor.client.collectWebAppEanble"); + Boolean value = getBoolean(properties, "druid.monitor.client.collectWebAppEnable"); if (value != null) { - this.setCollectWebAppEanble(value); + this.setCollectWebAppEnable(value); } } @@ -191,7 +191,7 @@ public class MonitorClient { public void run() { collectSql(); } - }, timeBeetweenSqlCollect, timeBeetweenSqlCollect, timeUnit); + }, timeBetweenSqlCollect, timeBetweenSqlCollect, timeUnit); scheduler.scheduleAtFixedRate(new Runnable() { @@ -199,7 +199,7 @@ public class MonitorClient { public void run() { collectSpringMethod(); } - }, timeBeetweenSpringCollect, timeBeetweenSpringCollect, timeUnit); + }, timeBetweenSpringCollect, timeBetweenSpringCollect, timeUnit); scheduler.scheduleAtFixedRate(new Runnable() { @@ -207,7 +207,7 @@ public class MonitorClient { public void run() { collectWebURI(); } - }, timeBeetweenWebUriCollect, timeBeetweenWebUriCollect, timeUnit); + }, timeBetweenWebUriCollect, timeBetweenWebUriCollect, timeUnit); } public ScheduledExecutorService getScheduler() { @@ -287,7 +287,7 @@ public class MonitorClient { } private void collectSpringMethod() { - if (!collectSpringMethodEanble) { + if (!collectSpringMethodEnable) { return; } @@ -311,7 +311,7 @@ public class MonitorClient { } private void collectWebURI() { - if ((!collectWebAppEanble) && !collectWebURIEnable) { + if ((!collectWebAppEnable) && !collectWebURIEnable) { return; } @@ -327,7 +327,7 @@ public class MonitorClient { WebAppStat webAppStat = (WebAppStat) item; - if (collectWebAppEanble) { + if (collectWebAppEnable) { WebAppStatValue webAppStatValue = webAppStat.getStatValue(true); webAppStatValueList.add(webAppStatValue); } @@ -360,28 +360,28 @@ public class MonitorClient { this.dao = dao; } - public long getTimeBeetweenSqlCollect() { - return timeBeetweenSqlCollect; + public long getTimeBetweenSqlCollect() { + return timeBetweenSqlCollect; } - public void setTimeBeetweenSqlCollect(long timeBeetweenSqlCollect) { - this.timeBeetweenSqlCollect = timeBeetweenSqlCollect; + public void setTimeBetweenSqlCollect(long timeBetweenSqlCollect) { + this.timeBetweenSqlCollect = timeBetweenSqlCollect; } - public long getTimeBeetweenSpringCollect() { - return timeBeetweenSpringCollect; + public long getTimeBetweenSpringCollect() { + return timeBetweenSpringCollect; } - public void setTimeBeetweenSpringCollect(long timeBeetweenSpringCollect) { - this.timeBeetweenSpringCollect = timeBeetweenSpringCollect; + public void setTimeBetweenSpringCollect(long timeBetweenSpringCollect) { + this.timeBetweenSpringCollect = timeBetweenSpringCollect; } - public long getTimeBeetweenWebUriCollect() { - return timeBeetweenWebUriCollect; + public long getTimeBetweenWebUriCollect() { + return timeBetweenWebUriCollect; } - public void setTimeBeetweenWebUriCollect(long timeBeetweenWebUriCollect) { - this.timeBeetweenWebUriCollect = timeBeetweenWebUriCollect; + public void setTimeBetweenWebUriCollect(long timeBetweenWebUriCollect) { + this.timeBetweenWebUriCollect = timeBetweenWebUriCollect; } public TimeUnit getTimeUnit() { @@ -408,20 +408,20 @@ public class MonitorClient { this.collectSqlWallEnable = collectSqlWallEnable; } - public boolean isCollectSpringMethodEanble() { - return collectSpringMethodEanble; + public boolean isCollectSpringMethodEnable() { + return collectSpringMethodEnable; } - public void setCollectSpringMethodEanble(boolean collectSpringMethodEanble) { - this.collectSpringMethodEanble = collectSpringMethodEanble; + public void setCollectSpringMethodEnable(boolean collectSpringMethodEnable) { + this.collectSpringMethodEnable = collectSpringMethodEnable; } - public boolean isCollectWebAppEanble() { - return collectWebAppEanble; + public boolean isCollectWebAppEnable() { + return collectWebAppEnable; } - public void setCollectWebAppEanble(boolean collectWebAppEanble) { - this.collectWebAppEanble = collectWebAppEanble; + public void setCollectWebAppEnable(boolean collectWebAppEnable) { + this.collectWebAppEnable = collectWebAppEnable; } public boolean isCollectWebURIEnable() { @@ -483,15 +483,14 @@ public class MonitorClient { public static InetAddress getLocalIPAddress() { try { Enumeration netInterfaces = NetworkInterface.getNetworkInterfaces(); - InetAddress inetAddr = null; - boolean flag = true; - while (netInterfaces.hasMoreElements() && flag) { + InetAddress inetAddress = null; + while (netInterfaces.hasMoreElements()) { NetworkInterface ni = (NetworkInterface) netInterfaces.nextElement(); Enumeration e2 = ni.getInetAddresses(); while (e2.hasMoreElements()) { - inetAddr = (InetAddress) e2.nextElement(); - if (!inetAddr.isLoopbackAddress() && inetAddr.getHostAddress().indexOf(":") == -1) { - return inetAddr; + inetAddress = (InetAddress) e2.nextElement(); + if (!inetAddress.isLoopbackAddress() && !inetAddress.getHostAddress().contains(":")) { + return inetAddress; } } } diff --git a/src/main/java/com/alibaba/druid/support/monitor/MonitorContext.java b/src/main/java/com/alibaba/druid/support/monitor/MonitorContext.java index 308139eec2..3ac1feccc0 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/MonitorContext.java +++ b/src/main/java/com/alibaba/druid/support/monitor/MonitorContext.java @@ -23,7 +23,7 @@ public class MonitorContext { public static String DEFAULT_DOMAIN; - private final Map atrributes = new HashMap(); + private final Map attributes = new HashMap(); private String domain = "default"; private String app = "default"; @@ -54,8 +54,8 @@ public class MonitorContext { this.startTime = startTime; } - public Map getAtrributes() { - return atrributes; + public Map getAttributes() { + return attributes; } public int getPID() { diff --git a/src/main/java/com/alibaba/druid/support/monitor/MonitorServlet.java b/src/main/java/com/alibaba/druid/support/monitor/MonitorServlet.java index 6163523eb3..779ae15ac8 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/MonitorServlet.java +++ b/src/main/java/com/alibaba/druid/support/monitor/MonitorServlet.java @@ -15,13 +15,13 @@ */ package com.alibaba.druid.support.monitor; +import com.alibaba.druid.support.http.ResourceServlet; + import java.util.HashSet; import java.util.Set; -import com.alibaba.druid.support.http.ResourceSerlvet; - @SuppressWarnings("serial") -public class MonitorServlet extends ResourceSerlvet { +public class MonitorServlet extends ResourceServlet { private String mappingPath = "support/http/resources"; private Set mapping = new HashSet(); diff --git a/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java b/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java index b782226895..b6afa49b10 100644 --- a/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java +++ b/src/main/java/com/alibaba/druid/support/monitor/dao/MonitorDaoJdbcImpl.java @@ -544,8 +544,7 @@ public class MonitorDaoJdbcImpl implements MonitorDao { try { List fields = beanInfo.getFields(); - for (int i = 0; i < fields.size(); ++i) { - FieldInfo field = fields.get(i); + for (FieldInfo field : fields) { Class fieldType = field.getFieldType(); Object value = field.getField().get(sqlStat); @@ -596,13 +595,12 @@ public class MonitorDaoJdbcImpl implements MonitorDao { buf.append(" (domain, app, cluster, host, pid, collectTime"); List fields = beanInfo.getFields(); - for (int i = 0; i < fields.size(); ++i) { - FieldInfo field = fields.get(i); + for (FieldInfo field : fields) { buf.append(", "); buf.append(field.getColumnName()); } buf.append(")\nVALUES (?, ?, ?, ?, ?, ?"); - for (int i = 0; i < fields.size(); ++i) { + for (FieldInfo field : fields) { buf.append(", ?"); } buf.append(")"); diff --git a/src/main/java/com/alibaba/druid/support/profile/ProfileStat.java b/src/main/java/com/alibaba/druid/support/profile/ProfileStat.java index f4ef062892..e271b70ce7 100644 --- a/src/main/java/com/alibaba/druid/support/profile/ProfileStat.java +++ b/src/main/java/com/alibaba/druid/support/profile/ProfileStat.java @@ -80,8 +80,8 @@ public class ProfileStat { int size = statValueList.size(); List> list = new ArrayList>(size); - for (int i = 0; i < size; ++i) { - list.add(statValueList.get(i).getData()); + for (ProfileEntryStatValue profileEntryStatValue : statValueList) { + list.add(profileEntryStatValue.getData()); } return list; diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/BeanTypeAutoProxyCreator.java b/src/main/java/com/alibaba/druid/support/spring/stat/BeanTypeAutoProxyCreator.java index 968f7e701d..f87c6df3e9 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/BeanTypeAutoProxyCreator.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/BeanTypeAutoProxyCreator.java @@ -15,10 +15,6 @@ */ package com.alibaba.druid.support.spring.stat; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import org.springframework.aop.TargetSource; import org.springframework.aop.framework.autoproxy.AbstractAutoProxyCreator; import org.springframework.beans.factory.BeanFactory; @@ -29,6 +25,10 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.util.Assert; import org.springframework.util.PatternMatchUtils; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + /** * 类BeanTypeAutoProxyCreator.java的实现描述：使用配置类型代替Springframework中配置名称的实现 * @@ -60,8 +60,7 @@ public class BeanTypeAutoProxyCreator extends AbstractAutoProxyCreator implement */ @SuppressWarnings("rawtypes") protected Object[] getAdvicesAndAdvisorsForBean(Class beanClass, String beanName, TargetSource targetSource) { - for (Iterator it = this.beanNames.iterator(); it.hasNext();) { - String mappedName = (String) it.next(); + for (String mappedName : this.beanNames) { if (FactoryBean.class.isAssignableFrom(beanClass)) { if (!mappedName.startsWith(BeanFactory.FACTORY_BEAN_PREFIX)) { continue; @@ -93,9 +92,7 @@ public class BeanTypeAutoProxyCreator extends AbstractAutoProxyCreator implement public void afterPropertiesSet() throws Exception { Assert.notNull(targetBeanType, "targetType cannot be null"); String[] beanNames = context.getBeanNamesForType(targetBeanType); - for (String name : beanNames) { - this.beanNames.add(name); - } + Collections.addAll(this.beanNames, beanNames); } } diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/DruidStatInterceptor.java b/src/main/java/com/alibaba/druid/support/spring/stat/DruidStatInterceptor.java index ed46fa6b83..9516f3a547 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/DruidStatInterceptor.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/DruidStatInterceptor.java @@ -15,28 +15,27 @@ */ package com.alibaba.druid.support.spring.stat; -import java.lang.reflect.Method; - +import com.alibaba.druid.filter.stat.StatFilterContext; +import com.alibaba.druid.filter.stat.StatFilterContextListenerAdapter; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.springframework.aop.TargetSource; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; -import com.alibaba.druid.filter.stat.StatFilterContext; -import com.alibaba.druid.filter.stat.StatFilterContextListenerAdapter; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; +import java.lang.reflect.Method; public class DruidStatInterceptor implements MethodInterceptor, InitializingBean, DisposableBean { - public static final String PROP_NAME_PORFILE = "druid.profile"; + public static final String PROP_NAME_PROFILE = "druid.profile"; private final static Log LOG = LogFactory.getLog(DruidStatInterceptor.class); private static SpringStat springStat = new SpringStat(); - private SpringMethodContextListener statContextlistener = new SpringMethodContextListener(); + private SpringMethodContextListener statContextListener = new SpringMethodContextListener(); public DruidStatInterceptor(){ @@ -46,12 +45,12 @@ public class DruidStatInterceptor implements MethodInterceptor, InitializingBean public void afterPropertiesSet() throws Exception { SpringStatManager.getInstance().addSpringStat(springStat); - StatFilterContext.getInstance().addContextListener(statContextlistener); + StatFilterContext.getInstance().addContextListener(statContextListener); } @Override public void destroy() throws Exception { - StatFilterContext.getInstance().removeContextListener(statContextlistener); + StatFilterContext.getInstance().removeContextListener(statContextListener); } @Override @@ -70,9 +69,7 @@ public class DruidStatInterceptor implements MethodInterceptor, InitializingBean Throwable error = null; try { - Object returnObject = invocation.proceed(); - - return returnObject; + return invocation.proceed(); } catch (Throwable e) { error = e; throw e; diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodInfo.java b/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodInfo.java index 39d4294564..d13dfe144f 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodInfo.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodInfo.java @@ -52,7 +52,7 @@ public class SpringMethodInfo { return true; } - if (obj == null) { + if (obj == null || !(obj instanceof SpringMethodInfo)) { return false; } @@ -80,7 +80,7 @@ public class SpringMethodInfo { } public static String getMethodSignature(Method method) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(method.getName()); sb.append('('); diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodStat.java b/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodStat.java index 736fe6ff2a..325911988b 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodStat.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/SpringMethodStat.java @@ -15,7 +15,7 @@ */ package com.alibaba.druid.support.spring.stat; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; +import com.alibaba.druid.support.profile.Profiler; import java.util.Date; import java.util.Map; @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import com.alibaba.druid.support.profile.Profiler; +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; public class SpringMethodStat { @@ -189,8 +189,6 @@ public class SpringMethodStat { if (running > max) { if (concurrentMax.compareAndSet(max, running)) { break; - } else { - continue; } } else { break; diff --git a/src/main/java/com/alibaba/druid/util/Base64.java b/src/main/java/com/alibaba/druid/util/Base64.java index 185c6d475f..1f72528672 100644 --- a/src/main/java/com/alibaba/druid/util/Base64.java +++ b/src/main/java/com/alibaba/druid/util/Base64.java @@ -46,7 +46,7 @@ public class Base64 { int numFullGroups = aLen / 3; int numBytesInPartialGroup = aLen - 3 * numFullGroups; int resultLen = 4 * ((aLen + 2) / 3); - StringBuffer result = new StringBuffer(resultLen); + StringBuilder result = new StringBuilder(resultLen); char[] intToAlpha = (alternate ? intToAltBase64 : intToBase64); // Translate all full groups from byte array elements to Base64 diff --git a/src/main/java/com/alibaba/druid/util/DruidDataSourceUtils.java b/src/main/java/com/alibaba/druid/util/DruidDataSourceUtils.java index b0b27fc6a0..22cb92340c 100644 --- a/src/main/java/com/alibaba/druid/util/DruidDataSourceUtils.java +++ b/src/main/java/com/alibaba/druid/util/DruidDataSourceUtils.java @@ -15,28 +15,27 @@ */ package com.alibaba.druid.util; -import java.lang.reflect.Method; -import java.util.List; -import java.util.Map; - -import javax.management.ObjectName; - import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; +import javax.management.ObjectName; +import java.lang.reflect.Method; +import java.util.List; +import java.util.Map; + public class DruidDataSourceUtils { private final static Log LOG = LogFactory.getLog(DruidDataSourceUtils.class); - public static String getUrl(Object druidDatasource) { - if (druidDatasource.getClass() == DruidDataSource.class) { - return ((DruidDataSource) druidDatasource).getUrl(); + public static String getUrl(Object druidDataSource) { + if (druidDataSource.getClass() == DruidDataSource.class) { + return ((DruidDataSource) druidDataSource).getUrl(); } try { - Method method = druidDatasource.getClass().getMethod("getUrl"); - Object obj = method.invoke(druidDatasource); + Method method = druidDataSource.getClass().getMethod("getUrl"); + Object obj = method.invoke(druidDataSource); return (String) obj; } catch (Exception e) { LOG.error("getUrl error", e); @@ -44,14 +43,14 @@ public class DruidDataSourceUtils { } } - public static long getID(Object druidDatasource) { - if (druidDatasource.getClass() == DruidDataSource.class) { - return ((DruidDataSource) druidDatasource).getID(); + public static long getID(Object druidDataSource) { + if (druidDataSource.getClass() == DruidDataSource.class) { + return ((DruidDataSource) druidDataSource).getID(); } try { - Method method = druidDatasource.getClass().getMethod("getID"); - Object obj = method.invoke(druidDatasource); + Method method = druidDataSource.getClass().getMethod("getID"); + Object obj = method.invoke(druidDataSource); return (Long) obj; } catch (Exception e) { LOG.error("getID error", e); @@ -59,14 +58,14 @@ public class DruidDataSourceUtils { } } - public static String getName(Object druidDatasource) { - if (druidDatasource.getClass() == DruidDataSource.class) { - return ((DruidDataSource) druidDatasource).getName(); + public static String getName(Object druidDataSource) { + if (druidDataSource.getClass() == DruidDataSource.class) { + return ((DruidDataSource) druidDataSource).getName(); } try { - Method method = druidDatasource.getClass().getMethod("getName"); - Object obj = method.invoke(druidDatasource); + Method method = druidDataSource.getClass().getMethod("getName"); + Object obj = method.invoke(druidDataSource); return (String) obj; } catch (Exception e) { LOG.error("getUrl error", e); @@ -74,14 +73,14 @@ public class DruidDataSourceUtils { } } - public static ObjectName getObjectName(Object druidDatasource) { - if (druidDatasource.getClass() == DruidDataSource.class) { - return ((DruidDataSource) druidDatasource).getObjectName(); + public static ObjectName getObjectName(Object druidDataSource) { + if (druidDataSource.getClass() == DruidDataSource.class) { + return ((DruidDataSource) druidDataSource).getObjectName(); } try { - Method method = druidDatasource.getClass().getMethod("getObjectName"); - Object obj = method.invoke(druidDatasource); + Method method = druidDataSource.getClass().getMethod("getObjectName"); + Object obj = method.invoke(druidDataSource); return (ObjectName) obj; } catch (Exception e) { LOG.error("getObjectName error", e); @@ -89,29 +88,28 @@ public class DruidDataSourceUtils { } } - public static Object getSqlStat(Object druidDatasource, int sqlId) { - if (druidDatasource.getClass() == DruidDataSource.class) { - return ((DruidDataSource) druidDatasource).getSqlStat(sqlId); + public static Object getSqlStat(Object druidDataSource, int sqlId) { + if (druidDataSource.getClass() == DruidDataSource.class) { + return ((DruidDataSource) druidDataSource).getSqlStat(sqlId); } try { - Method method = druidDatasource.getClass().getMethod("getSqlStat", int.class); - Object obj = method.invoke(druidDatasource, sqlId); - return obj; + Method method = druidDataSource.getClass().getMethod("getSqlStat", int.class); + return method.invoke(druidDataSource, sqlId); } catch (Exception e) { LOG.error("getSqlStat error", e); return null; } } - public static boolean isRemoveAbandoned(Object druidDatasource) { - if (druidDatasource.getClass() == DruidDataSource.class) { - return ((DruidDataSource) druidDatasource).isRemoveAbandoned(); + public static boolean isRemoveAbandoned(Object druidDataSource) { + if (druidDataSource.getClass() == DruidDataSource.class) { + return ((DruidDataSource) druidDataSource).isRemoveAbandoned(); } try { - Method method = druidDatasource.getClass().getMethod("isRemoveAbandoned"); - Object obj = method.invoke(druidDatasource); + Method method = druidDataSource.getClass().getMethod("isRemoveAbandoned"); + Object obj = method.invoke(druidDataSource); return (Boolean) obj; } catch (Exception e) { LOG.error("isRemoveAbandoned error", e); @@ -120,14 +118,14 @@ public class DruidDataSourceUtils { } @SuppressWarnings("unchecked") - public static Map getStatDataForMBean(Object druidDatasource) { - if (druidDatasource.getClass() == DruidDataSource.class) { - return ((DruidDataSource) druidDatasource).getStatDataForMBean(); + public static Map getStatDataForMBean(Object druidDataSource) { + if (druidDataSource.getClass() == DruidDataSource.class) { + return ((DruidDataSource) druidDataSource).getStatDataForMBean(); } try { - Method method = druidDatasource.getClass().getMethod("getStatDataForMBean"); - Object obj = method.invoke(druidDatasource); + Method method = druidDataSource.getClass().getMethod("getStatDataForMBean"); + Object obj = method.invoke(druidDataSource); return (Map) obj; } catch (Exception e) { LOG.error("getStatDataForMBean error", e); @@ -136,14 +134,14 @@ public class DruidDataSourceUtils { } @SuppressWarnings("unchecked") - public static Map getStatData(Object druidDatasource) { - if (druidDatasource.getClass() == DruidDataSource.class) { - return ((DruidDataSource) druidDatasource).getStatData(); + public static Map getStatData(Object druidDataSource) { + if (druidDataSource.getClass() == DruidDataSource.class) { + return ((DruidDataSource) druidDataSource).getStatData(); } try { - Method method = druidDatasource.getClass().getMethod("getStatData"); - Object obj = method.invoke(druidDatasource); + Method method = druidDataSource.getClass().getMethod("getStatData"); + Object obj = method.invoke(druidDataSource); return (Map) obj; } catch (Exception e) { LOG.error("getStatData error", e); @@ -152,14 +150,14 @@ public class DruidDataSourceUtils { } @SuppressWarnings({ "rawtypes" }) - public static Map getSqlStatMap(Object druidDatasource) { - if (druidDatasource.getClass() == DruidDataSource.class) { - return ((DruidDataSource) druidDatasource).getSqlStatMap(); + public static Map getSqlStatMap(Object druidDataSource) { + if (druidDataSource.getClass() == DruidDataSource.class) { + return ((DruidDataSource) druidDataSource).getSqlStatMap(); } try { - Method method = druidDatasource.getClass().getMethod("getSqlStatMap"); - Object obj = method.invoke(druidDatasource); + Method method = druidDataSource.getClass().getMethod("getSqlStatMap"); + Object obj = method.invoke(druidDataSource); return (Map) obj; } catch (Exception e) { LOG.error("getSqlStatMap error", e); @@ -168,14 +166,14 @@ public class DruidDataSourceUtils { } @SuppressWarnings({ "rawtypes", "unchecked" }) - public static Map getWallStatMap(Object druidDatasource) { - if (druidDatasource.getClass() == DruidDataSource.class) { - return ((DruidDataSource) druidDatasource).getWallStatMap(); + public static Map getWallStatMap(Object druidDataSource) { + if (druidDataSource.getClass() == DruidDataSource.class) { + return ((DruidDataSource) druidDataSource).getWallStatMap(); } try { - Method method = druidDatasource.getClass().getMethod("getWallStatMap"); - Object obj = method.invoke(druidDatasource); + Method method = druidDataSource.getClass().getMethod("getWallStatMap"); + Object obj = method.invoke(druidDataSource); return (Map) obj; } catch (Exception e) { LOG.error("getWallStatMap error", e); @@ -184,14 +182,14 @@ public class DruidDataSourceUtils { } @SuppressWarnings("unchecked") - public static List> getPoolingConnectionInfo(Object druidDatasource) { - if (druidDatasource.getClass() == DruidDataSource.class) { - return ((DruidDataSource) druidDatasource).getPoolingConnectionInfo(); + public static List> getPoolingConnectionInfo(Object druidDataSource) { + if (druidDataSource.getClass() == DruidDataSource.class) { + return ((DruidDataSource) druidDataSource).getPoolingConnectionInfo(); } try { - Method method = druidDatasource.getClass().getMethod("getPoolingConnectionInfo"); - Object obj = method.invoke(druidDatasource); + Method method = druidDataSource.getClass().getMethod("getPoolingConnectionInfo"); + Object obj = method.invoke(druidDataSource); return (List>) obj; } catch (Exception e) { LOG.error("getPoolingConnectionInfo error", e); @@ -200,14 +198,14 @@ public class DruidDataSourceUtils { } @SuppressWarnings("unchecked") - public static List getActiveConnectionStackTrace(Object druidDatasource) { - if (druidDatasource.getClass() == DruidDataSource.class) { - return ((DruidDataSource) druidDatasource).getActiveConnectionStackTrace(); + public static List getActiveConnectionStackTrace(Object druidDataSource) { + if (druidDataSource.getClass() == DruidDataSource.class) { + return ((DruidDataSource) druidDataSource).getActiveConnectionStackTrace(); } try { - Method method = druidDatasource.getClass().getMethod("getActiveConnectionStackTrace"); - Object obj = method.invoke(druidDatasource); + Method method = druidDataSource.getClass().getMethod("getActiveConnectionStackTrace"); + Object obj = method.invoke(druidDataSource); return (List) obj; } catch (Exception e) { LOG.error("getActiveConnectionStackTrace error", e); diff --git a/src/main/java/com/alibaba/druid/util/DruidPasswordCallback.java b/src/main/java/com/alibaba/druid/util/DruidPasswordCallback.java index 01f1f1060c..acc8ea3242 100644 --- a/src/main/java/com/alibaba/druid/util/DruidPasswordCallback.java +++ b/src/main/java/com/alibaba/druid/util/DruidPasswordCallback.java @@ -15,9 +15,8 @@ */ package com.alibaba.druid.util; -import java.util.Properties; - import javax.security.auth.callback.PasswordCallback; +import java.util.Properties; public class DruidPasswordCallback extends PasswordCallback { @@ -28,7 +27,7 @@ public class DruidPasswordCallback extends PasswordCallback { private Properties properties; public DruidPasswordCallback(){ - this("druidDataSouce password", false); + this("druidDataSource password", false); } public DruidPasswordCallback(String prompt, boolean echoOn){ diff --git a/src/main/java/com/alibaba/druid/util/HexBin.java b/src/main/java/com/alibaba/druid/util/HexBin.java index 9c7fa8e78f..e1da6b625f 100644 --- a/src/main/java/com/alibaba/druid/util/HexBin.java +++ b/src/main/java/com/alibaba/druid/util/HexBin.java @@ -24,33 +24,33 @@ package com.alibaba.druid.util; */ public final class HexBin { - static private final int BASELENGTH = 128; - static private final int LOOKUPLENGTH = 16; - static final private byte[] hexNumberTable = new byte[BASELENGTH]; - static final private char[] upperChars = new char[LOOKUPLENGTH]; - static final private char[] lowerChars = new char[LOOKUPLENGTH]; + static private final int BASE_LENGTH = 128; + static private final int LOOKUP_LENGTH = 16; + static final private byte[] HEX_NUMBER_TABLE = new byte[BASE_LENGTH]; + static final private char[] UPPER_CHARS = new char[LOOKUP_LENGTH]; + static final private char[] LOWER_CHARS = new char[LOOKUP_LENGTH]; static { - for (int i = 0; i < BASELENGTH; i++) { - hexNumberTable[i] = -1; + for (int i = 0; i < BASE_LENGTH; i++) { + HEX_NUMBER_TABLE[i] = -1; } for (int i = '9'; i >= '0'; i--) { - hexNumberTable[i] = (byte) (i - '0'); + HEX_NUMBER_TABLE[i] = (byte) (i - '0'); } for (int i = 'F'; i >= 'A'; i--) { - hexNumberTable[i] = (byte) (i - 'A' + 10); + HEX_NUMBER_TABLE[i] = (byte) (i - 'A' + 10); } for (int i = 'f'; i >= 'a'; i--) { - hexNumberTable[i] = (byte) (i - 'a' + 10); + HEX_NUMBER_TABLE[i] = (byte) (i - 'a' + 10); } for (int i = 0; i < 10; i++) { - upperChars[i] = (char) ('0' + i); - lowerChars[i] = (char) ('0' + i); + UPPER_CHARS[i] = (char) ('0' + i); + LOWER_CHARS[i] = (char) ('0' + i); } for (int i = 10; i <= 15; i++) { - upperChars[i] = (char) ('A' + i - 10); - lowerChars[i] = (char) ('a' + i - 10); + UPPER_CHARS[i] = (char) ('A' + i - 10); + LOWER_CHARS[i] = (char) ('a' + i - 10); } } @@ -63,7 +63,7 @@ public final class HexBin { return null; } - final char[] chars = upperCase ? upperChars : lowerChars; + final char[] chars = upperCase ? UPPER_CHARS : LOWER_CHARS; char[] hex = new char[bytes.length * 2]; for (int i = 0; i < bytes.length; i++) { @@ -97,12 +97,12 @@ public final class HexBin { char tempChar; for (int i = 0; i < lengthDecode; i++) { tempChar = binaryData[i * 2]; - temp1 = (tempChar < BASELENGTH) ? hexNumberTable[tempChar] : -1; + temp1 = (tempChar < BASE_LENGTH) ? HEX_NUMBER_TABLE[tempChar] : -1; if (temp1 == -1) { return null; } tempChar = binaryData[i * 2 + 1]; - temp2 = (tempChar < BASELENGTH) ? hexNumberTable[tempChar] : -1; + temp2 = (tempChar < BASE_LENGTH) ? HEX_NUMBER_TABLE[tempChar] : -1; if (temp2 == -1) { return null; } diff --git a/src/main/java/com/alibaba/druid/util/HttpClientUtils.java b/src/main/java/com/alibaba/druid/util/HttpClientUtils.java index 206a8ca0a1..95f2d2c9ba 100644 --- a/src/main/java/com/alibaba/druid/util/HttpClientUtils.java +++ b/src/main/java/com/alibaba/druid/util/HttpClientUtils.java @@ -15,6 +15,9 @@ */ package com.alibaba.druid.util; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -22,9 +25,6 @@ import java.io.OutputStreamWriter; import java.net.URL; import java.net.URLConnection; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; - /** * @author sandzhang */ @@ -53,7 +53,7 @@ public class HttpClientUtils { responseBuilder = new StringBuilder(); String line = null; while ((line = reader.readLine()) != null) { - responseBuilder.append(line + "\n"); + responseBuilder.append(line).append("\n"); } LOG.debug(responseBuilder.toString()); } diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index 7304547ddd..270caf5ad3 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -15,6 +15,10 @@ */ package com.alibaba.druid.util; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; + +import javax.sql.DataSource; import java.io.Closeable; import java.io.InputStream; import java.io.PrintStream; @@ -37,19 +41,14 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import javax.sql.DataSource; - -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; - /** * @author wenshao */ public final class JdbcUtils implements JdbcConstants { - private final static Log LOG = LogFactory.getLog(JdbcUtils.class); + private final static Log LOG = LogFactory.getLog(JdbcUtils.class); - private static final Properties driverUrlMapping = new Properties(); + private static final Properties DRIVER_URL_MAPPING = new Properties(); static { try { @@ -68,7 +67,7 @@ public final class JdbcUtils implements JdbcConstants { JdbcUtils.close(is); } - driverUrlMapping.putAll(property); + DRIVER_URL_MAPPING.putAll(property); } } } catch (Exception e) { @@ -76,7 +75,7 @@ public final class JdbcUtils implements JdbcConstants { } } - public final static void close(Connection x) { + public static void close(Connection x) { if (x == null) { return; } @@ -87,7 +86,7 @@ public final class JdbcUtils implements JdbcConstants { } } - public final static void close(Statement x) { + public static void close(Statement x) { if (x == null) { return; } @@ -98,18 +97,18 @@ public final class JdbcUtils implements JdbcConstants { } } - public final static void close(ResultSet x) { + public static void close(ResultSet x) { if (x == null) { return; } try { x.close(); } catch (Exception e) { - LOG.debug("close resultset error", e); + LOG.debug("close result set error", e); } } - public final static void close(Closeable x) { + public static void close(Closeable x) { if (x == null) { return; } @@ -121,11 +120,11 @@ public final class JdbcUtils implements JdbcConstants { } } - public final static void printResultSet(ResultSet rs) throws SQLException { + public static void printResultSet(ResultSet rs) throws SQLException { printResultSet(rs, System.out); } - public final static void printResultSet(ResultSet rs, PrintStream out) throws SQLException { + public static void printResultSet(ResultSet rs, PrintStream out) throws SQLException { ResultSetMetaData metadata = rs.getMetaData(); int columnCount = metadata.getColumnCount(); for (int columnIndex = 1; columnIndex <= columnCount; ++columnIndex) { @@ -204,35 +203,35 @@ public final class JdbcUtils implements JdbcConstants { } else if (type == Types.CLOB) { out.print(String.valueOf(rs.getString(columnIndex))); } else if (type == Types.JAVA_OBJECT) { - Object objec = rs.getObject(columnIndex); + Object object = rs.getObject(columnIndex); if (rs.wasNull()) { out.print("null"); } else { - out.print(String.valueOf(objec)); + out.print(String.valueOf(object)); } } else if (type == Types.LONGVARCHAR) { - Object objec = rs.getString(columnIndex); + Object object = rs.getString(columnIndex); if (rs.wasNull()) { out.print("null"); } else { - out.print(String.valueOf(objec)); + out.print(String.valueOf(object)); } } else if (type == Types.NULL) { out.print("null"); } else { - Object objec = rs.getObject(columnIndex); + Object object = rs.getObject(columnIndex); if (rs.wasNull()) { out.print("null"); } else { - if (objec instanceof byte[]) { - byte[] bytes = (byte[]) objec; + if (object instanceof byte[]) { + byte[] bytes = (byte[]) object; String text = HexBin.encode(bytes); out.print(text); } else { - out.print(String.valueOf(objec)); + out.print(String.valueOf(object)); } } } diff --git a/src/main/java/com/alibaba/druid/util/ServletPathMatcher.java b/src/main/java/com/alibaba/druid/util/ServletPathMatcher.java index 401c45a0ff..09ca1fd5e5 100644 --- a/src/main/java/com/alibaba/druid/util/ServletPathMatcher.java +++ b/src/main/java/com/alibaba/druid/util/ServletPathMatcher.java @@ -16,10 +16,11 @@ package com.alibaba.druid.util; public class ServletPathMatcher implements PatternMatcher { - private final static ServletPathMatcher instance = new ServletPathMatcher(); + + private final static ServletPathMatcher INSTANCE = new ServletPathMatcher(); public static ServletPathMatcher getInstance() { - return instance; + return INSTANCE; } /** diff --git a/src/main/java/com/alibaba/druid/util/StringUtils.java b/src/main/java/com/alibaba/druid/util/StringUtils.java index 96707ea586..f065465a7b 100644 --- a/src/main/java/com/alibaba/druid/util/StringUtils.java +++ b/src/main/java/com/alibaba/druid/util/StringUtils.java @@ -51,7 +51,11 @@ public class StringUtils { if (indexFrom < 0 || indexTo < 0 || indexFrom > indexTo) { return null; } - indexFrom += start.length(); + + if (null != start) { + indexFrom += start.length(); + } + return src.substring(indexFrom, indexTo); } diff --git a/src/main/java/com/alibaba/druid/util/jdbc/ConnectionBase.java b/src/main/java/com/alibaba/druid/util/jdbc/ConnectionBase.java index 8c63fc51fb..9aa09d7d47 100644 --- a/src/main/java/com/alibaba/druid/util/jdbc/ConnectionBase.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/ConnectionBase.java @@ -29,7 +29,7 @@ public abstract class ConnectionBase implements Connection { private int transactionIsolation; private int holdability; private Map> typeMap = new HashMap>(); - private SQLWarning warings; + private SQLWarning warnings; private boolean readOnly; private String url; @@ -86,16 +86,16 @@ public abstract class ConnectionBase implements Connection { @Override public SQLWarning getWarnings() throws SQLException { - return warings; + return warnings; } @Override public void clearWarnings() throws SQLException { - this.warings = null; + this.warnings = null; } - public void setWarings(SQLWarning warings) { - this.warings = warings; + public void setWarnings(SQLWarning warnings) { + this.warnings = warnings; } @Override diff --git a/src/main/java/com/alibaba/druid/util/jdbc/LocalResultSet.java b/src/main/java/com/alibaba/druid/util/jdbc/LocalResultSet.java index 2152748eb7..951f834c3d 100644 --- a/src/main/java/com/alibaba/druid/util/jdbc/LocalResultSet.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/LocalResultSet.java @@ -48,8 +48,7 @@ public class LocalResultSet extends ResultSetBase { public Object getObjectInternal(int columnIndex) { Object[] row = rows.get(rowIndex); - Object obj = row[columnIndex - 1]; - return obj; + return row[columnIndex - 1]; } @Override diff --git a/src/main/java/com/alibaba/druid/util/jdbc/ResultSetBase.java b/src/main/java/com/alibaba/druid/util/jdbc/ResultSetBase.java index 13c4513c0a..4e7248255f 100644 --- a/src/main/java/com/alibaba/druid/util/jdbc/ResultSetBase.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/ResultSetBase.java @@ -298,11 +298,7 @@ public abstract class ResultSetBase implements ResultSet { return false; } - if (iface.isInstance(this)) { - return true; - } - - return false; + return iface.isInstance(this); } @Override @@ -321,8 +317,8 @@ public abstract class ResultSetBase implements ResultSet { public Object getObjectInternal(int columnIndex) throws SQLException { if (this.getMetaData() != null) { - String columName = this.getMetaData().getColumnName(columnIndex); - return getObject(columName); + String columnName = this.getMetaData().getColumnName(columnIndex); + return getObject(columnName); } return null; @@ -879,7 +875,7 @@ public abstract class ResultSetBase implements ResultSet { return false; } - return ((Boolean) obj).booleanValue(); + return (Boolean) obj; } @Override diff --git a/src/main/java/com/alibaba/druid/util/jdbc/ResultSetMetaDataBase.java b/src/main/java/com/alibaba/druid/util/jdbc/ResultSetMetaDataBase.java index ed175958b8..da48a89906 100644 --- a/src/main/java/com/alibaba/druid/util/jdbc/ResultSetMetaDataBase.java +++ b/src/main/java/com/alibaba/druid/util/jdbc/ResultSetMetaDataBase.java @@ -57,12 +57,9 @@ public class ResultSetMetaDataBase implements ResultSetMetaData { if (iface == null) { return false; } - - if (iface.isAssignableFrom(this.getClass())) { - return true; - } - return false; + return iface.isAssignableFrom(this.getClass()); + } @Override diff --git a/src/main/java/com/alibaba/druid/wall/WallConfig.java b/src/main/java/com/alibaba/druid/wall/WallConfig.java index 68235d8972..533dee5c0d 100644 --- a/src/main/java/com/alibaba/druid/wall/WallConfig.java +++ b/src/main/java/com/alibaba/druid/wall/WallConfig.java @@ -15,23 +15,23 @@ */ package com.alibaba.druid.wall; -import static com.alibaba.druid.wall.spi.WallVisitorUtils.loadResource; +import com.alibaba.druid.wall.spi.WallVisitorUtils; import java.util.Set; import java.util.concurrent.ConcurrentSkipListSet; -import com.alibaba.druid.wall.spi.WallVisitorUtils; +import static com.alibaba.druid.wall.spi.WallVisitorUtils.loadResource; public class WallConfig implements WallConfigMBean { private boolean noneBaseStatementAllow = false; private boolean callAllow = true; - private boolean selelctAllow = true; + private boolean selectAllow = true; private boolean selectIntoAllow = true; private boolean selectIntoOutfileAllow = false; - private boolean selectWhereAlwayTrueCheck = true; - private boolean selectHavingAlwayTrueCheck = true; + private boolean selectWhereAlwaysTrueCheck = true; + private boolean selectHavingAlwaysTrueCheck = true; private boolean selectUnionCheck = true; private boolean selectMinusCheck = true; private boolean selectExceptCheck = true; @@ -42,19 +42,19 @@ public class WallConfig implements WallConfigMBean { private boolean renameTableAllow = true; private boolean hintAllow = true; - private boolean conditionAndAlwayTrueAllow = false; - private boolean conditionAndAlwayFalseAllow = false; + private boolean conditionAndAlwaysTrueAllow = false; + private boolean conditionAndAlwaysFalseAllow = false; private boolean conditionDoubleConstAllow = false; private boolean conditionLikeTrueAllow = true; private boolean selectAllColumnAllow = true; private boolean deleteAllow = true; - private boolean deleteWhereAlwayTrueCheck = true; + private boolean deleteWhereAlwaysTrueCheck = true; private boolean deleteWhereNoneCheck = false; private boolean updateAllow = true; - private boolean updateWhereAlayTrueCheck = true; + private boolean updateWhereAlwaysTrueCheck = true; private boolean updateWhereNoneCheck = false; private boolean insertAllow = true; @@ -114,7 +114,7 @@ public class WallConfig implements WallConfigMBean { private boolean metadataAllow = true; private boolean conditionOpXorAllow = false; - private boolean conditionOpBitwseAllow = true; + private boolean conditionOpBitwiseAllow = true; private boolean caseConditionConstAllow = false; @@ -154,20 +154,20 @@ public class WallConfig implements WallConfigMBean { this.limitZeroAllow = limitZero; } - public boolean isConditionAndAlwayTrueAllow() { - return conditionAndAlwayTrueAllow; + public boolean isConditionAndAlwaysTrueAllow() { + return conditionAndAlwaysTrueAllow; } - public void setConditionAndAlwayTrueAllow(boolean conditionAndAlwayTrueAllow) { - this.conditionAndAlwayTrueAllow = conditionAndAlwayTrueAllow; + public void setConditionAndAlwaysTrueAllow(boolean conditionAndAlwaysTrueAllow) { + this.conditionAndAlwaysTrueAllow = conditionAndAlwaysTrueAllow; } - public boolean isConditionAndAlwayFalseAllow() { - return conditionAndAlwayFalseAllow; + public boolean isConditionAndAlwaysFalseAllow() { + return conditionAndAlwaysFalseAllow; } - public void setConditionAndAlwayFalseAllow(boolean conditionAndAlwayFalseAllow) { - this.conditionAndAlwayFalseAllow = conditionAndAlwayFalseAllow; + public void setConditionAndAlwaysFalseAllow(boolean conditionAndAlwaysFalseAllow) { + this.conditionAndAlwaysFalseAllow = conditionAndAlwaysFalseAllow; } public boolean isUseAllow() { @@ -218,12 +218,12 @@ public class WallConfig implements WallConfigMBean { this.conditionOpXorAllow = conditionOpXorAllow; } - public boolean isConditionOpBitwseAllow() { - return conditionOpBitwseAllow; + public boolean isConditionOpBitwiseAllow() { + return conditionOpBitwiseAllow; } - public void setConditionOpBitwseAllow(boolean conditionOpBitwseAllow) { - this.conditionOpBitwseAllow = conditionOpBitwseAllow; + public void setConditionOpBitwiseAllow(boolean conditionOpBitwiseAllow) { + this.conditionOpBitwiseAllow = conditionOpBitwiseAllow; } public String getTenantTablePattern() { @@ -365,12 +365,12 @@ public class WallConfig implements WallConfigMBean { this.truncateAllow = truncateAllow; } - public boolean isSelelctAllow() { - return selelctAllow; + public boolean isSelectAllow() { + return selectAllow; } - public void setSelelctAllow(boolean selelctAllow) { - this.selelctAllow = selelctAllow; + public void setSelectAllow(boolean selelctAllow) { + this.selectAllow = selelctAllow; } public boolean isSelectIntoAllow() { @@ -453,20 +453,20 @@ public class WallConfig implements WallConfigMBean { this.selectIntersectCheck = selectIntersectCheck; } - public boolean isSelectWhereAlwayTrueCheck() { - return selectWhereAlwayTrueCheck; + public boolean isSelectWhereAlwaysTrueCheck() { + return selectWhereAlwaysTrueCheck; } - public void setSelectWhereAlwayTrueCheck(boolean selectWhereAlwayTrueCheck) { - this.selectWhereAlwayTrueCheck = selectWhereAlwayTrueCheck; + public void setSelectWhereAlwaysTrueCheck(boolean selectWhereAlwayTrueCheck) { + this.selectWhereAlwaysTrueCheck = selectWhereAlwayTrueCheck; } - public boolean isSelectHavingAlwayTrueCheck() { - return selectHavingAlwayTrueCheck; + public boolean isSelectHavingAlwaysTrueCheck() { + return selectHavingAlwaysTrueCheck; } - public void setSelectHavingAlwayTrueCheck(boolean selectHavingAlwayTrueCheck) { - this.selectHavingAlwayTrueCheck = selectHavingAlwayTrueCheck; + public void setSelectHavingAlwaysTrueCheck(boolean selectHavingAlwayTrueCheck) { + this.selectHavingAlwaysTrueCheck = selectHavingAlwayTrueCheck; } public boolean isDeleteAllow() { @@ -477,12 +477,12 @@ public class WallConfig implements WallConfigMBean { this.deleteAllow = deleteAllow; } - public boolean isDeleteWhereAlwayTrueCheck() { - return deleteWhereAlwayTrueCheck; + public boolean isDeleteWhereAlwaysTrueCheck() { + return deleteWhereAlwaysTrueCheck; } - public void setDeleteWhereAlwayTrueCheck(boolean deleteWhereAlwayTrueCheck) { - this.deleteWhereAlwayTrueCheck = deleteWhereAlwayTrueCheck; + public void setDeleteWhereAlwaysTrueCheck(boolean deleteWhereAlwayTrueCheck) { + this.deleteWhereAlwaysTrueCheck = deleteWhereAlwayTrueCheck; } public boolean isDeleteWhereNoneCheck() { @@ -501,12 +501,12 @@ public class WallConfig implements WallConfigMBean { this.updateAllow = updateAllow; } - public boolean isUpdateWhereAlayTrueCheck() { - return updateWhereAlayTrueCheck; + public boolean isUpdateWhereAlwaysTrueCheck() { + return updateWhereAlwaysTrueCheck; } - public void setUpdateWhereAlayTrueCheck(boolean updateWhereAlayTrueCheck) { - this.updateWhereAlayTrueCheck = updateWhereAlayTrueCheck; + public void setUpdateWhereAlwaysTrueCheck(boolean updateWhereAlayTrueCheck) { + this.updateWhereAlwaysTrueCheck = updateWhereAlayTrueCheck; } public boolean isUpdateWhereNoneCheck() { diff --git a/src/main/java/com/alibaba/druid/wall/WallConfigMBean.java b/src/main/java/com/alibaba/druid/wall/WallConfigMBean.java index 108eee17ac..f457fe79c3 100644 --- a/src/main/java/com/alibaba/druid/wall/WallConfigMBean.java +++ b/src/main/java/com/alibaba/druid/wall/WallConfigMBean.java @@ -37,9 +37,9 @@ public interface WallConfigMBean { void setTruncateAllow(boolean truncateAllow); - boolean isSelelctAllow(); + boolean isSelectAllow(); - void setSelelctAllow(boolean selelctAllow); + void setSelectAllow(boolean selectAllow); boolean isSelectIntoAllow(); @@ -53,29 +53,29 @@ public interface WallConfigMBean { void setSelectUnionCheck(boolean selectUnionCheck); - boolean isSelectWhereAlwayTrueCheck(); + boolean isSelectWhereAlwaysTrueCheck(); - void setSelectWhereAlwayTrueCheck(boolean selectWhereAlwayTrueCheck); + void setSelectWhereAlwaysTrueCheck(boolean selectWhereAlwaysTrueCheck); - boolean isSelectHavingAlwayTrueCheck(); + boolean isSelectHavingAlwaysTrueCheck(); - void setSelectHavingAlwayTrueCheck(boolean selectHavingAlwayTrueCheck); + void setSelectHavingAlwaysTrueCheck(boolean selectHavingAlwaysTrueCheck); boolean isDeleteAllow(); void setDeleteAllow(boolean deleteAllow); - boolean isDeleteWhereAlwayTrueCheck(); + boolean isDeleteWhereAlwaysTrueCheck(); - void setDeleteWhereAlwayTrueCheck(boolean deleteWhereAlwayTrueCheck); + void setDeleteWhereAlwaysTrueCheck(boolean deleteWhereAlwaysTrueCheck); boolean isUpdateAllow(); void setUpdateAllow(boolean updateAllow); - boolean isUpdateWhereAlayTrueCheck(); + boolean isUpdateWhereAlwaysTrueCheck(); - void setUpdateWhereAlayTrueCheck(boolean updateWhereAlayTrueCheck); + void setUpdateWhereAlwaysTrueCheck(boolean updateWhereAlwaysTrueCheck); boolean isInsertAllow(); diff --git a/src/main/java/com/alibaba/druid/wall/WallContext.java b/src/main/java/com/alibaba/druid/wall/WallContext.java index 602373b4f0..1ba5179c9e 100644 --- a/src/main/java/com/alibaba/druid/wall/WallContext.java +++ b/src/main/java/com/alibaba/druid/wall/WallContext.java @@ -27,11 +27,11 @@ public class WallContext { private Map functionStats; private final String dbType; private int commentCount; - private int warnnings = 0; - private int unionWarnnings = 0; - private int updateNoneConditionWarnnings = 0; - private int deleteNoneConditionWarnnings = 0; - private int likeNumberWarnnings = 0; + private int warnings = 0; + private int unionWarnings = 0; + private int updateNoneConditionWarnings = 0; + private int deleteNoneConditionWarnings = 0; + private int likeNumberWarnings = 0; public WallContext(String dbType){ this.dbType = dbType; @@ -129,61 +129,61 @@ public class WallContext { public void incrementCommentCount() { if (this.commentCount == 0) { - this.warnnings++; + this.warnings++; } this.commentCount++; } - public int getWarnnings() { - return warnnings; + public int getWarnings() { + return warnings; } - public void incrementWarnnings() { - this.warnnings++; + public void incrementWarnings() { + this.warnings++; } - public int getLikeNumberWarnnings() { - return likeNumberWarnnings; + public int getLikeNumberWarnings() { + return likeNumberWarnings; } - public void incrementLikeNumberWarnnings() { - if (likeNumberWarnnings == 0) { - this.warnnings++; + public void incrementLikeNumberWarnings() { + if (likeNumberWarnings == 0) { + this.warnings++; } - likeNumberWarnnings++; + likeNumberWarnings++; } - public int getUnionWarnnings() { - return unionWarnnings; + public int getUnionWarnings() { + return unionWarnings; } - public void incrementUnionWarnnings() { - if (this.unionWarnnings == 0) { - this.incrementWarnnings(); + public void incrementUnionWarnings() { + if (this.unionWarnings == 0) { + this.incrementWarnings(); } - this.unionWarnnings++; + this.unionWarnings++; } - public int getUpdateNoneConditionWarnnings() { - return updateNoneConditionWarnnings; + public int getUpdateNoneConditionWarnings() { + return updateNoneConditionWarnings; } - public void incrementUpdateNoneConditionWarnnings() { - // if (this.updateNoneConditionWarnnings == 0) { - // this.incrementWarnnings(); + public void incrementUpdateNoneConditionWarnings() { + // if (this.updateNoneConditionWarnings == 0) { + // this.incrementWarnings(); // } - this.updateNoneConditionWarnnings++; + this.updateNoneConditionWarnings++; } - public int getDeleteNoneConditionWarnnings() { - return deleteNoneConditionWarnnings; + public int getDeleteNoneConditionWarnings() { + return deleteNoneConditionWarnings; } - public void incrementDeleteNoneConditionWarnnings() { - // if (this.deleteNoneConditionWarnnings == 0) { - // this.incrementWarnnings(); + public void incrementDeleteNoneConditionWarnings() { + // if (this.deleteNoneConditionWarnings == 0) { + // this.incrementWarnings(); // } - this.deleteNoneConditionWarnnings++; + this.deleteNoneConditionWarnings++; } } diff --git a/src/main/java/com/alibaba/druid/wall/WallFilter.java b/src/main/java/com/alibaba/druid/wall/WallFilter.java index 7e65bcf936..67aee7b77f 100644 --- a/src/main/java/com/alibaba/druid/wall/WallFilter.java +++ b/src/main/java/com/alibaba/druid/wall/WallFilter.java @@ -15,7 +15,28 @@ */ package com.alibaba.druid.wall; -import static com.alibaba.druid.util.Utils.getBoolean; +import com.alibaba.druid.filter.FilterAdapter; +import com.alibaba.druid.filter.FilterChain; +import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; +import com.alibaba.druid.proxy.jdbc.ConnectionProxy; +import com.alibaba.druid.proxy.jdbc.DataSourceProxy; +import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; +import com.alibaba.druid.proxy.jdbc.ResultSetMetaDataProxy; +import com.alibaba.druid.proxy.jdbc.ResultSetProxy; +import com.alibaba.druid.proxy.jdbc.StatementProxy; +import com.alibaba.druid.support.logging.Log; +import com.alibaba.druid.support.logging.LogFactory; +import com.alibaba.druid.util.JdbcUtils; +import com.alibaba.druid.util.ServletPathMatcher; +import com.alibaba.druid.util.StringUtils; +import com.alibaba.druid.wall.WallConfig.TenantCallBack; +import com.alibaba.druid.wall.WallConfig.TenantCallBack.StatementType; +import com.alibaba.druid.wall.spi.DB2WallProvider; +import com.alibaba.druid.wall.spi.MySqlWallProvider; +import com.alibaba.druid.wall.spi.OracleWallProvider; +import com.alibaba.druid.wall.spi.PGWallProvider; +import com.alibaba.druid.wall.spi.SQLServerWallProvider; +import com.alibaba.druid.wall.violation.SyntaxErrorViolation; import java.io.InputStream; import java.io.Reader; @@ -40,28 +61,7 @@ import java.util.Map; import java.util.Properties; import java.util.Set; -import com.alibaba.druid.filter.FilterAdapter; -import com.alibaba.druid.filter.FilterChain; -import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; -import com.alibaba.druid.proxy.jdbc.ConnectionProxy; -import com.alibaba.druid.proxy.jdbc.DataSourceProxy; -import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetMetaDataProxy; -import com.alibaba.druid.proxy.jdbc.ResultSetProxy; -import com.alibaba.druid.proxy.jdbc.StatementProxy; -import com.alibaba.druid.support.logging.Log; -import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.JdbcUtils; -import com.alibaba.druid.util.ServletPathMatcher; -import com.alibaba.druid.util.StringUtils; -import com.alibaba.druid.wall.WallConfig.TenantCallBack; -import com.alibaba.druid.wall.WallConfig.TenantCallBack.StatementType; -import com.alibaba.druid.wall.spi.DB2WallProvider; -import com.alibaba.druid.wall.spi.MySqlWallProvider; -import com.alibaba.druid.wall.spi.OracleWallProvider; -import com.alibaba.druid.wall.spi.PGWallProvider; -import com.alibaba.druid.wall.spi.SQLServerWallProvider; -import com.alibaba.druid.wall.violation.SyntaxErrorViolation; +import static com.alibaba.druid.util.Utils.getBoolean; public class WallFilter extends FilterAdapter implements WallFilterMBean { @@ -102,8 +102,14 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean { @Override public synchronized void init(DataSourceProxy dataSource) { + + if (null == dataSource) { + LOG.error("dataSource should not be null"); + return; + } + if (this.dbType == null || this.dbType.trim().length() == 0) { - if (dataSource != null && dataSource.getDbType() != null) { + if (dataSource.getDbType() != null) { this.dbType = dataSource.getDbType(); } else { this.dbType = JdbcUtils.getDbType(dataSource.getRawJdbcUrl(), ""); @@ -466,8 +472,8 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean { try { int[] updateCounts = chain.statement_executeBatch(statement); int updateCount = 0; - for (int i = 0; i < updateCounts.length; ++i) { - updateCount += updateCounts[i]; + for (int count : updateCounts) { + updateCount += count; } if (sqlStat != null) { @@ -556,8 +562,7 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean { private WallContext createWallContext(StatementProxy statement) { String dbType = getDbType(statement); - WallContext context = WallContext.create(dbType); - return context; + return WallContext.create(dbType); } @Override @@ -664,7 +669,7 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean { return; } - if (updateCount > 0 && sqlStat != null) { + if (updateCount > 0) { provider.addUpdateCount(sqlStat, updateCount); } } @@ -711,25 +716,21 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean { } } - String resultSql = checkResult.getSql(); - return resultSql; + return checkResult.getSql(); } @Override public boolean isWrapperFor(FilterChain chain, Wrapper wrapper, Class iface) throws SQLException { - if (config.isDoPrivilegedAllow() && WallProvider.ispPivileged()) { + if (config.isDoPrivilegedAllow() && WallProvider.ispPrivileged()) { return chain.isWrapperFor(wrapper, iface); } - if (!this.provider.getConfig().isWrapAllow()) { - return false; - } - return chain.isWrapperFor(wrapper, iface); + return this.provider.getConfig().isWrapAllow() && chain.isWrapperFor(wrapper, iface); } @Override public T unwrap(FilterChain chain, Wrapper wrapper, Class iface) throws SQLException { - if (config.isDoPrivilegedAllow() && WallProvider.ispPivileged()) { + if (config.isDoPrivilegedAllow() && WallProvider.ispPrivileged()) { return chain.unwrap(wrapper, iface); } @@ -742,19 +743,17 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean { @Override public DatabaseMetaData connection_getMetaData(FilterChain chain, ConnectionProxy connection) throws SQLException { - if (config.isDoPrivilegedAllow() && WallProvider.ispPivileged()) { + if (config.isDoPrivilegedAllow() && WallProvider.ispPrivileged()) { return chain.connection_getMetaData(connection); } if (!this.provider.getConfig().isMetadataAllow()) { if (isLogViolation()) { - LOG.error("not support method : Connection.getMetdataData"); + LOG.error("not support method : Connection.getMetaData"); } if (throwException) { - throw new WallSQLException("not support method : Connection.getMetdataData"); - } else { - + throw new WallSQLException("not support method : Connection.getMetaData"); } } @@ -1419,7 +1418,7 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean { if (!StringUtils.isEmpty(hiddenColumn)) { String columnName = metaData.getColumnName(physicalColumn); - if (hiddenColumn.equalsIgnoreCase(columnName)) { + if (null != hiddenColumn && hiddenColumn.equalsIgnoreCase(columnName)) { hiddenColumns.add(physicalColumn); isHidden = true; } @@ -1431,7 +1430,7 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean { } if (!StringUtils.isEmpty(tenantColumn) - && tenantColumn.equalsIgnoreCase(metaData.getColumnName(physicalColumn))) { + && null != tenantColumn && tenantColumn.equalsIgnoreCase(metaData.getColumnName(physicalColumn))) { tenantColumns.add(physicalColumn); } } diff --git a/src/main/java/com/alibaba/druid/wall/WallProvider.java b/src/main/java/com/alibaba/druid/wall/WallProvider.java index 64eec2e5d4..5f96c9f3ba 100644 --- a/src/main/java/com/alibaba/druid/wall/WallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/WallProvider.java @@ -15,21 +15,6 @@ */ package com.alibaba.druid.wall; -import static com.alibaba.druid.util.JdbcSqlStatUtils.get; - -import java.security.PrivilegedAction; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.parser.Lexer; @@ -46,6 +31,21 @@ import com.alibaba.druid.wall.violation.ErrorCode; import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; import com.alibaba.druid.wall.violation.SyntaxErrorViolation; +import java.security.PrivilegedAction; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +import static com.alibaba.druid.util.JdbcSqlStatUtils.get; + public abstract class WallProvider { private String name; @@ -90,7 +90,7 @@ public abstract class WallProvider { protected final AtomicLong hardCheckCount = new AtomicLong(); protected final AtomicLong whiteListHitCount = new AtomicLong(); protected final AtomicLong blackListHitCount = new AtomicLong(); - protected final AtomicLong syntaxErrrorCount = new AtomicLong(); + protected final AtomicLong syntaxErrorCount = new AtomicLong(); protected final AtomicLong violationCount = new AtomicLong(); protected final AtomicLong violationEffectRowCount = new AtomicLong(); @@ -315,8 +315,7 @@ public abstract class WallProvider { Map functionStats, List violations, boolean syntaxError) { if (!blackListEnable) { - WallSqlStat stat = new WallSqlStat(tableStats, functionStats, violations, syntaxError); - return stat; + return new WallSqlStat(tableStats, functionStats, violations, syntaxError); } String mergedSql; @@ -524,11 +523,8 @@ public abstract class WallProvider { functionName = functionName.toLowerCase(); - if (getConfig().getDenyFunctions().contains(functionName)) { - return false; - } + return !getConfig().getDenyFunctions().contains(functionName); - return true; } public boolean checkDenySchema(String schemaName) { @@ -541,11 +537,8 @@ public abstract class WallProvider { } schemaName = schemaName.toLowerCase(); - if (getConfig().getDenySchemas().contains(schemaName)) { - return false; - } + return !getConfig().getDenySchemas().contains(schemaName); - return true; } public boolean checkDenyTable(String tableName) { @@ -554,11 +547,8 @@ public abstract class WallProvider { } tableName = WallVisitorUtils.form(tableName); - if (getConfig().getDenyTables().contains(tableName)) { - return false; - } + return !getConfig().getDenyTables().contains(tableName); - return true; } public boolean checkReadOnlyTable(String tableName) { @@ -567,11 +557,8 @@ public abstract class WallProvider { } tableName = WallVisitorUtils.form(tableName); - if (getConfig().isReadOnly(tableName)) { - return false; - } + return !getConfig().isReadOnly(tableName); - return true; } public WallDenyStat getCommentDenyStat() { @@ -596,7 +583,7 @@ public abstract class WallProvider { WallContext context = WallContext.current(); - if (config.isDoPrivilegedAllow() && ispPivileged()) { + if (config.isDoPrivilegedAllow() && ispPrivileged()) { WallCheckResult checkResult = new WallCheckResult(); checkResult.setSql(sql); return checkResult; @@ -635,7 +622,7 @@ public abstract class WallProvider { violations.add(new IllegalSQLObjectViolation(ErrorCode.COMMENT_STATEMENT_NOT_ALLOW, "comment not allow", sql)); incrementCommentDeniedCount(); } catch (ParserException e) { - syntaxErrrorCount.incrementAndGet(); + syntaxErrorCount.incrementAndGet(); syntaxError = true; if (config.isStrictSyntaxCheck()) { violations.add(new SyntaxErrorViolation(e, sql)); @@ -666,10 +653,10 @@ public abstract class WallProvider { violations.addAll(visitor.getViolations()); } - // if (visitor.getViolations().size() == 0 && context != null && context.getWarnnings() >= 2) { + // if (visitor.getViolations().size() == 0 && context != null && context.getWarnings() >= 2) { // if (context.getCommentCount() > 0) { // violations.add(new IllegalSQLObjectViolation(ErrorCode.COMMIT_NOT_ALLOW, "comment not allow", sql)); - // } else if (context.getLikeNumberWarnnings() > 0) { + // } else if (context.getLikeNumberWarnings() > 0) { // violations.add(new IllegalSQLObjectViolation(ErrorCode.COMMIT_NOT_ALLOW, "like number", sql)); // } else { // violations.add(new IllegalSQLObjectViolation(ErrorCode.COMPOUND, "multi-warnnings", sql)); @@ -702,7 +689,7 @@ public abstract class WallProvider { context.setSqlStat(sqlStat); result = new WallCheckResult(sqlStat, statementList); } else { - result = new WallCheckResult(sqlStat, violations, tableStats, functionStats, statementList, syntaxError); + result = new WallCheckResult(null, violations, tableStats, functionStats, statementList, syntaxError); } String resultSql; @@ -725,7 +712,7 @@ public abstract class WallProvider { violationCount.incrementAndGet(); if (sqlStat.isSyntaxError()) { - syntaxErrrorCount.incrementAndGet(); + syntaxErrorCount.incrementAndGet(); } sqlStat.incrementAndGetExecuteCount(); @@ -742,7 +729,7 @@ public abstract class WallProvider { sqlStat.incrementAndGetExecuteCount(); if (sqlStat.isSyntaxError()) { - syntaxErrrorCount.incrementAndGet(); + syntaxErrorCount.incrementAndGet(); } recordStats(sqlStat.getTableStats(), sqlStat.getFunctionStats()); @@ -780,13 +767,13 @@ public abstract class WallProvider { } } - public static boolean ispPivileged() { + public static boolean ispPrivileged() { Boolean value = privileged.get(); if (value == null) { return false; } - return value.booleanValue(); + return value; } public static T doPrivileged(PrivilegedAction action) { @@ -818,7 +805,7 @@ public abstract class WallProvider { } public long getSyntaxErrorCount() { - return syntaxErrrorCount.get(); + return syntaxErrorCount.get(); } public long getCheckCount() { @@ -887,7 +874,7 @@ public abstract class WallProvider { statValue.setViolationEffectRowCount(get(violationEffectRowCount, reset)); statValue.setBlackListHitCount(get(blackListHitCount, reset)); statValue.setWhiteListHitCount(get(whiteListHitCount, reset)); - statValue.setSyntaxErrorCount(get(syntaxErrrorCount, reset)); + statValue.setSyntaxErrorCount(get(syntaxErrorCount, reset)); for (Map.Entry entry : this.tableStats.entrySet()) { String tableName = entry.getKey(); diff --git a/src/main/java/com/alibaba/druid/wall/WallProviderStatValue.java b/src/main/java/com/alibaba/druid/wall/WallProviderStatValue.java index 19972d293f..b87639b07e 100644 --- a/src/main/java/com/alibaba/druid/wall/WallProviderStatValue.java +++ b/src/main/java/com/alibaba/druid/wall/WallProviderStatValue.java @@ -15,15 +15,15 @@ */ package com.alibaba.druid.wall; +import com.alibaba.druid.support.monitor.annotation.AggregateType; +import com.alibaba.druid.support.monitor.annotation.MField; +import com.alibaba.druid.support.monitor.annotation.MTable; + import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.alibaba.druid.support.monitor.annotation.AggregateType; -import com.alibaba.druid.support.monitor.annotation.MField; -import com.alibaba.druid.support.monitor.annotation.MTable; - @MTable(name = "druid_wall") public class WallProviderStatValue { @@ -107,8 +107,8 @@ public class WallProviderStatValue { return syntaxErrorCount; } - public void setSyntaxErrorCount(long syntaxErrroCount) { - this.syntaxErrorCount = syntaxErrroCount; + public void setSyntaxErrorCount(long syntaxErrorCount) { + this.syntaxErrorCount = syntaxErrorCount; } public long getViolationEffectRowCount() { @@ -146,7 +146,7 @@ public class WallProviderStatValue { info.put("blackListSize", this.getBlackList().size()); info.put("whiteListHitCount", this.getWhiteListHitCount()); info.put("whiteListSize", this.getWhiteList().size()); - info.put("syntaxErrrorCount", this.getSyntaxErrorCount()); + info.put("syntaxErrorCount", this.getSyntaxErrorCount()); { List> tables = new ArrayList>(this.tables.size()); diff --git a/src/main/java/com/alibaba/druid/wall/WallSqlStatValue.java b/src/main/java/com/alibaba/druid/wall/WallSqlStatValue.java index e1c2d534ba..02456b5c18 100644 --- a/src/main/java/com/alibaba/druid/wall/WallSqlStatValue.java +++ b/src/main/java/com/alibaba/druid/wall/WallSqlStatValue.java @@ -15,13 +15,13 @@ */ package com.alibaba.druid.wall; -import java.util.LinkedHashMap; -import java.util.Map; - import com.alibaba.druid.support.monitor.annotation.AggregateType; import com.alibaba.druid.support.monitor.annotation.MField; import com.alibaba.druid.support.monitor.annotation.MTable; +import java.util.LinkedHashMap; +import java.util.Map; + @MTable(name = "druid_wall_sql") public class WallSqlStatValue { @@ -132,7 +132,7 @@ public class WallSqlStatValue { public Map toMap() { Map sqlStatMap = new LinkedHashMap(); sqlStatMap.put("sql", sql); - if (sql != sqlSample) { + if (!sql.equals(sqlSample)) { sqlStatMap.put("sample", sqlSample); } sqlStatMap.put("executeCount", getExecuteCount()); diff --git a/src/main/java/com/alibaba/druid/wall/spi/DB2WallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/DB2WallVisitor.java index 6ba434f843..e089502289 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/DB2WallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/DB2WallVisitor.java @@ -15,9 +15,6 @@ */ package com.alibaba.druid.wall.spi; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObject; @@ -51,6 +48,9 @@ import com.alibaba.druid.wall.WallVisitor; import com.alibaba.druid.wall.violation.ErrorCode; import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; +import java.util.ArrayList; +import java.util.List; + public class DB2WallVisitor extends DB2ASTVisitorAdapter implements WallVisitor { private final WallConfig config; @@ -188,7 +188,7 @@ public class DB2WallVisitor extends DB2ASTVisitorAdapter implements WallVisitor @Override public boolean visit(SQLSelectStatement x) { - if (!config.isSelelctAllow()) { + if (!config.isSelectAllow()) { this.getViolations().add(new IllegalSQLObjectViolation(ErrorCode.SELECT_NOT_ALLOW, "selelct not allow", this.toSQL(x))); return false; diff --git a/src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java index ec4ec516fc..5c768cce90 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/MySqlWallVisitor.java @@ -15,9 +15,6 @@ */ package com.alibaba.druid.wall.spi; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLCommentHint; import com.alibaba.druid.sql.ast.SQLName; @@ -69,6 +66,9 @@ import com.alibaba.druid.wall.spi.WallVisitorUtils.WallTopStatementContext; import com.alibaba.druid.wall.violation.ErrorCode; import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; +import java.util.ArrayList; +import java.util.List; + public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisitor, MySqlASTVisitor { private final WallConfig config; @@ -197,7 +197,7 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi @Override public boolean visit(SQLSelectStatement x) { - if (!config.isSelelctAllow()) { + if (!config.isSelectAllow()) { this.getViolations().add(new IllegalSQLObjectViolation(ErrorCode.SELECT_NOT_ALLOW, "select not allow", this.toSQL(x))); return false; @@ -220,7 +220,7 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi int rowCount = ((SQLNumericLiteralExpr) x.getRowCount()).getNumber().intValue(); if (rowCount == 0) { if (context != null) { - context.incrementWarnnings(); + context.incrementWarnings(); } if (!provider.getConfig().isLimitZeroAllow()) { @@ -510,7 +510,7 @@ public class MySqlWallVisitor extends MySqlASTVisitorAdapter implements WallVisi @Override public boolean visit(MySqlShowCreateTableStatement x) { - String tableName = ((SQLName) x.getName()).getSimleName(); + String tableName = ((SQLName) x.getName()).getSimpleName(); WallContext context = WallContext.current(); if (context != null) { WallSqlTableStat tableStat = context.getTableStat(tableName); diff --git a/src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java index 7ceacff1f9..136a785537 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/OracleWallVisitor.java @@ -15,9 +15,6 @@ */ package com.alibaba.druid.wall.spi; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObject; @@ -59,6 +56,9 @@ import com.alibaba.druid.wall.WallVisitor; import com.alibaba.druid.wall.violation.ErrorCode; import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; +import java.util.ArrayList; +import java.util.List; + public class OracleWallVisitor extends OracleASTVisitorAdapter implements WallVisitor { private final WallConfig config; @@ -201,7 +201,7 @@ public class OracleWallVisitor extends OracleASTVisitorAdapter implements WallVi @Override public boolean visit(SQLSelectStatement x) { - if (!config.isSelelctAllow()) { + if (!config.isSelectAllow()) { this.getViolations().add(new IllegalSQLObjectViolation(ErrorCode.SELECT_NOT_ALLOW, "select not allow", this.toSQL(x))); return false; diff --git a/src/main/java/com/alibaba/druid/wall/spi/PGWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/PGWallVisitor.java index a6ccb1d66d..3d08bffac1 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/PGWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/PGWallVisitor.java @@ -15,9 +15,6 @@ */ package com.alibaba.druid.wall.spi; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObject; @@ -51,6 +48,9 @@ import com.alibaba.druid.wall.WallVisitor; import com.alibaba.druid.wall.violation.ErrorCode; import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; +import java.util.ArrayList; +import java.util.List; + public class PGWallVisitor extends PGASTVisitorAdapter implements WallVisitor { private final WallConfig config; @@ -132,11 +132,7 @@ public class PGWallVisitor extends PGASTVisitorAdapter implements WallVisitor { public boolean visit(SQLExprTableSource x) { WallVisitorUtils.check(this, x); - if (x.getExpr() instanceof SQLName) { - return false; - } - - return true; + return !(x.getExpr() instanceof SQLName); } public boolean visit(SQLSelectGroupByClause x) { @@ -189,7 +185,7 @@ public class PGWallVisitor extends PGASTVisitorAdapter implements WallVisitor { @Override public boolean visit(SQLSelectStatement x) { - if (!config.isSelelctAllow()) { + if (!config.isSelectAllow()) { this.getViolations().add(new IllegalSQLObjectViolation(ErrorCode.SELECT_NOT_ALLOW, "selelct not allow", this.toSQL(x))); return false; diff --git a/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallProvider.java b/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallProvider.java index b636103280..001c325abd 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallProvider.java @@ -35,9 +35,6 @@ public class SQLServerWallProvider extends WallProvider { public final static String DEFAULT_CONFIG_DIR = "META-INF/druid/wall/sqlserver"; - /** - * @param config - */ public SQLServerWallProvider(){ this(new WallConfig(DEFAULT_CONFIG_DIR)); } diff --git a/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java b/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java index 41fa585207..ae67c4577b 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java +++ b/src/main/java/com/alibaba/druid/wall/spi/SQLServerWallVisitor.java @@ -15,9 +15,6 @@ */ package com.alibaba.druid.wall.spi; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLName; import com.alibaba.druid.sql.ast.SQLObject; @@ -57,6 +54,9 @@ import com.alibaba.druid.wall.spi.WallVisitorUtils.WallTopStatementContext; import com.alibaba.druid.wall.violation.ErrorCode; import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; +import java.util.ArrayList; +import java.util.List; + public class SQLServerWallVisitor extends SQLServerASTVisitorAdapter implements WallVisitor, SQLServerASTVisitor { private final WallConfig config; @@ -162,11 +162,8 @@ public class SQLServerWallVisitor extends SQLServerASTVisitorAdapter implements public boolean visit(SQLExprTableSource x) { WallVisitorUtils.check(this, x); - if (x.getExpr() instanceof SQLName) { - return false; - } + return !(x.getExpr() instanceof SQLName); - return true; } public boolean visit(SQLSelectGroupByClause x) { @@ -201,7 +198,7 @@ public class SQLServerWallVisitor extends SQLServerASTVisitorAdapter implements @Override public boolean visit(SQLSelectStatement x) { - if (!config.isSelelctAllow()) { + if (!config.isSelectAllow()) { this.getViolations().add(new IllegalSQLObjectViolation(ErrorCode.SELECT_NOT_ALLOW, "selelct not allow", this.toSQL(x))); return false; diff --git a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java index 81cc8f77a2..d8c5cbd1a6 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java @@ -15,20 +15,6 @@ */ package com.alibaba.druid.wall.spi; -import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Enumeration; -import java.util.List; -import java.util.Set; -import java.util.Stack; - import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLName; @@ -130,6 +116,20 @@ import com.alibaba.druid.wall.WallVisitor; import com.alibaba.druid.wall.violation.ErrorCode; import com.alibaba.druid.wall.violation.IllegalSQLObjectViolation; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Enumeration; +import java.util.List; +import java.util.Set; +import java.util.Stack; + +import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE; + public class WallVisitorUtils { private final static Log LOG = LogFactory.getLog(WallVisitorUtils.class); @@ -176,7 +176,7 @@ public class WallVisitorUtils { } public static void check(WallVisitor visitor, SQLCreateTableStatement x) { - String tableName = ((SQLName) x.getName()).getSimleName(); + String tableName = ((SQLName) x.getName()).getSimpleName(); WallContext context = WallContext.current(); if (context != null) { WallSqlTableStat tableStat = context.getTableStat(tableName); @@ -187,7 +187,7 @@ public class WallVisitorUtils { } public static void check(WallVisitor visitor, SQLAlterTableStatement x) { - String tableName = ((SQLName) x.getName()).getSimleName(); + String tableName = ((SQLName) x.getName()).getSimpleName(); WallContext context = WallContext.current(); if (context != null) { WallSqlTableStat tableStat = context.getTableStat(tableName); @@ -201,7 +201,7 @@ public class WallVisitorUtils { for (SQLTableSource item : x.getTableSources()) { if (item instanceof SQLExprTableSource) { SQLExpr expr = ((SQLExprTableSource) item).getExpr(); - String tableName = ((SQLName) expr).getSimleName(); + String tableName = ((SQLName) expr).getSimpleName(); WallContext context = WallContext.current(); if (context != null) { WallSqlTableStat tableStat = context.getTableStat(tableName); @@ -275,11 +275,11 @@ public class WallVisitorUtils { where.setParent(x); checkCondition(visitor, x.getWhere()); - Object whereValue = getConditionValue(visitor, where, visitor.getConfig().isSelectWhereAlwayTrueCheck()); + Object whereValue = getConditionValue(visitor, where, visitor.getConfig().isSelectWhereAlwaysTrueCheck()); if (Boolean.TRUE == whereValue) { if (!isSimpleConstExpr(where)) {// 简单表达式 - addViolation(visitor, ErrorCode.ALWAY_TRUE, "select alway true condition not allow", x); + addViolation(visitor, ErrorCode.ALWAYS_TRUE, "select alway true condition not allow", x); } } } @@ -292,9 +292,9 @@ public class WallVisitorUtils { return; } - if (Boolean.TRUE == getConditionValue(visitor, x, visitor.getConfig().isSelectHavingAlwayTrueCheck())) { + if (Boolean.TRUE == getConditionValue(visitor, x, visitor.getConfig().isSelectHavingAlwaysTrueCheck())) { if (!isSimpleConstExpr(x)) { - addViolation(visitor, ErrorCode.ALWAY_TRUE, "having alway true condition not allow", x); + addViolation(visitor, ErrorCode.ALWAYS_TRUE, "having alway true condition not allow", x); } } } @@ -318,7 +318,7 @@ public class WallVisitorUtils { if (x.getWhere() == null && (!hasUsing) && !isJoinTableSource) { WallContext context = WallContext.current(); if (context != null) { - context.incrementDeleteNoneConditionWarnnings(); + context.incrementDeleteNoneConditionWarnings(); } if (config.isDeleteWhereNoneCheck()) { @@ -331,9 +331,9 @@ public class WallVisitorUtils { if (where != null) { checkCondition(visitor, where); - if (Boolean.TRUE == getConditionValue(visitor, where, config.isDeleteWhereAlwayTrueCheck())) { + if (Boolean.TRUE == getConditionValue(visitor, where, config.isDeleteWhereAlwaysTrueCheck())) { if (!isSimpleConstExpr(where)) { - addViolation(visitor, ErrorCode.ALWAY_TRUE, "delete alway true condition not allow", x); + addViolation(visitor, ErrorCode.ALWAYS_TRUE, "delete alway true condition not allow", x); } } } @@ -388,7 +388,6 @@ public class WallVisitorUtils { if (exportParameterVisitor.getParameters().size() > 0) { addViolation(visitor, ErrorCode.NOT_PARAMETERIZED, "sql must parameterized", x); - return; } } @@ -866,7 +865,7 @@ public class WallVisitorUtils { String tableName = null; SQLExpr tableNameExpr = ((SQLExprTableSource) tableSource).getExpr(); if (tableNameExpr instanceof SQLName) { - tableName = ((SQLName) tableNameExpr).getSimleName(); + tableName = ((SQLName) tableNameExpr).getSimpleName(); } boolean readOnlyValid = visitor.getProvider().checkReadOnlyTable(tableName); @@ -894,7 +893,7 @@ public class WallVisitorUtils { if (where == null) { WallContext context = WallContext.current(); if (context != null) { - context.incrementUpdateNoneConditionWarnnings(); + context.incrementUpdateNoneConditionWarnings(); } if (config.isUpdateWhereNoneCheck()) { @@ -913,9 +912,9 @@ public class WallVisitorUtils { where.setParent(x); checkCondition(visitor, where); - if (Boolean.TRUE == getConditionValue(visitor, where, config.isUpdateWhereAlayTrueCheck())) { + if (Boolean.TRUE == getConditionValue(visitor, where, config.isUpdateWhereAlwaysTrueCheck())) { if (!isSimpleConstExpr(where)) { - addViolation(visitor, ErrorCode.ALWAY_TRUE, "update alway true condition not allow", x); + addViolation(visitor, ErrorCode.ALWAYS_TRUE, "update alway true condition not allow", x); } } } @@ -1036,7 +1035,7 @@ public class WallVisitorUtils { WallContext context = WallContext.current(); if (context != null) { if (rightResult instanceof Number || leftResult instanceof Number) { - context.incrementLikeNumberWarnnings(); + context.incrementLikeNumberWarnings(); } } } @@ -1331,17 +1330,17 @@ public class WallVisitorUtils { if (context != null) { if (current.hasPartAlwayTrue() || Boolean.TRUE == value) { if (!isFirst(x)) { - context.incrementWarnnings(); + context.incrementWarnings(); } } } - if (current.hasPartAlwayTrue() && alwayTrueCheck && !visitor.getConfig().isConditionAndAlwayTrueAllow()) { - addViolation(visitor, ErrorCode.ALWAY_TRUE, "part alway true condition not allow", x); + if (current.hasPartAlwayTrue() && alwayTrueCheck && !visitor.getConfig().isConditionAndAlwaysTrueAllow()) { + addViolation(visitor, ErrorCode.ALWAYS_TRUE, "part alway true condition not allow", x); } - if (current.hasPartAlwayFalse() && !visitor.getConfig().isConditionAndAlwayFalseAllow()) { - addViolation(visitor, ErrorCode.ALWAY_FALSE, "part alway false condition not allow", x); + if (current.hasPartAlwayFalse() && !visitor.getConfig().isConditionAndAlwaysFalseAllow()) { + addViolation(visitor, ErrorCode.ALWAYS_FALSE, "part alway false condition not allow", x); } if (current.hasConstArithmetic() && !visitor.getConfig().isConstArithmeticAllow()) { @@ -1352,7 +1351,7 @@ public class WallVisitorUtils { addViolation(visitor, ErrorCode.XOR, "xor not allow", x); } - if (current.hasBitwise() && !visitor.getConfig().isConditionOpBitwseAllow()) { + if (current.hasBitwise() && !visitor.getConfig().isConditionOpBitwiseAllow()) { addViolation(visitor, ErrorCode.BITWISE, "bitwise operator not allow", x); } @@ -1701,7 +1700,7 @@ public class WallVisitorUtils { } if (x instanceof SQLName) { - String owner = ((SQLName) x).getSimleName(); + String owner = ((SQLName) x).getSimpleName(); owner = WallVisitorUtils.form(owner); if (isInTableSource(x) && !visitor.getProvider().checkDenySchema(owner)) { @@ -2015,7 +2014,7 @@ public class WallVisitorUtils { } if (expr instanceof SQLName) { - String tableName = ((SQLName) expr).getSimleName(); + String tableName = ((SQLName) expr).getSimpleName(); WallContext context = WallContext.current(); if (context != null) { @@ -2131,7 +2130,7 @@ public class WallVisitorUtils { WallContext context = WallContext.current(); if (context != null) { - context.incrementUnionWarnnings(); + context.incrementUnionWarnings(); } if (((x.getOperator() == SQLUnionOperator.UNION || x.getOperator() == SQLUnionOperator.UNION_ALL || x.getOperator() == SQLUnionOperator.DISTINCT) && visitor.getConfig().isSelectUnionCheck()) diff --git a/src/main/java/com/alibaba/druid/wall/violation/ErrorCode.java b/src/main/java/com/alibaba/druid/wall/violation/ErrorCode.java index c603a4aabc..08880a5359 100644 --- a/src/main/java/com/alibaba/druid/wall/violation/ErrorCode.java +++ b/src/main/java/com/alibaba/druid/wall/violation/ErrorCode.java @@ -57,7 +57,7 @@ public interface ErrorCode { public final static int TABLE_DENY = 2004; public final static int OBJECT_DENY = 2005; - public final static int ALWAY_TRUE = 2100; + public final static int ALWAYS_TRUE = 2100; public final static int CONST_ARITHMETIC = 2101; public final static int XOR = 2102; public final static int BITWISE = 2103; @@ -70,7 +70,7 @@ public interface ErrorCode { public final static int EVIL_HINTS = 2110; public final static int EVIL_NAME = 2111; public final static int EVIL_CONCAT = 2112; - public final static int ALWAY_FALSE = 2113; + public final static int ALWAYS_FALSE = 2113; public final static int NOT_PARAMETERIZED = 2200; public final static int MULTI_TENANT = 2201; diff --git a/src/main/resources/support/http/resources/connectionInfo.html b/src/main/resources/support/http/resources/connectionInfo.html index c7e0443429..c3026db979 100644 --- a/src/main/resources/support/http/resources/connectionInfo.html +++ b/src/main/resources/support/http/resources/connectionInfo.html @@ -32,7 +32,7 @@ - + @@ -113,7 +113,7 @@ var stmt = pscache[i]; result += ''; result += '"; - result += '"; + result += '"; result += '"; result += '"; result += ''; diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseAndTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseAndTest.java index d4acbf29f8..f6b7af5c4c 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseAndTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseAndTest.java @@ -16,7 +16,7 @@ public class BitwiseAndTest extends TestCase { public void test_true() throws Exception { WallConfig config = new WallConfig(); - config.setConditionOpBitwseAllow(false); + config.setConditionOpBitwiseAllow(false); Assert.assertFalse(WallUtils.isValidateMySql(// "SELECT * from t where id = 1 & 2", config)); // } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseInvertTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseInvertTest.java index c00e8c5e84..93af19fa07 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseInvertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseInvertTest.java @@ -16,7 +16,7 @@ public class BitwiseInvertTest extends TestCase { public void test_false() throws Exception { WallConfig config = new WallConfig(); - config.setConditionOpBitwseAllow(false); + config.setConditionOpBitwiseAllow(false); Assert.assertFalse(WallUtils.isValidateMySql(// "SELECT * from t where id = ~2", config)); // } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseOrTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseOrTest.java index 32769b22ae..b3866d5c92 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseOrTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseOrTest.java @@ -16,7 +16,7 @@ public class BitwiseOrTest extends TestCase { public void test_false() throws Exception { WallConfig config = new WallConfig(); - config.setConditionOpBitwseAllow(false); + config.setConditionOpBitwiseAllow(false); Assert.assertFalse(WallUtils.isValidateMySql(// "SELECT * from t where id = 1 | 2", config)); // } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseXorTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseXorTest.java index f2ffa20853..0773d9c858 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseXorTest.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/BitwiseXorTest.java @@ -16,7 +16,7 @@ public class BitwiseXorTest extends TestCase { public void test_false() throws Exception { WallConfig config = new WallConfig(); - config.setConditionOpBitwseAllow(false); + config.setConditionOpBitwiseAllow(false); Assert.assertFalse(WallUtils.isValidateMySql(// "SELECT * from t where id = 1 ^ 2", config)); // } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest43.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest43.java index aeac2c5801..4e51c0748b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest43.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest43.java @@ -43,7 +43,7 @@ public class MySqlWallTest43 extends TestCase { public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); - provider.getConfig().setConditionAndAlwayTrueAllow(true); + provider.getConfig().setConditionAndAlwaysTrueAllow(true); Assert.assertTrue(provider.checkValid(// "SELECT COUNT(1) AS count FROM `team` " + // @@ -64,7 +64,7 @@ public class MySqlWallTest43 extends TestCase { public void test_true2() throws Exception { WallProvider provider = new MySqlWallProvider(); - provider.getConfig().setConditionAndAlwayFalseAllow(true); + provider.getConfig().setConditionAndAlwaysFalseAllow(true); Assert.assertTrue(provider.checkValid(// "SELECT COUNT(1) AS count FROM `team` " + // diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest89.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest89.java index e0ce6035b6..40b69a0e6b 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest89.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest89.java @@ -34,7 +34,7 @@ public class MySqlWallTest89 extends TestCase { public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); - provider.getConfig().setSelectHavingAlwayTrueCheck(true); + provider.getConfig().setSelectHavingAlwaysTrueCheck(true); Assert.assertTrue(provider.checkValid(// "select login('', '', 'guest', '47ea3937793101011caaa5dd88d3bcae926526624796b8a26a9615e8d3bea6b4', 'iPad3,4', 'unknown'), '', (select max(num) from accounts) + @@auto_increment_increment")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest90.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest90.java index 81c802fccb..5a97422a26 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest90.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest90.java @@ -34,7 +34,7 @@ public class MySqlWallTest90 extends TestCase { public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); - provider.getConfig().setSelectHavingAlwayTrueCheck(true); + provider.getConfig().setSelectHavingAlwaysTrueCheck(true); Assert.assertTrue(provider.checkValid(// "select * from (select t10006_men_xing_jia_ge_fen_lei.bian_hao as \"bian_hao\", " + // diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest91.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest91.java index 3b56f8818a..86621688e8 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest91.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest91.java @@ -36,7 +36,7 @@ public class MySqlWallTest91 extends TestCase { provider.getConfig().setStrictSyntaxCheck(false); provider.getConfig().setMultiStatementAllow(true); - provider.getConfig().setConditionAndAlwayTrueAllow(true); + provider.getConfig().setConditionAndAlwaysTrueAllow(true); provider.getConfig().setNoneBaseStatementAllow(true); provider.getConfig().setLimitZeroAllow(true); provider.getConfig().setConditionDoubleConstAllow(true); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest_concat.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest_concat.java index 350186435e..8894367711 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest_concat.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/MySqlWallTest_concat.java @@ -27,7 +27,7 @@ public class MySqlWallTest_concat extends TestCase { public void test_true() throws Exception { WallProvider provider = new MySqlWallProvider(); - provider.getConfig().setSelectHavingAlwayTrueCheck(true); + provider.getConfig().setSelectHavingAlwaysTrueCheck(true); Assert.assertTrue(provider.checkValid(// "select * from tb_product_word where name='' or CONCAT(name,style)='' or CONCAT(shop,style)='' or CONCAT(ename,style)=''")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_0.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_0.java index 45e59d220a..c0d3a06d3a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_0.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_0.java @@ -36,7 +36,7 @@ public class SQLServerWallTest_0 extends TestCase { provider.getConfig().setStrictSyntaxCheck(false); provider.getConfig().setMultiStatementAllow(true); - provider.getConfig().setConditionAndAlwayTrueAllow(true); + provider.getConfig().setConditionAndAlwaysTrueAllow(true); provider.getConfig().setNoneBaseStatementAllow(true); provider.getConfig().setLimitZeroAllow(true); provider.getConfig().setConditionDoubleConstAllow(true); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_3.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_3.java index 5a9274f274..be50d3c419 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_3.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_3.java @@ -34,7 +34,7 @@ public class SQLServerWallTest_3 extends TestCase { public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); - provider.getConfig().setSelectHavingAlwayTrueCheck(true); + provider.getConfig().setSelectHavingAlwaysTrueCheck(true); Assert.assertFalse(provider.checkValid(// "select * from t where LEN(HOST_NAME()) > 0")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_4.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_4.java index d8a31b7f98..0b0d1c5e0a 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_4.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_4.java @@ -34,7 +34,7 @@ public class SQLServerWallTest_4 extends TestCase { public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); - provider.getConfig().setSelectHavingAlwayTrueCheck(true); + provider.getConfig().setSelectHavingAlwaysTrueCheck(true); Assert.assertTrue(provider.checkValid(// "insert into t (fid, name) values (1, HOST_NAME())")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_5.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_5.java index 55c8a2af05..1fcd114e97 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_5.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_5.java @@ -34,7 +34,7 @@ public class SQLServerWallTest_5 extends TestCase { public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); - provider.getConfig().setSelectHavingAlwayTrueCheck(true); + provider.getConfig().setSelectHavingAlwaysTrueCheck(true); Assert.assertFalse(provider.checkValid(// "delete t where LEN(HOST_NAME()) > 0")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_6.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_6.java index 75968fbdd9..6396c40f91 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_6.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_6.java @@ -34,7 +34,7 @@ public class SQLServerWallTest_6 extends TestCase { public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); - provider.getConfig().setSelectHavingAlwayTrueCheck(true); + provider.getConfig().setSelectHavingAlwaysTrueCheck(true); Assert.assertFalse(provider.checkValid(// "update t set fid = 1 where LEN(HOST_NAME()) > 0")); diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_7.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_7.java index 865e489d08..ca4ebab2ff 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_7.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/SQLServerWallTest_7.java @@ -34,7 +34,7 @@ public class SQLServerWallTest_7 extends TestCase { public void test_true() throws Exception { WallProvider provider = new SQLServerWallProvider(); - provider.getConfig().setSelectHavingAlwayTrueCheck(true); + provider.getConfig().setSelectHavingAlwaysTrueCheck(true); Assert.assertTrue(provider.checkValid(// "select * from (select top 3000 jol.id as primaryKeyIds, jo.orderNo as 委托单号, bm.custname as 委托方名称, manuCustInfo.custname as 出证方, jo.chkerDate as 委托日期, bcc.connectName as 联系人, bcc.mobile as 电话,jol.barcode as 样品条码, jol.name as 样品名称, jol.qtysub as 套件数量,jol.OnlyCode as 唯一识别码,jol.manufacture as 制造厂商,jol.sprc as 规格型号, jol.outno as 出厂编号, djod.name as 任务状态, djoc.name 委托类别, dct.name as 证书类型,bdp.organ_name as 分配室组, jol.task_id as 任务ID, be.user_name as 检定人员, verifyUser.user_name as 核验员, checkUser.user_name as 批准员, jol.ddate 交款日期,cjcs.name as 缴款状态, jc.moneys as 应收费, jc.moneystotal as 实收费, be.organ_id from jl_OrderList jol left outer join jl_CheckList jc on jol.checkList_id = jc.id left outer join jl_Order jo on jol.orderid = jo.id left outer join ba_dptinfo bdp on jol.dptid = bdp.id left outer join jl_Task jt on jol.task_id = jt.id left outer join ba_manucustinfo bm on jo.entrustCustId = bm.id left outer join ba_manucustinfo manuCustInfo on jo.custid = manuCustInfo.id left outer join ba_custconnect bcc on jo.linkPerson = bcc.id left outer join ba_employeeinfo be on jt.jdUserId = be.id left outer join ba_employeeinfo verifyUser on jt.verifyUser = verifyUser.id left outer join ba_employeeinfo checkUser on jt.checkUser = checkUser.id left outer join dict_jl_order_doType djod on jol.dotypeid = djod.id left outer join dict_jl_order_class djoc on jo.orderclassid = djoc.id left outer join dict_certificate_type dct on jt.certificatetype = dct.id left outer join dict_jl_chargestatus cjcs on jol.chargestatus = cjcs.id where jol.id >= (select min(primaryKeyId) from (select top 3000 jol.id as primaryKeyId from jl_OrderList jol left outer join jl_CheckList jc on jol.checkList_id = jc.id left outer join jl_Order jo on jol.orderid = jo.id left outer join ba_dptinfo bdp on jol.dptid = bdp.id left outer join jl_Task jt on jol.task_id = jt.id left outer join ba_manucustinfo bm on jo.entrustCustId = bm.id left outer join ba_manucustinfo manuCustInfo on jo.custid = manuCustInfo.id left outer join ba_custconnect bcc on jo.linkPerson = bcc.id left outer join ba_employeeinfo be on jt.jdUserId = be.id left outer join ba_employeeinfo verifyUser on jt.verifyUser = verifyUser.id left outer join ba_employeeinfo checkUser on jt.checkUser = checkUser.id left outer join dict_jl_order_doType djod on jol.dotypeid = djod.id left outer join dict_jl_order_class djoc on jo.orderclassid = djoc.id left outer join dict_certificate_type dct on jt.certificatetype = dct.id left outer join dict_jl_chargestatus cjcs on jol.chargestatus = cjcs.id where jo.chkerDate >= ? and jo.chkerDate <= ? and jol.ddate >= ? order by jol.id desc, jo.id DESC) as T) and jo.chkerDate >= ? and jo.chkerDate <= ? and jol.ddate >= ? order by jol.id asc, jo.id DESC) as T1 order by T1.primaryKeyIds desc")); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case0.java b/src/test/java/com/alibaba/druid/bvt/pool/Case0.java index 5428606433..9f21db83f2 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case0.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case0.java @@ -30,7 +30,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class Case0 extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case1.java b/src/test/java/com/alibaba/druid/bvt/pool/Case1.java index 9095cc5367..25a9471cbe 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case1.java @@ -30,7 +30,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class Case1 extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java index ccde07dd20..bc0566b0d7 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case2.java @@ -34,7 +34,7 @@ import com.alibaba.druid.util.JMXUtils; public class Case2 extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/Case3.java b/src/test/java/com/alibaba/druid/bvt/pool/Case3.java index 43546b4cb0..42666ce0a9 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/Case3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/Case3.java @@ -56,7 +56,7 @@ public class Case3 extends TestCase { // dataSource.close(); // } protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java index bb4d5dc795..35ad954935 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/DruidDataSourceFilterTest.java @@ -28,7 +28,7 @@ import com.alibaba.druid.stat.JdbcStatManager; public class DruidDataSourceFilterTest extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java index d59a0d556a..03329e61e0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ManagedDataSourceTest.java @@ -31,7 +31,7 @@ public class ManagedDataSourceTest extends TestCase { private DruidDataSource dataSource; public void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java b/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java index f7ac1d0448..840bba2304 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/ParamTest.java @@ -28,7 +28,7 @@ import com.alibaba.druid.stat.JdbcStatManager; public class ParamTest extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java index fb54c5530f..132fba5532 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/PasswordCallbackTest.java @@ -28,7 +28,7 @@ import com.alibaba.druid.util.DruidPasswordCallback; public class PasswordCallbackTest extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java index 647dd6d1dd..982890c36f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/SpringIbatisFilterTest.java @@ -42,7 +42,7 @@ import com.alibaba.druid.support.json.JSONUtils; public class SpringIbatisFilterTest extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java b/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java index 93e980d95d..cb6a485579 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/SpringMybatisFilterTest.java @@ -34,7 +34,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class SpringMybatisFilterTest extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java b/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java index 496fcbb0a6..f93f7e3959 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestAbondon.java @@ -27,7 +27,7 @@ public class TestAbondon extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); dataSource = new DruidDataSource(); dataSource.setRemoveAbandoned(true); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java b/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java index fb74c3f142..79548a5c03 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestActiveTrace.java @@ -29,7 +29,7 @@ public class TestActiveTrace extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); dataSource = new DruidDataSource(); dataSource.setRemoveAbandoned(true); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java index 373a489968..83f496b18c 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_0.java @@ -28,7 +28,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestClose_0 extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java index 42ad5144a3..f1a710e8f2 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_1.java @@ -29,7 +29,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestClose_1 extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java index 4110d8ebc6..fb4536b55b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestClose_2.java @@ -29,7 +29,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestClose_2 extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestConcurrent.java b/src/test/java/com/alibaba/druid/bvt/pool/TestConcurrent.java index ef80abcf94..73672fc10b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestConcurrent.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestConcurrent.java @@ -33,7 +33,7 @@ public class TestConcurrent extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); driver.setLogExecuteQueryEnable(false); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java b/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java index bffe0bc92c..d6438c1168 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDefault.java @@ -28,7 +28,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestDefault extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java b/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java index 418d4cfedd..994607b4d6 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDisable.java @@ -32,7 +32,7 @@ public class TestDisable extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java b/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java index 52eb1eaf66..8ac663db06 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestDruidDataSource.java @@ -27,7 +27,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestDruidDataSource extends TestCase { protected void tearDown() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java b/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java index 04375e9ec1..e1d393de3f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestGraceShutdown.java @@ -33,7 +33,7 @@ public class TestGraceShutdown extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java index 62e6413a04..19f63dd2c5 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java @@ -35,7 +35,7 @@ public class TestIdle extends TestCase { protected void tearDown() throws Exception { JdbcUtils.close(dataSource); - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void setUp() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java index 26190ecb13..b6a45670eb 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle2.java @@ -27,7 +27,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle2 extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java index 036acb174f..8515c6a93d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3.java @@ -30,7 +30,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle3 extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java index 8190a940da..8f253eb5e0 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent.java @@ -30,7 +30,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestIdle3_Concurrent extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_MaxActive.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_MaxActive.java index 0cc2bc90c6..a49918731f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_MaxActive.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_MaxActive.java @@ -32,7 +32,7 @@ public class TestIdle3_Concurrent_MaxActive extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java index 36cf8e85ed..40796f9e15 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestIdle3_Concurrent_Starvation.java @@ -35,7 +35,7 @@ public class TestIdle3_Concurrent_Starvation extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestOnBorrowFileAndNameTest.java b/src/test/java/com/alibaba/druid/bvt/pool/TestOnBorrowFileAndNameTest.java index 60caa98cc1..57412ef39b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestOnBorrowFileAndNameTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestOnBorrowFileAndNameTest.java @@ -18,7 +18,7 @@ public class TestOnBorrowFileAndNameTest extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java index 7134d1820a..3c1f993723 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement.java @@ -32,7 +32,7 @@ public class TestPoolPreparedStatement extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java index 39d79f3e13..a5fdd0447d 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestPoolPreparedStatement2.java @@ -32,7 +32,7 @@ public class TestPoolPreparedStatement2 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java b/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java index 30c67b37a2..4c56783121 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestSharePreparedStatements.java @@ -29,7 +29,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestSharePreparedStatements extends TestCase { protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); } protected void tearDown() throws Exception { diff --git a/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java b/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java index b9e956abd9..a881f1fdfd 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/TestStat.java @@ -31,7 +31,7 @@ public class TestStat extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java index 70ecedb9bc..80f7abd7f2 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest.java @@ -33,7 +33,7 @@ public class ConnectionTest extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java index 23da8506e5..064c38c58b 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest2.java @@ -33,7 +33,7 @@ public class ConnectionTest2 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java index daacaf0390..09d92246be 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest3.java @@ -36,7 +36,7 @@ public class ConnectionTest3 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java index dc74b89f38..6df5451172 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest4.java @@ -41,7 +41,7 @@ public class ConnectionTest4 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java index d8a2bc8a7e..2689d1c44f 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/ConnectionTest5.java @@ -37,7 +37,7 @@ public class ConnectionTest5 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java index 36e51aa321..210d157c00 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/DataSourceTest3.java @@ -40,7 +40,7 @@ public class DataSourceTest3 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java index 8fcd0fb2ca..17a19badf8 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/PoolableStatementTest2.java @@ -39,7 +39,7 @@ public class PoolableStatementTest2 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java index 2f7eccb4b2..e03657014e 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestCommit.java @@ -32,7 +32,7 @@ public class TestCommit extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java index 39d265724f..25d073c96a 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic.java @@ -36,7 +36,7 @@ public class TestDataSourceBasic extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); driver = new MockDriver(); diff --git a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java index fbaf5d1f8c..73ede7e2b1 100644 --- a/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java +++ b/src/test/java/com/alibaba/druid/bvt/pool/basic/TestDataSourceBasic2.java @@ -29,7 +29,7 @@ import com.alibaba.druid.stat.DruidDataSourceStatManager; public class TestDataSourceBasic2 extends TestCase { public void test_0() throws Exception { - DruidDataSourceStatManager.cear(); + DruidDataSourceStatManager.clear(); DruidDataSource dataSource = new DruidDataSource(); dataSource.setUrl("jdbc:mock:xxx"); diff --git a/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java b/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java index 921952eb68..ed75c56852 100644 --- a/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java +++ b/src/test/java/com/alibaba/druid/proxy/demo/Demo1.java @@ -28,18 +28,18 @@ public class Demo1 extends TestCase { public void test_0() throws Exception { JdbcStatManager.getInstance().reset(); // 重置计数器 - Assert.assertEquals(0, JdbcStatManager.getInstance().getConnectionstat().getConnectCount()); - Assert.assertEquals(0, JdbcStatManager.getInstance().getConnectionstat().getCloseCount()); + Assert.assertEquals(0, JdbcStatManager.getInstance().getConnectionStat().getConnectCount()); + Assert.assertEquals(0, JdbcStatManager.getInstance().getConnectionStat().getCloseCount()); String url = "jdbc:wrap-jdbc:filters=default:name=preCallTest:jdbc:derby:memory:Demo1;create=true"; Connection conn = DriverManager.getConnection(url); - Assert.assertEquals(1, JdbcStatManager.getInstance().getConnectionstat().getConnectCount()); - Assert.assertEquals(0, JdbcStatManager.getInstance().getConnectionstat().getCloseCount()); + Assert.assertEquals(1, JdbcStatManager.getInstance().getConnectionStat().getConnectCount()); + Assert.assertEquals(0, JdbcStatManager.getInstance().getConnectionStat().getCloseCount()); conn.close(); - Assert.assertEquals(1, JdbcStatManager.getInstance().getConnectionstat().getConnectCount()); - Assert.assertEquals(1, JdbcStatManager.getInstance().getConnectionstat().getCloseCount()); + Assert.assertEquals(1, JdbcStatManager.getInstance().getConnectionStat().getConnectCount()); + Assert.assertEquals(1, JdbcStatManager.getInstance().getConnectionStat().getCloseCount()); } } diff --git a/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java b/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java index 881354509f..194cb55933 100644 --- a/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java +++ b/src/test/java/com/alibaba/druid/test/wall/MySqlResourceWallTest.java @@ -47,7 +47,7 @@ public class MySqlResourceWallTest extends TestCase { provider.getConfig().setUseAllow(true); provider.getConfig().setStrictSyntaxCheck(false); provider.getConfig().setMultiStatementAllow(true); - provider.getConfig().setConditionAndAlwayTrueAllow(true); + provider.getConfig().setConditionAndAlwaysTrueAllow(true); provider.getConfig().setNoneBaseStatementAllow(true); provider.getConfig().setSelectUnionCheck(false); provider.getConfig().setSchemaCheck(true);
    sqldefaultRowPretchdefaultRowPrefetch rowPrefetch hitCount
    ' + stmt.sql + "' + stmt.defaultRowPretch + "' + stmt.defaultRowPrefetch + "' + stmt.rowPrefetch + "' + stmt.hitCount + "