Author: markt
Date: Fri Aug 8 14:10:18 2014
New Revision: 1616764
URL: http://svn.apache.org/r1616764
Log:
Fix Checkstyle & IDE warnings. Mostly import use/order.
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54225.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54227.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54978.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54225.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54225.java?rev=1616764&r1=1616763&r2=1616764&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54225.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54225.java
Fri Aug 8 14:10:18 2014
@@ -16,29 +16,20 @@
*/
package org.apache.tomcat.jdbc.bugs;
-import java.sql.Connection;
-import java.sql.DriverManager;
import java.sql.SQLException;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.Assert;
+import static org.junit.Assert.assertNull;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import org.apache.tomcat.jdbc.pool.ConnectionPool;
import org.apache.tomcat.jdbc.pool.DataSource;
-import org.apache.tomcat.jdbc.pool.PoolExhaustedException;
import org.apache.tomcat.jdbc.pool.PoolProperties;
import org.apache.tomcat.jdbc.test.DefaultProperties;
-import static org.junit.Assert.assertNull;
@RunWith(Parameterized.class)
public class Bug54225 {
@@ -58,7 +49,7 @@ public class Bug54225 {
}
@Test
- public void testPool() throws SQLException, InterruptedException {
+ public void testPool() throws SQLException {
PoolProperties poolProperties = new DefaultProperties();
poolProperties.setMinIdle(0);
poolProperties.setInitialSize(0);
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54227.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54227.java?rev=1616764&r1=1616763&r2=1616764&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54227.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54227.java
Fri Aug 8 14:10:18 2014
@@ -16,18 +16,20 @@
*/
package org.apache.tomcat.jdbc.bugs;
-import org.apache.tomcat.jdbc.pool.DataSource;
-import org.apache.tomcat.jdbc.pool.PoolProperties;
-import org.apache.tomcat.jdbc.test.DefaultProperties;
-import org.junit.Test;
-
-import javax.sql.PooledConnection;
import java.sql.Connection;
import java.sql.SQLException;
+import javax.sql.PooledConnection;
+
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
+import org.junit.Test;
+
+import org.apache.tomcat.jdbc.pool.DataSource;
+import org.apache.tomcat.jdbc.pool.PoolProperties;
+import org.apache.tomcat.jdbc.test.DefaultProperties;
+
public class Bug54227 {
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54978.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54978.java?rev=1616764&r1=1616763&r2=1616764&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54978.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/bugs/Bug54978.java
Fri Aug 8 14:10:18 2014
@@ -16,19 +16,20 @@
*/
package org.apache.tomcat.jdbc.bugs;
-import org.apache.tomcat.jdbc.pool.DataSource;
-import org.apache.tomcat.jdbc.pool.PoolProperties;
-import org.apache.tomcat.jdbc.test.DefaultProperties;
-import org.junit.Test;
-
import java.sql.SQLException;
import static org.junit.Assert.fail;
+import org.junit.Test;
+
+import org.apache.tomcat.jdbc.pool.DataSource;
+import org.apache.tomcat.jdbc.pool.PoolProperties;
+import org.apache.tomcat.jdbc.test.DefaultProperties;
+
public class Bug54978 {
@Test
- public void testIllegalValidationQuery() throws SQLException,
InterruptedException {
+ public void testIllegalValidationQuery() {
PoolProperties poolProperties = new DefaultProperties();
poolProperties.setMinIdle(0);
poolProperties.setInitialSize(1);
@@ -48,7 +49,7 @@ public class Bug54978 {
}
@Test
- public void testIllegalValidationQueryWithLegalInit() throws SQLException,
InterruptedException {
+ public void testIllegalValidationQueryWithLegalInit() throws SQLException {
PoolProperties poolProperties = new DefaultProperties();
poolProperties.setMinIdle(0);
poolProperties.setInitialSize(1);
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java?rev=1616764&r1=1616763&r2=1616764&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/pool/ShouldForceReconnectTest.java
Fri Aug 8 14:10:18 2014
@@ -16,23 +16,23 @@
*/
package org.apache.tomcat.jdbc.pool;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
public class ShouldForceReconnectTest {
private ConnectionPool pool;
private PoolProperties properties;
-
+
private static final String DEFAULT_USER = "username_def";
private static final String DEFAULT_PASSWD = "password_def";
private static final String ALT_USER = "username_alt";
private static final String ALT_PASSWD = "password_alt";
-
+
@Before
public void setUp() throws Exception {
properties = new PoolProperties();
@@ -47,10 +47,10 @@ public class ShouldForceReconnectTest {
@After
public void tearDown() throws Exception {
-
-
-
-
+
+
+
+
}
@Test
@@ -60,47 +60,47 @@ public class ShouldForceReconnectTest {
//connection previously connect with default
configureDefault(con);
assertFalse(con.shouldForceReconnect(null, null));
-
+
configureDefault(con);
assertFalse(con.shouldForceReconnect(DEFAULT_USER, DEFAULT_PASSWD));
-
+
configureDefault(con);
assertFalse(con.shouldForceReconnect(null,DEFAULT_PASSWD));
-
+
configureDefault(con);
assertFalse(con.shouldForceReconnect(DEFAULT_USER, null));
-
+
configureDefault(con);
assertTrue(con.shouldForceReconnect(ALT_USER,ALT_PASSWD));
-
+
configureDefault(con);
assertTrue(con.shouldForceReconnect(null,ALT_PASSWD));
-
+
configureDefault(con);
assertTrue(con.shouldForceReconnect(ALT_USER,null));
//connection previously connect with alternate
configureAlt(con);
assertFalse(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
-
+
configureAlt(con);
assertTrue(con.shouldForceReconnect(null, null));
-
+
configureAlt(con);
assertTrue(con.shouldForceReconnect(DEFAULT_USER, DEFAULT_PASSWD));
-
+
configureAlt(con);
assertTrue(con.shouldForceReconnect(null, DEFAULT_PASSWD));
-
+
configureAlt(con);
assertTrue(con.shouldForceReconnect(DEFAULT_USER, null));
-
+
configureAlt(con);
assertTrue(con.shouldForceReconnect(null,ALT_PASSWD));
-
+
configureAlt(con);
assertTrue(con.shouldForceReconnect(ALT_USER,null));
-
+
//test changes in username password
configureDefault(con);
assertFalse(con.shouldForceReconnect(null, null));
@@ -120,7 +120,7 @@ public class ShouldForceReconnectTest {
assertTrue(con.shouldForceReconnect(DEFAULT_USER, DEFAULT_PASSWD));
assertFalse(con.shouldForceReconnect(null, null));
assertTrue(con.shouldForceReconnect(ALT_USER, ALT_PASSWD));
-
+
configureAlt(con);
assertTrue(con.shouldForceReconnect(DEFAULT_USER, DEFAULT_PASSWD));
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java?rev=1616764&r1=1616763&r2=1616764&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestJdbcInterceptorConfigParsing.java
Fri Aug 8 14:10:18 2014
@@ -16,18 +16,19 @@
*/
package org.apache.tomcat.jdbc.test;
-import org.apache.tomcat.jdbc.pool.PoolProperties;
-import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorDefinition;
-import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorProperty;
-import org.apache.tomcat.jdbc.pool.TrapException;
-import org.junit.Test;
-
import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
+import org.junit.Test;
+
+import org.apache.tomcat.jdbc.pool.PoolProperties;
+import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorDefinition;
+import org.apache.tomcat.jdbc.pool.PoolProperties.InterceptorProperty;
+import org.apache.tomcat.jdbc.pool.TrapException;
+
/**
* Test of JdbcInterceptor configuration parsing in the
* {@link org.apache.tomcat.jdbc.pool.PoolProperties PoolProperties} class.
@@ -108,7 +109,7 @@ public class TestJdbcInterceptorConfigPa
* Some of these should probably be handled more cleanly by the parser,
but a few known
* exception scenarios are presented here just to document current
behavior. In many cases
* failure in parsing will just be propagated to a definition that will
fail later
- * when instantiated. Should we be failing faster (and with more detail)?
+ * when instantiated. Should we be failing faster (and with more detail)?
*
* @throws Exception
*/
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java?rev=1616764&r1=1616763&r2=1616764&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java
Fri Aug 8 14:10:18 2014
@@ -19,7 +19,6 @@ package org.apache.tomcat.jdbc.test;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.DriverPropertyInfo;
-import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLTimeoutException;
@@ -27,6 +26,8 @@ import java.sql.Statement;
import java.util.Properties;
import java.util.logging.Logger;
+import static org.junit.Assert.fail;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -34,8 +35,6 @@ import org.junit.Test;
import org.apache.tomcat.jdbc.pool.interceptor.QueryTimeoutInterceptor;
-import static org.junit.Assert.fail;
-
public class TestValidationQueryTimeout extends DefaultTestCase {
private static int TIMEOUT = 10;
@@ -164,9 +163,9 @@ public class TestValidationQueryTimeout
start = System.currentTimeMillis();
stmt.execute(longQuery);
} catch (SQLTimeoutException ex) {
-
+
} catch (SQLException x) {
- fail("We should have got a timeout exception.");
+ fail("We should have got a timeout exception.");
} finally {
end = System.currentTimeMillis();
@@ -187,7 +186,7 @@ public class TestValidationQueryTimeout
this.datasource.setValidationQuery(longQuery);
this.datasource.setValidationQueryTimeout(1);
// assert that even though the validation query we don't get a
connection
- Connection con = this.datasource.getConnection();
+ this.datasource.getConnection();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
