Author: kkolinko
Date: Wed Jan 18 12:52:08 2012
New Revision: 1232867
URL: http://svn.apache.org/viewvc?rev=1232867&view=rev
Log:
Fix order of field modifiers, as suggested by Checkstyle
s/final static/static final/
Now Checkstyle checks for jdbc-pool pass successfully.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java?rev=1232867&r1=1232866&r2=1232867&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
Wed Jan 18 12:52:08 2012
@@ -58,50 +58,50 @@ import org.apache.juli.logging.LogFactor
public class DataSourceFactory implements ObjectFactory {
private static final Log log = LogFactory.getLog(DataSourceFactory.class);
- protected final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";
- protected final static String PROP_DEFAULTREADONLY = "defaultReadOnly";
- protected final static String PROP_DEFAULTTRANSACTIONISOLATION =
"defaultTransactionIsolation";
- protected final static String PROP_DEFAULTCATALOG = "defaultCatalog";
-
- protected final static String PROP_DRIVERCLASSNAME = "driverClassName";
- protected final static String PROP_PASSWORD = "password";
- protected final static String PROP_URL = "url";
- protected final static String PROP_USERNAME = "username";
-
- protected final static String PROP_MAXACTIVE = "maxActive";
- protected final static String PROP_MAXIDLE = "maxIdle";
- protected final static String PROP_MINIDLE = "minIdle";
- protected final static String PROP_INITIALSIZE = "initialSize";
- protected final static String PROP_MAXWAIT = "maxWait";
- protected final static String PROP_MAXAGE = "maxAge";
-
- protected final static String PROP_TESTONBORROW = "testOnBorrow";
- protected final static String PROP_TESTONRETURN = "testOnReturn";
- protected final static String PROP_TESTWHILEIDLE = "testWhileIdle";
- protected final static String PROP_TESTONCONNECT = "testOnConnect";
- protected final static String PROP_VALIDATIONQUERY = "validationQuery";
- protected final static String PROP_VALIDATOR_CLASS_NAME =
"validatorClassName";
-
- protected final static String PROP_TIMEBETWEENEVICTIONRUNSMILLIS =
"timeBetweenEvictionRunsMillis";
- protected final static String PROP_NUMTESTSPEREVICTIONRUN =
"numTestsPerEvictionRun";
- protected final static String PROP_MINEVICTABLEIDLETIMEMILLIS =
"minEvictableIdleTimeMillis";
-
- protected final static String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED =
"accessToUnderlyingConnectionAllowed";
-
- protected final static String PROP_REMOVEABANDONED = "removeAbandoned";
- protected final static String PROP_REMOVEABANDONEDTIMEOUT =
"removeAbandonedTimeout";
- protected final static String PROP_LOGABANDONED = "logAbandoned";
- protected final static String PROP_ABANDONWHENPERCENTAGEFULL =
"abandonWhenPercentageFull";
-
- protected final static String PROP_POOLPREPAREDSTATEMENTS =
"poolPreparedStatements";
- protected final static String PROP_MAXOPENPREPAREDSTATEMENTS =
"maxOpenPreparedStatements";
- protected final static String PROP_CONNECTIONPROPERTIES =
"connectionProperties";
-
- protected final static String PROP_INITSQL = "initSQL";
- protected final static String PROP_INTERCEPTORS = "jdbcInterceptors";
- protected final static String PROP_VALIDATIONINTERVAL =
"validationInterval";
- protected final static String PROP_JMX_ENABLED = "jmxEnabled";
- protected final static String PROP_FAIR_QUEUE = "fairQueue";
+ protected static final String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";
+ protected static final String PROP_DEFAULTREADONLY = "defaultReadOnly";
+ protected static final String PROP_DEFAULTTRANSACTIONISOLATION =
"defaultTransactionIsolation";
+ protected static final String PROP_DEFAULTCATALOG = "defaultCatalog";
+
+ protected static final String PROP_DRIVERCLASSNAME = "driverClassName";
+ protected static final String PROP_PASSWORD = "password";
+ protected static final String PROP_URL = "url";
+ protected static final String PROP_USERNAME = "username";
+
+ protected static final String PROP_MAXACTIVE = "maxActive";
+ protected static final String PROP_MAXIDLE = "maxIdle";
+ protected static final String PROP_MINIDLE = "minIdle";
+ protected static final String PROP_INITIALSIZE = "initialSize";
+ protected static final String PROP_MAXWAIT = "maxWait";
+ protected static final String PROP_MAXAGE = "maxAge";
+
+ protected static final String PROP_TESTONBORROW = "testOnBorrow";
+ protected static final String PROP_TESTONRETURN = "testOnReturn";
+ protected static final String PROP_TESTWHILEIDLE = "testWhileIdle";
+ protected static final String PROP_TESTONCONNECT = "testOnConnect";
+ protected static final String PROP_VALIDATIONQUERY = "validationQuery";
+ protected static final String PROP_VALIDATOR_CLASS_NAME =
"validatorClassName";
+
+ protected static final String PROP_NUMTESTSPEREVICTIONRUN =
"numTestsPerEvictionRun";
+ protected static final String PROP_TIMEBETWEENEVICTIONRUNSMILLIS =
"timeBetweenEvictionRunsMillis";
+ protected static final String PROP_MINEVICTABLEIDLETIMEMILLIS =
"minEvictableIdleTimeMillis";
+
+ protected static final String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED =
"accessToUnderlyingConnectionAllowed";
+
+ protected static final String PROP_REMOVEABANDONED = "removeAbandoned";
+ protected static final String PROP_REMOVEABANDONEDTIMEOUT =
"removeAbandonedTimeout";
+ protected static final String PROP_LOGABANDONED = "logAbandoned";
+ protected static final String PROP_ABANDONWHENPERCENTAGEFULL =
"abandonWhenPercentageFull";
+
+ protected static final String PROP_POOLPREPAREDSTATEMENTS =
"poolPreparedStatements";
+ protected static final String PROP_MAXOPENPREPAREDSTATEMENTS =
"maxOpenPreparedStatements";
+ protected static final String PROP_CONNECTIONPROPERTIES =
"connectionProperties";
+
+ protected static final String PROP_INITSQL = "initSQL";
+ protected static final String PROP_INTERCEPTORS = "jdbcInterceptors";
+ protected static final String PROP_VALIDATIONINTERVAL =
"validationInterval";
+ protected static final String PROP_JMX_ENABLED = "jmxEnabled";
+ protected static final String PROP_FAIR_QUEUE = "fairQueue";
protected static final String PROP_USE_EQUALS = "useEquals";
protected static final String PROP_USE_CON_LOCK = "useLock";
@@ -119,7 +119,7 @@ public class DataSourceFactory implement
public static final String OBJECT_NAME = "object_name";
- protected final static String[] ALL_PROPERTIES = {
+ protected static final String[] ALL_PROPERTIES = {
PROP_DEFAULTAUTOCOMMIT,
PROP_DEFAULTREADONLY,
PROP_DEFAULTTRANSACTIONISOLATION,
@@ -533,7 +533,7 @@ public class DataSourceFactory implement
* @return Properties
* @throws Exception
*/
- static protected Properties getProperties(String propText) {
+ protected static Properties getProperties(String propText) {
return PoolProperties.getProperties(propText,null);
}
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java?rev=1232867&r1=1232866&r2=1232867&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
Wed Jan 18 12:52:08 2012
@@ -53,7 +53,7 @@ public class FairBlockingQueue<E> implem
* lock, on Solaris its the other way around.
* Until we have tested other platforms we only check for Linux.
*/
- final static boolean isLinux =
"Linux".equals(System.getProperty("os.name")) &&
+ static final boolean isLinux =
"Linux".equals(System.getProperty("os.name")) &&
(!Boolean.getBoolean(FairBlockingQueue.class.getName()+".ignoreOS"));
/**
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java?rev=1232867&r1=1232866&r2=1232867&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/DefaultTestCase.java
Wed Jan 18 12:52:08 2012
@@ -183,35 +183,35 @@ public class DefaultTestCase extends Tes
org.apache.tomcat.jdbc.test.driver.Driver.reset();
}
- private final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";
- private final static String PROP_DEFAULTREADONLY = "defaultReadOnly";
- private final static String PROP_DEFAULTTRANSACTIONISOLATION =
"defaultTransactionIsolation";
- private final static String PROP_DEFAULTCATALOG = "defaultCatalog";
- private final static String PROP_DRIVERCLASSNAME = "driverClassName";
- private final static String PROP_MAXACTIVE = "maxActive";
- private final static String PROP_MAXIDLE = "maxIdle";
- private final static String PROP_MINIDLE = "minIdle";
- private final static String PROP_INITIALSIZE = "initialSize";
- private final static String PROP_MAXWAIT = "maxWait";
- private final static String PROP_TESTONBORROW = "testOnBorrow";
- private final static String PROP_TESTONRETURN = "testOnReturn";
- private final static String PROP_TIMEBETWEENEVICTIONRUNSMILLIS =
"timeBetweenEvictionRunsMillis";
- private final static String PROP_NUMTESTSPEREVICTIONRUN =
"numTestsPerEvictionRun";
- private final static String PROP_MINEVICTABLEIDLETIMEMILLIS =
"minEvictableIdleTimeMillis";
- private final static String PROP_TESTWHILEIDLE = "testWhileIdle";
- private final static String PROP_PASSWORD = "password";
- private final static String PROP_URL = "url";
- private final static String PROP_USERNAME = "username";
- private final static String PROP_VALIDATIONQUERY = "validationQuery";
- private final static String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED =
"accessToUnderlyingConnectionAllowed";
- private final static String PROP_REMOVEABANDONED = "removeAbandoned";
- private final static String PROP_REMOVEABANDONEDTIMEOUT =
"removeAbandonedTimeout";
- private final static String PROP_LOGABANDONED = "logAbandoned";
- private final static String PROP_POOLPREPAREDSTATEMENTS =
"poolPreparedStatements";
- private final static String PROP_MAXOPENPREPAREDSTATEMENTS =
"maxOpenPreparedStatements";
- private final static String PROP_CONNECTIONPROPERTIES =
"connectionProperties";
+ private static final String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";
+ private static final String PROP_DEFAULTREADONLY = "defaultReadOnly";
+ private static final String PROP_DEFAULTTRANSACTIONISOLATION =
"defaultTransactionIsolation";
+ private static final String PROP_DEFAULTCATALOG = "defaultCatalog";
+ private static final String PROP_DRIVERCLASSNAME = "driverClassName";
+ private static final String PROP_MAXACTIVE = "maxActive";
+ private static final String PROP_MAXIDLE = "maxIdle";
+ private static final String PROP_MINIDLE = "minIdle";
+ private static final String PROP_INITIALSIZE = "initialSize";
+ private static final String PROP_MAXWAIT = "maxWait";
+ private static final String PROP_TESTONBORROW = "testOnBorrow";
+ private static final String PROP_TESTONRETURN = "testOnReturn";
+ private static final String PROP_TIMEBETWEENEVICTIONRUNSMILLIS =
"timeBetweenEvictionRunsMillis";
+ private static final String PROP_NUMTESTSPEREVICTIONRUN =
"numTestsPerEvictionRun";
+ private static final String PROP_MINEVICTABLEIDLETIMEMILLIS =
"minEvictableIdleTimeMillis";
+ private static final String PROP_TESTWHILEIDLE = "testWhileIdle";
+ private static final String PROP_PASSWORD = "password";
+ private static final String PROP_URL = "url";
+ private static final String PROP_USERNAME = "username";
+ private static final String PROP_VALIDATIONQUERY = "validationQuery";
+ private static final String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED =
"accessToUnderlyingConnectionAllowed";
+ private static final String PROP_REMOVEABANDONED = "removeAbandoned";
+ private static final String PROP_REMOVEABANDONEDTIMEOUT =
"removeAbandonedTimeout";
+ private static final String PROP_LOGABANDONED = "logAbandoned";
+ private static final String PROP_POOLPREPAREDSTATEMENTS =
"poolPreparedStatements";
+ private static final String PROP_MAXOPENPREPAREDSTATEMENTS =
"maxOpenPreparedStatements";
+ private static final String PROP_CONNECTIONPROPERTIES =
"connectionProperties";
- private final static String[] ALL_PROPERTIES = {
+ private static final String[] ALL_PROPERTIES = {
PROP_DEFAULTAUTOCOMMIT,
PROP_DEFAULTREADONLY,
PROP_DEFAULTTRANSACTIONISOLATION,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
