http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/BasicRowProcessor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/BasicRowProcessor.java b/src/main/java/org/apache/commons/dbutils/BasicRowProcessor.java index e8a3e9d..06c276e 100644 --- a/src/main/java/org/apache/commons/dbutils/BasicRowProcessor.java +++ b/src/main/java/org/apache/commons/dbutils/BasicRowProcessor.java @@ -47,7 +47,7 @@ public class BasicRowProcessor implements RowProcessor { */ private static final BasicRowProcessor instance = new BasicRowProcessor(); - protected static Map<String, Object> createCaseInsensitiveHashMap(int cols) { + protected static Map<String, Object> createCaseInsensitiveHashMap(final int cols) { return new CaseInsensitiveHashMap(cols); } @@ -82,7 +82,7 @@ public class BasicRowProcessor implements RowProcessor { * bean properties. * @since DbUtils 1.1 */ - public BasicRowProcessor(BeanProcessor convert) { + public BasicRowProcessor(final BeanProcessor convert) { super(); this.convert = convert; } @@ -99,7 +99,7 @@ public class BasicRowProcessor implements RowProcessor { * @return the newly created array */ @Override - public Object[] toArray(ResultSet rs) throws SQLException { + public Object[] toArray(final ResultSet rs) throws SQLException { ResultSetMetaData meta = rs.getMetaData(); int cols = meta.getColumnCount(); Object[] result = new Object[cols]; @@ -123,7 +123,7 @@ public class BasicRowProcessor implements RowProcessor { * @return the newly created bean */ @Override - public <T> T toBean(ResultSet rs, Class<? extends T> type) throws SQLException { + public <T> T toBean(final ResultSet rs, final Class<? extends T> type) throws SQLException { return this.convert.toBean(rs, type); } @@ -140,7 +140,7 @@ public class BasicRowProcessor implements RowProcessor { * they were returned by the <code>ResultSet</code>. */ @Override - public <T> List<T> toBeanList(ResultSet rs, Class<? extends T> type) throws SQLException { + public <T> List<T> toBeanList(final ResultSet rs, final Class<? extends T> type) throws SQLException { return this.convert.toBeanList(rs, type); } @@ -160,7 +160,7 @@ public class BasicRowProcessor implements RowProcessor { * @see org.apache.commons.dbutils.RowProcessor#toMap(java.sql.ResultSet) */ @Override - public Map<String, Object> toMap(ResultSet rs) throws SQLException { + public Map<String, Object> toMap(final ResultSet rs) throws SQLException { ResultSetMetaData rsmd = rs.getMetaData(); int cols = rsmd.getColumnCount(); Map<String, Object> result = createCaseInsensitiveHashMap(cols); @@ -194,7 +194,7 @@ public class BasicRowProcessor implements RowProcessor { */ private static class CaseInsensitiveHashMap extends LinkedHashMap<String, Object> { - private CaseInsensitiveHashMap(int initialCapacity) { + private CaseInsensitiveHashMap(final int initialCapacity) { super(initialCapacity); } @@ -223,7 +223,7 @@ public class BasicRowProcessor implements RowProcessor { /** {@inheritDoc} */ @Override - public boolean containsKey(Object key) { + public boolean containsKey(final Object key) { Object realKey = lowerCaseMap.get(key.toString().toLowerCase(Locale.ENGLISH)); return super.containsKey(realKey); // Possible optimisation here: @@ -234,14 +234,14 @@ public class BasicRowProcessor implements RowProcessor { /** {@inheritDoc} */ @Override - public Object get(Object key) { + public Object get(final Object key) { Object realKey = lowerCaseMap.get(key.toString().toLowerCase(Locale.ENGLISH)); return super.get(realKey); } /** {@inheritDoc} */ @Override - public Object put(String key, Object value) { + public Object put(final String key, final Object value) { /* * In order to keep the map and lowerCaseMap synchronized, * we have to remove the old mapping before putting the @@ -257,7 +257,7 @@ public class BasicRowProcessor implements RowProcessor { /** {@inheritDoc} */ @Override - public void putAll(Map<? extends String, ?> m) { + public void putAll(final Map<? extends String, ?> m) { for (Map.Entry<? extends String, ?> entry : m.entrySet()) { String key = entry.getKey(); Object value = entry.getValue(); @@ -267,7 +267,7 @@ public class BasicRowProcessor implements RowProcessor { /** {@inheritDoc} */ @Override - public Object remove(Object key) { + public Object remove(final Object key) { Object realKey = lowerCaseMap.remove(key.toString().toLowerCase(Locale.ENGLISH)); return super.remove(realKey); }
http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/BeanProcessor.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java index df361fe..caee455 100644 --- a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java +++ b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java @@ -108,7 +108,7 @@ public class BeanProcessor { * @param columnToPropertyOverrides ResultSet column to bean property name overrides * @since 1.5 */ - public BeanProcessor(Map<String, String> columnToPropertyOverrides) { + public BeanProcessor(final Map<String, String> columnToPropertyOverrides) { super(); if (columnToPropertyOverrides == null) { throw new IllegalArgumentException("columnToPropertyOverrides map cannot be null"); @@ -149,7 +149,7 @@ public class BeanProcessor { * @throws SQLException if a database access error occurs * @return the newly created bean */ - public <T> T toBean(ResultSet rs, Class<? extends T> type) throws SQLException { + public <T> T toBean(final ResultSet rs, final Class<? extends T> type) throws SQLException { T bean = this.newInstance(type); return this.populateBean(rs, bean); } @@ -187,7 +187,7 @@ public class BeanProcessor { * @throws SQLException if a database access error occurs * @return the newly created List of beans */ - public <T> List<T> toBeanList(ResultSet rs, Class<? extends T> type) throws SQLException { + public <T> List<T> toBeanList(final ResultSet rs, final Class<? extends T> type) throws SQLException { List<T> results = new ArrayList<>(); if (!rs.next()) { @@ -215,8 +215,8 @@ public class BeanProcessor { * @return An initialized object. * @throws SQLException if a database error occurs. */ - private <T> T createBean(ResultSet rs, Class<T> type, - PropertyDescriptor[] props, int[] columnToProperty) + private <T> T createBean(final ResultSet rs, final Class<T> type, + final PropertyDescriptor[] props, final int[] columnToProperty) throws SQLException { T bean = this.newInstance(type); @@ -231,7 +231,7 @@ public class BeanProcessor { * @return An initialized object. * @throws SQLException if a database error occurs. */ - public <T> T populateBean(ResultSet rs, T bean) throws SQLException { + public <T> T populateBean(final ResultSet rs, final T bean) throws SQLException { PropertyDescriptor[] props = this.propertyDescriptors(bean.getClass()); ResultSetMetaData rsmd = rs.getMetaData(); int[] columnToProperty = this.mapColumnsToProperties(rsmd, props); @@ -250,8 +250,8 @@ public class BeanProcessor { * @return An initialized object. * @throws SQLException if a database error occurs. */ - private <T> T populateBean(ResultSet rs, T bean, - PropertyDescriptor[] props, int[] columnToProperty) + private <T> T populateBean(final ResultSet rs, final T bean, + final PropertyDescriptor[] props, final int[] columnToProperty) throws SQLException { for (int i = 1; i < columnToProperty.length; i++) { @@ -286,7 +286,7 @@ public class BeanProcessor { * @param value The value to pass into the setter. * @throws SQLException if an error occurs setting the property. */ - private void callSetter(Object target, PropertyDescriptor prop, Object value) + private void callSetter(final Object target, final PropertyDescriptor prop, Object value) throws SQLException { Method setter = getWriteMethod(target, prop, value); @@ -339,7 +339,7 @@ public class BeanProcessor { * @param type The setter's parameter type (non-null) * @return boolean True if the value is compatible (null => true) */ - private boolean isCompatibleType(Object value, Class<?> type) { + private boolean isCompatibleType(final Object value, final Class<?> type) { // Do object check first, then primitives if (value == null || type.isInstance(value) || matchesPrimitive(type, value.getClass())) { return true; @@ -356,7 +356,7 @@ public class BeanProcessor { * @param valueType The value to match to the primitive type. * @return Whether <code>valueType</code> can be coerced (e.g. autoboxed) into <code>targetType</code>. */ - private boolean matchesPrimitive(Class<?> targetType, Class<?> valueType) { + private boolean matchesPrimitive(final Class<?> targetType, final Class<?> valueType) { if (!targetType.isPrimitive()) { return false; } @@ -388,7 +388,7 @@ public class BeanProcessor { * @return The {@link java.lang.reflect.Method} to call on {@code target} to write {@code value} or {@code null} if * there is no suitable write method. */ - protected Method getWriteMethod(Object target, PropertyDescriptor prop, Object value) { + protected Method getWriteMethod(final Object target, final PropertyDescriptor prop, final Object value) { Method method = prop.getWriteMethod(); return method; } @@ -403,7 +403,7 @@ public class BeanProcessor { * @return A newly created object of the Class. * @throws SQLException if creation failed. */ - protected <T> T newInstance(Class<T> c) throws SQLException { + protected <T> T newInstance(final Class<T> c) throws SQLException { try { return c.newInstance(); @@ -424,7 +424,7 @@ public class BeanProcessor { * @return A PropertyDescriptor[] describing the Class. * @throws SQLException if introspection failed. */ - private PropertyDescriptor[] propertyDescriptors(Class<?> c) + private PropertyDescriptor[] propertyDescriptors(final Class<?> c) throws SQLException { // Introspector caches BeanInfo classes for better performance BeanInfo beanInfo = null; @@ -456,8 +456,8 @@ public class BeanProcessor { * @return An int[] with column index to property index mappings. The 0th * element is meaningless because JDBC column indexing starts at 1. */ - protected int[] mapColumnsToProperties(ResultSetMetaData rsmd, - PropertyDescriptor[] props) throws SQLException { + protected int[] mapColumnsToProperties(final ResultSetMetaData rsmd, + final PropertyDescriptor[] props) throws SQLException { int cols = rsmd.getColumnCount(); int[] columnToProperty = new int[cols + 1]; @@ -511,7 +511,7 @@ public class BeanProcessor { * index after optional type processing or <code>null</code> if the column * value was SQL NULL. */ - protected Object processColumn(ResultSet rs, int index, Class<?> propType) + protected Object processColumn(final ResultSet rs, final int index, final Class<?> propType) throws SQLException { Object retval = rs.getObject(index); http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/DbUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/DbUtils.java b/src/main/java/org/apache/commons/dbutils/DbUtils.java index 5d837b8..d65d277 100644 --- a/src/main/java/org/apache/commons/dbutils/DbUtils.java +++ b/src/main/java/org/apache/commons/dbutils/DbUtils.java @@ -55,7 +55,7 @@ public final class DbUtils { * @param conn Connection to close. * @throws SQLException if a database access error occurs */ - public static void close(Connection conn) throws SQLException { + public static void close(final Connection conn) throws SQLException { if (conn != null) { conn.close(); } @@ -67,7 +67,7 @@ public final class DbUtils { * @param rs ResultSet to close. * @throws SQLException if a database access error occurs */ - public static void close(ResultSet rs) throws SQLException { + public static void close(final ResultSet rs) throws SQLException { if (rs != null) { rs.close(); } @@ -79,7 +79,7 @@ public final class DbUtils { * @param stmt Statement to close. * @throws SQLException if a database access error occurs */ - public static void close(Statement stmt) throws SQLException { + public static void close(final Statement stmt) throws SQLException { if (stmt != null) { stmt.close(); } @@ -91,7 +91,7 @@ public final class DbUtils { * * @param conn Connection to close. */ - public static void closeQuietly(Connection conn) { + public static void closeQuietly(final Connection conn) { try { close(conn); } catch (SQLException e) { // NOPMD @@ -108,8 +108,8 @@ public final class DbUtils { * @param stmt Statement to close. * @param rs ResultSet to close. */ - public static void closeQuietly(Connection conn, Statement stmt, - ResultSet rs) { + public static void closeQuietly(final Connection conn, final Statement stmt, + final ResultSet rs) { try { closeQuietly(rs); @@ -129,7 +129,7 @@ public final class DbUtils { * * @param rs ResultSet to close. */ - public static void closeQuietly(ResultSet rs) { + public static void closeQuietly(final ResultSet rs) { try { close(rs); } catch (SQLException e) { // NOPMD @@ -143,7 +143,7 @@ public final class DbUtils { * * @param stmt Statement to close. */ - public static void closeQuietly(Statement stmt) { + public static void closeQuietly(final Statement stmt) { try { close(stmt); } catch (SQLException e) { // NOPMD @@ -157,7 +157,7 @@ public final class DbUtils { * @param conn Connection to close. * @throws SQLException if a database access error occurs */ - public static void commitAndClose(Connection conn) throws SQLException { + public static void commitAndClose(final Connection conn) throws SQLException { if (conn != null) { try { conn.commit(); @@ -173,7 +173,7 @@ public final class DbUtils { * * @param conn Connection to close. */ - public static void commitAndCloseQuietly(Connection conn) { + public static void commitAndCloseQuietly(final Connection conn) { try { commitAndClose(conn); } catch (SQLException e) { // NOPMD @@ -188,7 +188,7 @@ public final class DbUtils { * @param driverClassName of driver to load * @return boolean <code>true</code> if the driver was found, otherwise <code>false</code> */ - public static boolean loadDriver(String driverClassName) { + public static boolean loadDriver(final String driverClassName) { return loadDriver(DbUtils.class.getClassLoader(), driverClassName); } @@ -201,7 +201,7 @@ public final class DbUtils { * @return boolean <code>true</code> if the driver was found, otherwise <code>false</code> * @since 1.4 */ - public static boolean loadDriver(ClassLoader classLoader, String driverClassName) { + public static boolean loadDriver(final ClassLoader classLoader, final String driverClassName) { try { Class<?> loadedClass = classLoader.loadClass(driverClassName); @@ -239,7 +239,7 @@ public final class DbUtils { * * @param e SQLException to print stack trace of */ - public static void printStackTrace(SQLException e) { + public static void printStackTrace(final SQLException e) { printStackTrace(e, new PrintWriter(System.err)); } @@ -250,7 +250,7 @@ public final class DbUtils { * @param e SQLException to print stack trace of * @param pw PrintWriter to print to */ - public static void printStackTrace(SQLException e, PrintWriter pw) { + public static void printStackTrace(final SQLException e, final PrintWriter pw) { SQLException next = e; while (next != null) { @@ -267,7 +267,7 @@ public final class DbUtils { * * @param conn Connection to print warnings from */ - public static void printWarnings(Connection conn) { + public static void printWarnings(final Connection conn) { printWarnings(conn, new PrintWriter(System.err)); } @@ -277,7 +277,7 @@ public final class DbUtils { * @param conn Connection to print warnings from * @param pw PrintWriter to print to */ - public static void printWarnings(Connection conn, PrintWriter pw) { + public static void printWarnings(final Connection conn, final PrintWriter pw) { if (conn != null) { try { printStackTrace(conn.getWarnings(), pw); @@ -292,7 +292,7 @@ public final class DbUtils { * @param conn Connection to rollback. A null value is legal. * @throws SQLException if a database access error occurs */ - public static void rollback(Connection conn) throws SQLException { + public static void rollback(final Connection conn) throws SQLException { if (conn != null) { conn.rollback(); } @@ -306,7 +306,7 @@ public final class DbUtils { * @throws SQLException if a database access error occurs * @since DbUtils 1.1 */ - public static void rollbackAndClose(Connection conn) throws SQLException { + public static void rollbackAndClose(final Connection conn) throws SQLException { if (conn != null) { try { conn.rollback(); @@ -323,7 +323,7 @@ public final class DbUtils { * @param conn Connection to rollback. A null value is legal. * @since DbUtils 1.1 */ - public static void rollbackAndCloseQuietly(Connection conn) { + public static void rollbackAndCloseQuietly(final Connection conn) { try { rollbackAndClose(conn); } catch (SQLException e) { // NOPMD @@ -350,7 +350,7 @@ public final class DbUtils { * * @param adapted the adapted JDBC Driver loaded dynamically. */ - public DriverProxy(Driver adapted) { + public DriverProxy(final Driver adapted) { this.adapted = adapted; } @@ -358,7 +358,7 @@ public final class DbUtils { * {@inheritDoc} */ @Override - public boolean acceptsURL(String url) throws SQLException { + public boolean acceptsURL(final String url) throws SQLException { return adapted.acceptsURL(url); } @@ -366,7 +366,7 @@ public final class DbUtils { * {@inheritDoc} */ @Override - public Connection connect(String url, Properties info) throws SQLException { + public Connection connect(final String url, final Properties info) throws SQLException { return adapted.connect(url, info); } @@ -390,7 +390,7 @@ public final class DbUtils { * {@inheritDoc} */ @Override - public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException { + public DriverPropertyInfo[] getPropertyInfo(final String url, final Properties info) throws SQLException { return adapted.getPropertyInfo(url, info); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/OutParameter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/OutParameter.java b/src/main/java/org/apache/commons/dbutils/OutParameter.java index d49b474..e3996a1 100644 --- a/src/main/java/org/apache/commons/dbutils/OutParameter.java +++ b/src/main/java/org/apache/commons/dbutils/OutParameter.java @@ -46,7 +46,7 @@ public class OutParameter<T> { * with the type returned by <code>CallableStatement.getObject(int)</code> * for the JDBC type given by <code>sqlType</code>. */ - public OutParameter(int sqlType, Class<T> javaType) { + public OutParameter(final int sqlType, final Class<T> javaType) { this.sqlType = sqlType; this.javaType = javaType; } @@ -62,7 +62,7 @@ public class OutParameter<T> { * for the JDBC type given by <code>sqlType</code>. * @param value the IN value of the parameter */ - public OutParameter(int sqlType, Class<T> javaType, T value) { + public OutParameter(final int sqlType, final Class<T> javaType, final T value) { this.sqlType = sqlType; this.javaType = javaType; this.value = value; @@ -100,7 +100,7 @@ public class OutParameter<T> { * INOUT parameter. * @param value the new value for the parameter. */ - public void setValue(T value) { + public void setValue(final T value) { this.value = value; } @@ -112,7 +112,7 @@ public class OutParameter<T> { * @throws SQLException when the value could not be retrieved from the * statement. */ - void setValue(CallableStatement stmt, int index) throws SQLException { + void setValue(final CallableStatement stmt, final int index) throws SQLException { Object object = stmt.getObject(index); value = javaType.cast(object); } @@ -127,7 +127,7 @@ public class OutParameter<T> { * @throws SQLException if the parameter could not be registered, or if the * value of the parameter could not be set. */ - void register(CallableStatement stmt, int index) throws SQLException { + void register(final CallableStatement stmt, final int index) throws SQLException { stmt.registerOutParameter(index, sqlType); if (value != null) { stmt.setObject(index, value); http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/ProxyFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/ProxyFactory.java b/src/main/java/org/apache/commons/dbutils/ProxyFactory.java index 3a212e1..1c97c84 100644 --- a/src/main/java/org/apache/commons/dbutils/ProxyFactory.java +++ b/src/main/java/org/apache/commons/dbutils/ProxyFactory.java @@ -65,7 +65,7 @@ public class ProxyFactory { * @param handler The handler that intercepts/overrides method calls. * @return proxied object */ - public <T> T newProxyInstance(Class<T> type, InvocationHandler handler) { + public <T> T newProxyInstance(final Class<T> type, final InvocationHandler handler) { return type.cast(Proxy.newProxyInstance(handler.getClass().getClassLoader(), new Class<?>[] {type}, handler)); } @@ -74,7 +74,7 @@ public class ProxyFactory { * @param handler The handler that intercepts/overrides method calls. * @return proxied CallableStatement */ - public CallableStatement createCallableStatement(InvocationHandler handler) { + public CallableStatement createCallableStatement(final InvocationHandler handler) { return newProxyInstance(CallableStatement.class, handler); } @@ -83,7 +83,7 @@ public class ProxyFactory { * @param handler The handler that intercepts/overrides method calls. * @return proxied Connection */ - public Connection createConnection(InvocationHandler handler) { + public Connection createConnection(final InvocationHandler handler) { return newProxyInstance(Connection.class, handler); } @@ -92,7 +92,7 @@ public class ProxyFactory { * @param handler The handler that intercepts/overrides method calls. * @return proxied Driver */ - public Driver createDriver(InvocationHandler handler) { + public Driver createDriver(final InvocationHandler handler) { return newProxyInstance(Driver.class, handler); } @@ -101,7 +101,7 @@ public class ProxyFactory { * @param handler The handler that intercepts/overrides method calls. * @return proxied PreparedStatement */ - public PreparedStatement createPreparedStatement(InvocationHandler handler) { + public PreparedStatement createPreparedStatement(final InvocationHandler handler) { return newProxyInstance(PreparedStatement.class, handler); } @@ -110,7 +110,7 @@ public class ProxyFactory { * @param handler The handler that intercepts/overrides method calls. * @return proxied ResultSet */ - public ResultSet createResultSet(InvocationHandler handler) { + public ResultSet createResultSet(final InvocationHandler handler) { return newProxyInstance(ResultSet.class, handler); } @@ -119,7 +119,7 @@ public class ProxyFactory { * @param handler The handler that intercepts/overrides method calls. * @return proxied ResultSetMetaData */ - public ResultSetMetaData createResultSetMetaData(InvocationHandler handler) { + public ResultSetMetaData createResultSetMetaData(final InvocationHandler handler) { return newProxyInstance(ResultSetMetaData.class, handler); } @@ -128,7 +128,7 @@ public class ProxyFactory { * @param handler The handler that intercepts/overrides method calls. * @return proxied Statement */ - public Statement createStatement(InvocationHandler handler) { + public Statement createStatement(final InvocationHandler handler) { return newProxyInstance(Statement.class, handler); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/QueryLoader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/QueryLoader.java b/src/main/java/org/apache/commons/dbutils/QueryLoader.java index cec9fbd..2fd032c 100644 --- a/src/main/java/org/apache/commons/dbutils/QueryLoader.java +++ b/src/main/java/org/apache/commons/dbutils/QueryLoader.java @@ -80,7 +80,7 @@ public class QueryLoader { * @return Map of query names to SQL values * @see java.util.Properties */ - public synchronized Map<String, String> load(String path) throws IOException { + public synchronized Map<String, String> load(final String path) throws IOException { Map<String, String> queryMap = this.queries.get(path); @@ -108,7 +108,7 @@ public class QueryLoader { * @return Map of query names to SQL values * @see java.util.Properties */ - protected Map<String, String> loadQueries(String path) throws IOException { + protected Map<String, String> loadQueries(final String path) throws IOException { // Findbugs flags getClass().getResource as a bad practice; maybe we should change the API? final Properties props; try (InputStream in = getClass().getResourceAsStream(path)) { @@ -135,7 +135,7 @@ public class QueryLoader { * Removes the queries for the given path from the cache. * @param path The path that the queries were loaded from. */ - public synchronized void unload(String path) { + public synchronized void unload(final String path) { this.queries.remove(path); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/QueryRunner.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/QueryRunner.java b/src/main/java/org/apache/commons/dbutils/QueryRunner.java index 321caee..f4f3f4b 100644 --- a/src/main/java/org/apache/commons/dbutils/QueryRunner.java +++ b/src/main/java/org/apache/commons/dbutils/QueryRunner.java @@ -48,7 +48,7 @@ public class QueryRunner extends AbstractQueryRunner { * if <code>pmdKnownBroken</code> is set to true, we won't even try it; if false, we'll try it, * and if it breaks, we'll remember not to use it again. */ - public QueryRunner(boolean pmdKnownBroken) { + public QueryRunner(final boolean pmdKnownBroken) { super(pmdKnownBroken); } @@ -60,7 +60,7 @@ public class QueryRunner extends AbstractQueryRunner { * * @param ds The <code>DataSource</code> to retrieve connections from. */ - public QueryRunner(DataSource ds) { + public QueryRunner(final DataSource ds) { super(ds); } @@ -70,7 +70,7 @@ public class QueryRunner extends AbstractQueryRunner { * * @param stmtConfig The configuration to apply to statements when they are prepared. */ - public QueryRunner(StatementConfiguration stmtConfig) { + public QueryRunner(final StatementConfiguration stmtConfig) { super(stmtConfig); } @@ -84,7 +84,7 @@ public class QueryRunner extends AbstractQueryRunner { * if <code>pmdKnownBroken</code> is set to true, we won't even try it; if false, we'll try it, * and if it breaks, we'll remember not to use it again. */ - public QueryRunner(DataSource ds, boolean pmdKnownBroken) { + public QueryRunner(final DataSource ds, final boolean pmdKnownBroken) { super(ds, pmdKnownBroken); } @@ -97,7 +97,7 @@ public class QueryRunner extends AbstractQueryRunner { * @param ds The <code>DataSource</code> to retrieve connections from. * @param stmtConfig The configuration to apply to statements when they are prepared. */ - public QueryRunner(DataSource ds, StatementConfiguration stmtConfig) { + public QueryRunner(final DataSource ds, final StatementConfiguration stmtConfig) { super(ds, stmtConfig); } @@ -112,7 +112,7 @@ public class QueryRunner extends AbstractQueryRunner { * and if it breaks, we'll remember not to use it again. * @param stmtConfig The configuration to apply to statements when they are prepared. */ - public QueryRunner(DataSource ds, boolean pmdKnownBroken, StatementConfiguration stmtConfig) { + public QueryRunner(final DataSource ds, final boolean pmdKnownBroken, final StatementConfiguration stmtConfig) { super(ds, pmdKnownBroken, stmtConfig); } @@ -128,7 +128,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException if a database access error occurs * @since DbUtils 1.1 */ - public int[] batch(Connection conn, String sql, Object[][] params) throws SQLException { + public int[] batch(final Connection conn, final String sql, final Object[][] params) throws SQLException { return this.batch(conn, false, sql, params); } @@ -145,7 +145,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException if a database access error occurs * @since DbUtils 1.1 */ - public int[] batch(String sql, Object[][] params) throws SQLException { + public int[] batch(final String sql, final Object[][] params) throws SQLException { Connection conn = this.prepareConnection(); return this.batch(conn, true, sql, params); @@ -161,7 +161,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return The number of rows updated in the batch. * @throws SQLException If there are database or parameter errors. */ - private int[] batch(Connection conn, boolean closeConn, String sql, Object[][] params) throws SQLException { + private int[] batch(final Connection conn, final boolean closeConn, final String sql, final Object[][] params) throws SQLException { if (conn == null) { throw new SQLException("Null connection"); } @@ -216,7 +216,7 @@ public class QueryRunner extends AbstractQueryRunner { * @deprecated Use {@link #query(Connection, String, ResultSetHandler, Object...)} */ @Deprecated - public <T> T query(Connection conn, String sql, Object param, ResultSetHandler<T> rsh) throws SQLException { + public <T> T query(final Connection conn, final String sql, final Object param, final ResultSetHandler<T> rsh) throws SQLException { return this.<T>query(conn, false, sql, rsh, new Object[]{param}); } @@ -233,7 +233,7 @@ public class QueryRunner extends AbstractQueryRunner { * @deprecated Use {@link #query(Connection,String,ResultSetHandler,Object...)} instead */ @Deprecated - public <T> T query(Connection conn, String sql, Object[] params, ResultSetHandler<T> rsh) throws SQLException { + public <T> T query(final Connection conn, final String sql, final Object[] params, final ResultSetHandler<T> rsh) throws SQLException { return this.<T>query(conn, false, sql, rsh, params); } @@ -248,7 +248,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return The object returned by the handler. * @throws SQLException if a database access error occurs */ - public <T> T query(Connection conn, String sql, ResultSetHandler<T> rsh, Object... params) throws SQLException { + public <T> T query(final Connection conn, final String sql, final ResultSetHandler<T> rsh, final Object... params) throws SQLException { return this.<T>query(conn, false, sql, rsh, params); } @@ -262,7 +262,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return The object returned by the handler. * @throws SQLException if a database access error occurs */ - public <T> T query(Connection conn, String sql, ResultSetHandler<T> rsh) throws SQLException { + public <T> T query(final Connection conn, final String sql, final ResultSetHandler<T> rsh) throws SQLException { return this.<T>query(conn, false, sql, rsh, (Object[]) null); } @@ -281,7 +281,7 @@ public class QueryRunner extends AbstractQueryRunner { * @deprecated Use {@link #query(String, ResultSetHandler, Object...)} */ @Deprecated - public <T> T query(String sql, Object param, ResultSetHandler<T> rsh) throws SQLException { + public <T> T query(final String sql, final Object param, final ResultSetHandler<T> rsh) throws SQLException { Connection conn = this.prepareConnection(); return this.<T>query(conn, true, sql, rsh, new Object[]{param}); @@ -304,7 +304,7 @@ public class QueryRunner extends AbstractQueryRunner { * @deprecated Use {@link #query(String, ResultSetHandler, Object...)} */ @Deprecated - public <T> T query(String sql, Object[] params, ResultSetHandler<T> rsh) throws SQLException { + public <T> T query(final String sql, final Object[] params, final ResultSetHandler<T> rsh) throws SQLException { Connection conn = this.prepareConnection(); return this.<T>query(conn, true, sql, rsh, params); @@ -323,7 +323,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return An object generated by the handler. * @throws SQLException if a database access error occurs */ - public <T> T query(String sql, ResultSetHandler<T> rsh, Object... params) throws SQLException { + public <T> T query(final String sql, final ResultSetHandler<T> rsh, final Object... params) throws SQLException { Connection conn = this.prepareConnection(); return this.<T>query(conn, true, sql, rsh, params); @@ -341,7 +341,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return An object generated by the handler. * @throws SQLException if a database access error occurs */ - public <T> T query(String sql, ResultSetHandler<T> rsh) throws SQLException { + public <T> T query(final String sql, final ResultSetHandler<T> rsh) throws SQLException { Connection conn = this.prepareConnection(); return this.<T>query(conn, true, sql, rsh, (Object[]) null); @@ -357,7 +357,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return The results of the query. * @throws SQLException If there are database or parameter errors. */ - private <T> T query(Connection conn, boolean closeConn, String sql, ResultSetHandler<T> rsh, Object... params) + private <T> T query(final Connection conn, final boolean closeConn, final String sql, final ResultSetHandler<T> rsh, final Object... params) throws SQLException { if (conn == null) { throw new SQLException("Null connection"); @@ -410,7 +410,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return The number of rows updated. * @throws SQLException if a database access error occurs */ - public int update(Connection conn, String sql) throws SQLException { + public int update(final Connection conn, final String sql) throws SQLException { return this.update(conn, false, sql, (Object[]) null); } @@ -424,7 +424,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return The number of rows updated. * @throws SQLException if a database access error occurs */ - public int update(Connection conn, String sql, Object param) throws SQLException { + public int update(final Connection conn, final String sql, final Object param) throws SQLException { return this.update(conn, false, sql, new Object[]{param}); } @@ -437,7 +437,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return The number of rows updated. * @throws SQLException if a database access error occurs */ - public int update(Connection conn, String sql, Object... params) throws SQLException { + public int update(final Connection conn, final String sql, final Object... params) throws SQLException { return update(conn, false, sql, params); } @@ -452,7 +452,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException if a database access error occurs * @return The number of rows updated. */ - public int update(String sql) throws SQLException { + public int update(final String sql) throws SQLException { Connection conn = this.prepareConnection(); return this.update(conn, true, sql, (Object[]) null); @@ -470,7 +470,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException if a database access error occurs * @return The number of rows updated. */ - public int update(String sql, Object param) throws SQLException { + public int update(final String sql, final Object param) throws SQLException { Connection conn = this.prepareConnection(); return this.update(conn, true, sql, new Object[]{param}); @@ -488,7 +488,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException if a database access error occurs * @return The number of rows updated. */ - public int update(String sql, Object... params) throws SQLException { + public int update(final String sql, final Object... params) throws SQLException { Connection conn = this.prepareConnection(); return this.update(conn, true, sql, params); @@ -504,7 +504,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return The number of rows updated. * @throws SQLException If there are database or parameter errors. */ - private int update(Connection conn, boolean closeConn, String sql, Object... params) throws SQLException { + private int update(final Connection conn, final boolean closeConn, final String sql, final Object... params) throws SQLException { if (conn == null) { throw new SQLException("Null connection"); } @@ -549,7 +549,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException if a database access error occurs * @since 1.6 */ - public <T> T insert(String sql, ResultSetHandler<T> rsh) throws SQLException { + public <T> T insert(final String sql, final ResultSetHandler<T> rsh) throws SQLException { return insert(this.prepareConnection(), true, sql, rsh, (Object[]) null); } @@ -567,7 +567,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException if a database access error occurs * @since 1.6 */ - public <T> T insert(String sql, ResultSetHandler<T> rsh, Object... params) throws SQLException { + public <T> T insert(final String sql, final ResultSetHandler<T> rsh, final Object... params) throws SQLException { return insert(this.prepareConnection(), true, sql, rsh, params); } @@ -582,7 +582,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException if a database access error occurs * @since 1.6 */ - public <T> T insert(Connection conn, String sql, ResultSetHandler<T> rsh) throws SQLException { + public <T> T insert(final Connection conn, final String sql, final ResultSetHandler<T> rsh) throws SQLException { return insert(conn, false, sql, rsh, (Object[]) null); } @@ -598,7 +598,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException if a database access error occurs * @since 1.6 */ - public <T> T insert(Connection conn, String sql, ResultSetHandler<T> rsh, Object... params) throws SQLException { + public <T> T insert(final Connection conn, final String sql, final ResultSetHandler<T> rsh, final Object... params) throws SQLException { return insert(conn, false, sql, rsh, params); } @@ -614,7 +614,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException If there are database or parameter errors. * @since 1.6 */ - private <T> T insert(Connection conn, boolean closeConn, String sql, ResultSetHandler<T> rsh, Object... params) + private <T> T insert(final Connection conn, final boolean closeConn, final String sql, final ResultSetHandler<T> rsh, final Object... params) throws SQLException { if (conn == null) { throw new SQLException("Null connection"); @@ -669,7 +669,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException if a database access error occurs * @since 1.6 */ - public <T> T insertBatch(String sql, ResultSetHandler<T> rsh, Object[][] params) throws SQLException { + public <T> T insertBatch(final String sql, final ResultSetHandler<T> rsh, final Object[][] params) throws SQLException { return insertBatch(this.prepareConnection(), true, sql, rsh, params); } @@ -685,7 +685,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException if a database access error occurs * @since 1.6 */ - public <T> T insertBatch(Connection conn, String sql, ResultSetHandler<T> rsh, Object[][] params) throws SQLException { + public <T> T insertBatch(final Connection conn, final String sql, final ResultSetHandler<T> rsh, final Object[][] params) throws SQLException { return insertBatch(conn, false, sql, rsh, params); } @@ -701,7 +701,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException If there are database or parameter errors. * @since 1.6 */ - private <T> T insertBatch(Connection conn, boolean closeConn, String sql, ResultSetHandler<T> rsh, Object[][] params) + private <T> T insertBatch(final Connection conn, final boolean closeConn, final String sql, final ResultSetHandler<T> rsh, final Object[][] params) throws SQLException { if (conn == null) { throw new SQLException("Null connection"); @@ -765,7 +765,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return The number of rows updated. * @throws SQLException if a database access error occurs */ - public int execute(Connection conn, String sql, Object... params) throws SQLException { + public int execute(final Connection conn, final String sql, final Object... params) throws SQLException { return this.execute(conn, false, sql, params); } @@ -791,7 +791,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException if a database access error occurs * @return The number of rows updated. */ - public int execute(String sql, Object... params) throws SQLException { + public int execute(final String sql, final Object... params) throws SQLException { Connection conn = this.prepareConnection(); return this.execute(conn, true, sql, params); @@ -819,7 +819,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return A list of objects generated by the handler * @throws SQLException if a database access error occurs */ - public <T> List<T> execute(Connection conn, String sql, ResultSetHandler<T> rsh, Object... params) throws SQLException { + public <T> List<T> execute(final Connection conn, final String sql, final ResultSetHandler<T> rsh, final Object... params) throws SQLException { return this.execute(conn, false, sql, rsh, params); } @@ -844,7 +844,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return A list of objects generated by the handler * @throws SQLException if a database access error occurs */ - public <T> List<T> execute(String sql, ResultSetHandler<T> rsh, Object... params) throws SQLException { + public <T> List<T> execute(final String sql, final ResultSetHandler<T> rsh, final Object... params) throws SQLException { Connection conn = this.prepareConnection(); return this.execute(conn, true, sql, rsh, params); @@ -861,7 +861,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return The number of rows updated. * @throws SQLException If there are database or parameter errors. */ - private int execute(Connection conn, boolean closeConn, String sql, Object... params) throws SQLException { + private int execute(final Connection conn, final boolean closeConn, final String sql, final Object... params) throws SQLException { if (conn == null) { throw new SQLException("Null connection"); } @@ -908,7 +908,7 @@ public class QueryRunner extends AbstractQueryRunner { * @return List of all objects generated by the ResultSetHandler for all result sets handled. * @throws SQLException If there are database or parameter errors. */ - private <T> List<T> execute(Connection conn, boolean closeConn, String sql, ResultSetHandler<T> rsh, Object... params) throws SQLException { + private <T> List<T> execute(final Connection conn, final boolean closeConn, final String sql, final ResultSetHandler<T> rsh, final Object... params) throws SQLException { if (conn == null) { throw new SQLException("Null connection"); } @@ -971,7 +971,7 @@ public class QueryRunner extends AbstractQueryRunner { * @throws SQLException when the value could not be retrieved from the * statement. */ - private void retrieveOutParameters(CallableStatement stmt, Object[] params) throws SQLException { + private void retrieveOutParameters(final CallableStatement stmt, final Object[] params) throws SQLException { if (params != null) { for (int i = 0; i < params.length; i++) { if (params[i] instanceof OutParameter) { http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java b/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java index 50e2a12..a7ce7c9 100644 --- a/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java +++ b/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java @@ -48,7 +48,7 @@ public class ResultSetIterator implements Iterator<Object[]> { * Constructor for ResultSetIterator. * @param rs Wrap this <code>ResultSet</code> in an <code>Iterator</code>. */ - public ResultSetIterator(ResultSet rs) { + public ResultSetIterator(final ResultSet rs) { this(rs, new BasicRowProcessor()); } @@ -59,7 +59,7 @@ public class ResultSetIterator implements Iterator<Object[]> { * <code>Object[]</code>. Defaults to a * <code>BasicRowProcessor</code>. */ - public ResultSetIterator(ResultSet rs, RowProcessor convert) { + public ResultSetIterator(final ResultSet rs, final RowProcessor convert) { this.rs = rs; this.convert = convert; } @@ -117,7 +117,7 @@ public class ResultSetIterator implements Iterator<Object[]> { * @param e SQLException to rethrow * @since DbUtils 1.1 */ - protected void rethrow(SQLException e) { + protected void rethrow(final SQLException e) { throw new RuntimeException(e.getMessage()); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/StatementConfiguration.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/StatementConfiguration.java b/src/main/java/org/apache/commons/dbutils/StatementConfiguration.java index 68761ab..e916b8b 100644 --- a/src/main/java/org/apache/commons/dbutils/StatementConfiguration.java +++ b/src/main/java/org/apache/commons/dbutils/StatementConfiguration.java @@ -35,8 +35,8 @@ public class StatementConfiguration { * @param maxRows The maximum number of rows that a <code>ResultSet</code> can produce. * @param queryTimeout The number of seconds the driver will wait for execution. */ - public StatementConfiguration(Integer fetchDirection, Integer fetchSize, Integer maxFieldSize, Integer maxRows, - Integer queryTimeout) { + public StatementConfiguration(final Integer fetchDirection, final Integer fetchSize, final Integer maxFieldSize, final Integer maxRows, + final Integer queryTimeout) { this.fetchDirection = fetchDirection; this.fetchSize = fetchSize; this.maxFieldSize = maxFieldSize; http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java index c16f587..69e3a64 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/AbstractKeyedHandler.java @@ -47,7 +47,7 @@ public abstract class AbstractKeyedHandler<K, V> implements ResultSetHandler<Map * @see org.apache.commons.dbutils.ResultSetHandler#handle(java.sql.ResultSet) */ @Override - public Map<K, V> handle(ResultSet rs) throws SQLException { + public Map<K, V> handle(final ResultSet rs) throws SQLException { Map<K, V> result = createMap(); while (rs.next()) { result.put(createKey(rs), createRow(rs)); http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/AbstractListHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/AbstractListHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/AbstractListHandler.java index a8fb5fe..d360155 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/AbstractListHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/AbstractListHandler.java @@ -42,7 +42,7 @@ public abstract class AbstractListHandler<T> implements ResultSetHandler<List<T> * @throws SQLException error occurs */ @Override - public List<T> handle(ResultSet rs) throws SQLException { + public List<T> handle(final ResultSet rs) throws SQLException { List<T> rows = new ArrayList<>(); while (rs.next()) { rows.add(this.handleRow(rs)); http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/ArrayHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/ArrayHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/ArrayHandler.java index 7d7bfea..4344c42 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/ArrayHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/ArrayHandler.java @@ -64,7 +64,7 @@ public class ArrayHandler implements ResultSetHandler<Object[]> { * @param convert The <code>RowProcessor</code> implementation * to use when converting rows into arrays. */ - public ArrayHandler(RowProcessor convert) { + public ArrayHandler(final RowProcessor convert) { super(); this.convert = convert; } @@ -79,7 +79,7 @@ public class ArrayHandler implements ResultSetHandler<Object[]> { * @see org.apache.commons.dbutils.ResultSetHandler#handle(java.sql.ResultSet) */ @Override - public Object[] handle(ResultSet rs) throws SQLException { + public Object[] handle(final ResultSet rs) throws SQLException { return rs.next() ? this.convert.toArray(rs) : EMPTY_ARRAY; } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/ArrayListHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/ArrayListHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/ArrayListHandler.java index d2359cf..9527f3b 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/ArrayListHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/ArrayListHandler.java @@ -50,7 +50,7 @@ public class ArrayListHandler extends AbstractListHandler<Object[]> { * @param convert The <code>RowProcessor</code> implementation * to use when converting rows into Object[]s. */ - public ArrayListHandler(RowProcessor convert) { + public ArrayListHandler(final RowProcessor convert) { super(); this.convert = convert; } @@ -65,7 +65,7 @@ public class ArrayListHandler extends AbstractListHandler<Object[]> { * @see org.apache.commons.dbutils.handlers.AbstractListHandler#handle(ResultSet) */ @Override - protected Object[] handleRow(ResultSet rs) throws SQLException { + protected Object[] handleRow(final ResultSet rs) throws SQLException { return this.convert.toArray(rs); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/BeanHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/BeanHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/BeanHandler.java index c2f0436..09758df 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/BeanHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/BeanHandler.java @@ -48,7 +48,7 @@ public class BeanHandler<T> implements ResultSetHandler<T> { * @param type The Class that objects returned from <code>handle()</code> * are created from. */ - public BeanHandler(Class<? extends T> type) { + public BeanHandler(final Class<? extends T> type) { this(type, ArrayHandler.ROW_PROCESSOR); } @@ -60,7 +60,7 @@ public class BeanHandler<T> implements ResultSetHandler<T> { * @param convert The <code>RowProcessor</code> implementation * to use when converting rows into beans. */ - public BeanHandler(Class<? extends T> type, RowProcessor convert) { + public BeanHandler(final Class<? extends T> type, final RowProcessor convert) { this.type = type; this.convert = convert; } @@ -76,7 +76,7 @@ public class BeanHandler<T> implements ResultSetHandler<T> { * @see org.apache.commons.dbutils.ResultSetHandler#handle(java.sql.ResultSet) */ @Override - public T handle(ResultSet rs) throws SQLException { + public T handle(final ResultSet rs) throws SQLException { return rs.next() ? this.convert.toBean(rs, this.type) : null; } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/BeanListHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/BeanListHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/BeanListHandler.java index c990dbd..cee50fd 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/BeanListHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/BeanListHandler.java @@ -50,7 +50,7 @@ public class BeanListHandler<T> implements ResultSetHandler<List<T>> { * @param type The Class that objects returned from <code>handle()</code> * are created from. */ - public BeanListHandler(Class<? extends T> type) { + public BeanListHandler(final Class<? extends T> type) { this(type, ArrayHandler.ROW_PROCESSOR); } @@ -62,7 +62,7 @@ public class BeanListHandler<T> implements ResultSetHandler<List<T>> { * @param convert The <code>RowProcessor</code> implementation * to use when converting rows into beans. */ - public BeanListHandler(Class<? extends T> type, RowProcessor convert) { + public BeanListHandler(final Class<? extends T> type, final RowProcessor convert) { this.type = type; this.convert = convert; } @@ -79,7 +79,7 @@ public class BeanListHandler<T> implements ResultSetHandler<List<T>> { * @see org.apache.commons.dbutils.RowProcessor#toBeanList(ResultSet, Class) */ @Override - public List<T> handle(ResultSet rs) throws SQLException { + public List<T> handle(final ResultSet rs) throws SQLException { return this.convert.toBeanList(rs, type); } } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/BeanMapHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/BeanMapHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/BeanMapHandler.java index 79cfbb4..e9af0d0 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/BeanMapHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/BeanMapHandler.java @@ -86,7 +86,7 @@ public class BeanMapHandler<K, V> extends AbstractKeyedHandler<K, V> { * The Class that objects returned from <code>createRow()</code> * are created from. */ - public BeanMapHandler(Class<V> type) { + public BeanMapHandler(final Class<V> type) { this(type, ArrayHandler.ROW_PROCESSOR, 1, null); } @@ -101,7 +101,7 @@ public class BeanMapHandler<K, V> extends AbstractKeyedHandler<K, V> { * The <code>RowProcessor</code> implementation to use when * converting rows into Beans */ - public BeanMapHandler(Class<V> type, RowProcessor convert) { + public BeanMapHandler(final Class<V> type, final RowProcessor convert) { this(type, convert, 1, null); } @@ -115,7 +115,7 @@ public class BeanMapHandler<K, V> extends AbstractKeyedHandler<K, V> { * The values to use as keys in the Map are retrieved from the * column at this index. */ - public BeanMapHandler(Class<V> type, int columnIndex) { + public BeanMapHandler(final Class<V> type, final int columnIndex) { this(type, ArrayHandler.ROW_PROCESSOR, columnIndex, null); } @@ -129,7 +129,7 @@ public class BeanMapHandler<K, V> extends AbstractKeyedHandler<K, V> { * The values to use as keys in the Map are retrieved from the * column with this name. */ - public BeanMapHandler(Class<V> type, String columnName) { + public BeanMapHandler(final Class<V> type, final String columnName) { this(type, ArrayHandler.ROW_PROCESSOR, 1, columnName); } @@ -146,8 +146,8 @@ public class BeanMapHandler<K, V> extends AbstractKeyedHandler<K, V> { * The values to use as keys in the Map are retrieved from the * column with this name. */ - private BeanMapHandler(Class<V> type, RowProcessor convert, - int columnIndex, String columnName) { + private BeanMapHandler(final Class<V> type, final RowProcessor convert, + final int columnIndex, final String columnName) { super(); this.type = type; this.convert = convert; @@ -171,14 +171,14 @@ public class BeanMapHandler<K, V> extends AbstractKeyedHandler<K, V> { // so getObject will return the appropriate type and the cast will succeed. @SuppressWarnings("unchecked") @Override - protected K createKey(ResultSet rs) throws SQLException { + protected K createKey(final ResultSet rs) throws SQLException { return (columnName == null) ? (K) rs.getObject(columnIndex) : (K) rs.getObject(columnName); } @Override - protected V createRow(ResultSet rs) throws SQLException { + protected V createRow(final ResultSet rs) throws SQLException { return this.convert.toBean(rs, type); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java index 4f3e506..8a12f2e 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/ColumnListHandler.java @@ -55,7 +55,7 @@ public class ColumnListHandler<T> extends AbstractListHandler<T> { * @param columnIndex The index of the column to retrieve from the * <code>ResultSet</code>. */ - public ColumnListHandler(int columnIndex) { + public ColumnListHandler(final int columnIndex) { this(columnIndex, null); } @@ -65,7 +65,7 @@ public class ColumnListHandler<T> extends AbstractListHandler<T> { * @param columnName The name of the column to retrieve from the * <code>ResultSet</code>. */ - public ColumnListHandler(String columnName) { + public ColumnListHandler(final String columnName) { this(1, columnName); } @@ -75,7 +75,7 @@ public class ColumnListHandler<T> extends AbstractListHandler<T> { * @param columnName The name of the column to retrieve from the * <code>ResultSet</code>. */ - private ColumnListHandler(int columnIndex, String columnName) { + private ColumnListHandler(final int columnIndex, final String columnName) { super(); this.columnIndex = columnIndex; this.columnName = columnName; @@ -95,7 +95,7 @@ public class ColumnListHandler<T> extends AbstractListHandler<T> { // so getObject will return the appropriate type and the cast will succeed. @SuppressWarnings("unchecked") @Override - protected T handleRow(ResultSet rs) throws SQLException { + protected T handleRow(final ResultSet rs) throws SQLException { if (this.columnName == null) { return (T) rs.getObject(this.columnIndex); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/KeyedHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/KeyedHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/KeyedHandler.java index ed79290..6580d6d 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/KeyedHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/KeyedHandler.java @@ -83,7 +83,7 @@ public class KeyedHandler<K> extends AbstractKeyedHandler<K, Map<String, Object> * @param convert The <code>RowProcessor</code> implementation * to use when converting rows into Maps */ - public KeyedHandler(RowProcessor convert) { + public KeyedHandler(final RowProcessor convert) { this(convert, 1, null); } @@ -93,7 +93,7 @@ public class KeyedHandler<K> extends AbstractKeyedHandler<K, Map<String, Object> * @param columnIndex The values to use as keys in the Map are * retrieved from the column at this index. */ - public KeyedHandler(int columnIndex) { + public KeyedHandler(final int columnIndex) { this(ArrayHandler.ROW_PROCESSOR, columnIndex, null); } @@ -103,7 +103,7 @@ public class KeyedHandler<K> extends AbstractKeyedHandler<K, Map<String, Object> * @param columnName The values to use as keys in the Map are * retrieved from the column with this name. */ - public KeyedHandler(String columnName) { + public KeyedHandler(final String columnName) { this(ArrayHandler.ROW_PROCESSOR, 1, columnName); } @@ -115,8 +115,8 @@ public class KeyedHandler<K> extends AbstractKeyedHandler<K, Map<String, Object> * @param columnName The values to use as keys in the Map are * retrieved from the column with this name. */ - private KeyedHandler(RowProcessor convert, int columnIndex, - String columnName) { + private KeyedHandler(final RowProcessor convert, final int columnIndex, + final String columnName) { super(); this.convert = convert; this.columnIndex = columnIndex; @@ -137,7 +137,7 @@ public class KeyedHandler<K> extends AbstractKeyedHandler<K, Map<String, Object> // so getObject will return the appropriate type and the cast will succeed. @SuppressWarnings("unchecked") @Override - protected K createKey(ResultSet rs) throws SQLException { + protected K createKey(final ResultSet rs) throws SQLException { return (columnName == null) ? (K) rs.getObject(columnIndex) : (K) rs.getObject(columnName); @@ -154,7 +154,7 @@ public class KeyedHandler<K> extends AbstractKeyedHandler<K, Map<String, Object> * @throws SQLException if a database access error occurs */ @Override - protected Map<String, Object> createRow(ResultSet rs) throws SQLException { + protected Map<String, Object> createRow(final ResultSet rs) throws SQLException { return this.convert.toMap(rs); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/MapHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/MapHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/MapHandler.java index db00345..3a2d391 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/MapHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/MapHandler.java @@ -52,7 +52,7 @@ public class MapHandler implements ResultSetHandler<Map<String, Object>> { * @param convert The <code>RowProcessor</code> implementation * to use when converting rows into Maps. */ - public MapHandler(RowProcessor convert) { + public MapHandler(final RowProcessor convert) { super(); this.convert = convert; } @@ -69,7 +69,7 @@ public class MapHandler implements ResultSetHandler<Map<String, Object>> { * @see org.apache.commons.dbutils.ResultSetHandler#handle(java.sql.ResultSet) */ @Override - public Map<String, Object> handle(ResultSet rs) throws SQLException { + public Map<String, Object> handle(final ResultSet rs) throws SQLException { return rs.next() ? this.convert.toMap(rs) : null; } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/MapListHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/MapListHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/MapListHandler.java index a055f2a..443ba35 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/MapListHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/MapListHandler.java @@ -51,7 +51,7 @@ public class MapListHandler extends AbstractListHandler<Map<String, Object>> { * @param convert The <code>RowProcessor</code> implementation * to use when converting rows into Maps. */ - public MapListHandler(RowProcessor convert) { + public MapListHandler(final RowProcessor convert) { super(); this.convert = convert; } @@ -66,7 +66,7 @@ public class MapListHandler extends AbstractListHandler<Map<String, Object>> { * @see org.apache.commons.dbutils.handlers.AbstractListHandler#handle(ResultSet) */ @Override - protected Map<String, Object> handleRow(ResultSet rs) throws SQLException { + protected Map<String, Object> handleRow(final ResultSet rs) throws SQLException { return this.convert.toMap(rs); } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/ScalarHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/ScalarHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/ScalarHandler.java index 4b70604..4afc758 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/ScalarHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/ScalarHandler.java @@ -55,7 +55,7 @@ public class ScalarHandler<T> implements ResultSetHandler<T> { * @param columnIndex The index of the column to retrieve from the * <code>ResultSet</code>. */ - public ScalarHandler(int columnIndex) { + public ScalarHandler(final int columnIndex) { this(columnIndex, null); } @@ -65,7 +65,7 @@ public class ScalarHandler<T> implements ResultSetHandler<T> { * @param columnName The name of the column to retrieve from the * <code>ResultSet</code>. */ - public ScalarHandler(String columnName) { + public ScalarHandler(final String columnName) { this(1, columnName); } @@ -75,7 +75,7 @@ public class ScalarHandler<T> implements ResultSetHandler<T> { * @param columnName The name of the column to retrieve from the * <code>ResultSet</code>. */ - private ScalarHandler(int columnIndex, String columnName) { + private ScalarHandler(final int columnIndex, final String columnName) { this.columnIndex = columnIndex; this.columnName = columnName; } @@ -97,7 +97,7 @@ public class ScalarHandler<T> implements ResultSetHandler<T> { // so getObject will return the appropriate type and the cast will succeed. @SuppressWarnings("unchecked") @Override - public T handle(ResultSet rs) throws SQLException { + public T handle(final ResultSet rs) throws SQLException { if (rs.next()) { if (this.columnName == null) { http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandler.java index a7d1189..d0a77fb 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/BooleanColumnHandler.java @@ -23,12 +23,12 @@ import org.apache.commons.dbutils.ColumnHandler; public class BooleanColumnHandler implements ColumnHandler { @Override - public boolean match(Class<?> propType) { + public boolean match(final Class<?> propType) { return propType.equals(Boolean.TYPE) || propType.equals(Boolean.class); } @Override - public Object apply(ResultSet rs, int columnIndex) throws SQLException { + public Object apply(final ResultSet rs, final int columnIndex) throws SQLException { return Boolean.valueOf(rs.getBoolean(columnIndex)); } } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandler.java index 4731452..2df55df 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/ByteColumnHandler.java @@ -23,12 +23,12 @@ import org.apache.commons.dbutils.ColumnHandler; public class ByteColumnHandler implements ColumnHandler { @Override - public boolean match(Class<?> propType) { + public boolean match(final Class<?> propType) { return propType.equals(Byte.TYPE) || propType.equals(Byte.class); } @Override - public Object apply(ResultSet rs, int columnIndex) throws SQLException { + public Object apply(final ResultSet rs, final int columnIndex) throws SQLException { return Byte.valueOf(rs.getByte(columnIndex)); } } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandler.java index dbfb58b..3cedb26 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/DoubleColumnHandler.java @@ -23,12 +23,12 @@ import org.apache.commons.dbutils.ColumnHandler; public class DoubleColumnHandler implements ColumnHandler { @Override - public boolean match(Class<?> propType) { + public boolean match(final Class<?> propType) { return propType.equals(Double.TYPE) || propType.equals(Double.class); } @Override - public Object apply(ResultSet rs, int columnIndex) throws SQLException { + public Object apply(final ResultSet rs, final int columnIndex) throws SQLException { return Double.valueOf(rs.getDouble(columnIndex)); } } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandler.java index 8f7edf1..b50045f 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/FloatColumnHandler.java @@ -23,12 +23,12 @@ import org.apache.commons.dbutils.ColumnHandler; public class FloatColumnHandler implements ColumnHandler { @Override - public boolean match(Class<?> propType) { + public boolean match(final Class<?> propType) { return propType.equals(Float.TYPE) || propType.equals(Float.class); } @Override - public Object apply(ResultSet rs, int columnIndex) throws SQLException { + public Object apply(final ResultSet rs, final int columnIndex) throws SQLException { return Float.valueOf(rs.getFloat(columnIndex)); } } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/columns/IntegerColumnHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/IntegerColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/IntegerColumnHandler.java index 7d7d00e..a803cff 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/columns/IntegerColumnHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/IntegerColumnHandler.java @@ -23,12 +23,12 @@ import org.apache.commons.dbutils.ColumnHandler; public class IntegerColumnHandler implements ColumnHandler { @Override - public boolean match(Class<?> propType) { + public boolean match(final Class<?> propType) { return propType.equals(Integer.TYPE) || propType.equals(Integer.class); } @Override - public Object apply(ResultSet rs, int columnIndex) throws SQLException { + public Object apply(final ResultSet rs, final int columnIndex) throws SQLException { return Integer.valueOf(rs.getInt(columnIndex)); } } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/columns/LongColumnHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/LongColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/LongColumnHandler.java index 75dec28..0cbaeb1 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/columns/LongColumnHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/LongColumnHandler.java @@ -23,12 +23,12 @@ import org.apache.commons.dbutils.ColumnHandler; public class LongColumnHandler implements ColumnHandler { @Override - public boolean match(Class<?> propType) { + public boolean match(final Class<?> propType) { return propType.equals(Long.TYPE) || propType.equals(Long.class); } @Override - public Object apply(ResultSet rs, int columnIndex) throws SQLException { + public Object apply(final ResultSet rs, final int columnIndex) throws SQLException { return Long.valueOf(rs.getLong(columnIndex)); } } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/columns/SQLXMLColumnHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/SQLXMLColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/SQLXMLColumnHandler.java index 19166fd..d02a14d 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/columns/SQLXMLColumnHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/SQLXMLColumnHandler.java @@ -24,12 +24,12 @@ import org.apache.commons.dbutils.ColumnHandler; public class SQLXMLColumnHandler implements ColumnHandler { @Override - public boolean match(Class<?> propType) { + public boolean match(final Class<?> propType) { return propType.equals(SQLXML.class); } @Override - public Object apply(ResultSet rs, int columnIndex) throws SQLException { + public Object apply(final ResultSet rs, final int columnIndex) throws SQLException { return rs.getSQLXML(columnIndex); } } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/columns/ShortColumnHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/ShortColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/ShortColumnHandler.java index 7ce36e4..27aecf8 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/columns/ShortColumnHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/ShortColumnHandler.java @@ -23,12 +23,12 @@ import org.apache.commons.dbutils.ColumnHandler; public class ShortColumnHandler implements ColumnHandler { @Override - public boolean match(Class<?> propType) { + public boolean match(final Class<?> propType) { return propType.equals(Short.TYPE) || propType.equals(Short.class); } @Override - public Object apply(ResultSet rs, int columnIndex) throws SQLException { + public Object apply(final ResultSet rs, final int columnIndex) throws SQLException { return Short.valueOf(rs.getShort(columnIndex)); } } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/columns/StringColumnHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/StringColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/StringColumnHandler.java index 6f07c78..dc68fe6 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/columns/StringColumnHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/StringColumnHandler.java @@ -23,12 +23,12 @@ import org.apache.commons.dbutils.ColumnHandler; public class StringColumnHandler implements ColumnHandler { @Override - public boolean match(Class<?> propType) { + public boolean match(final Class<?> propType) { return propType.equals(String.class); } @Override - public Object apply(ResultSet rs, int columnIndex) throws SQLException { + public Object apply(final ResultSet rs, final int columnIndex) throws SQLException { return rs.getString(columnIndex); } } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/columns/TimestampColumnHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/columns/TimestampColumnHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/columns/TimestampColumnHandler.java index 4e2195b..1d505e3 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/columns/TimestampColumnHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/columns/TimestampColumnHandler.java @@ -24,12 +24,12 @@ import org.apache.commons.dbutils.ColumnHandler; public class TimestampColumnHandler implements ColumnHandler { @Override - public boolean match(Class<?> propType) { + public boolean match(final Class<?> propType) { return propType.equals(Timestamp.class); } @Override - public Object apply(ResultSet rs, int columnIndex) throws SQLException { + public Object apply(final ResultSet rs, final int columnIndex) throws SQLException { return rs.getTimestamp(columnIndex); } } http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/properties/DatePropertyHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/properties/DatePropertyHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/properties/DatePropertyHandler.java index 9e623dd..3c83cb0 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/properties/DatePropertyHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/properties/DatePropertyHandler.java @@ -22,7 +22,7 @@ import org.apache.commons.dbutils.PropertyHandler; public class DatePropertyHandler implements PropertyHandler { @Override - public boolean match(Class<?> parameter, Object value) { + public boolean match(final Class<?> parameter, final Object value) { if (value instanceof java.util.Date) { final String targetType = parameter.getName(); if ("java.sql.Date".equals(targetType)) { @@ -40,7 +40,7 @@ public class DatePropertyHandler implements PropertyHandler { } @Override - public Object apply(Class<?> parameter, Object value) { + public Object apply(final Class<?> parameter, Object value) { final String targetType = parameter.getName(); if ("java.sql.Date".equals(targetType)) { value = new java.sql.Date(((java.util.Date) value).getTime()); http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/41e682d6/src/main/java/org/apache/commons/dbutils/handlers/properties/StringEnumPropertyHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils/handlers/properties/StringEnumPropertyHandler.java b/src/main/java/org/apache/commons/dbutils/handlers/properties/StringEnumPropertyHandler.java index 67e309f..bf3bdf5 100644 --- a/src/main/java/org/apache/commons/dbutils/handlers/properties/StringEnumPropertyHandler.java +++ b/src/main/java/org/apache/commons/dbutils/handlers/properties/StringEnumPropertyHandler.java @@ -20,12 +20,12 @@ import org.apache.commons.dbutils.PropertyHandler; public class StringEnumPropertyHandler implements PropertyHandler { @Override - public boolean match(Class<?> parameter, Object value) { + public boolean match(final Class<?> parameter, final Object value) { return value instanceof String && parameter.isEnum(); } @Override - public Object apply(Class<?> parameter, Object value) { + public Object apply(final Class<?> parameter, final Object value) { return Enum.valueOf(parameter.asSubclass(Enum.class), (String) value); } }
