This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch 1.X in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
commit 66cfe8787b0242f52085e1800e81789f16d835aa Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sat Aug 31 09:41:51 2024 -0400 No need to nest - Use multi-catch - Format method - Whitespace --- .../java/org/apache/commons/beanutils/BeanMap.java | 7 +- .../commons/beanutils/BeanificationTestCase.java | 33 +- .../beanutils/DynaBeanMapDecoratorTestCase.java | 8 +- .../commons/beanutils/DynaRowSetTestCase.java | 3 +- .../apache/commons/beanutils/TestResultSet.java | 379 ++++++--------------- .../locale/LocaleBeanificationTestCase.java | 21 +- 6 files changed, 127 insertions(+), 324 deletions(-) diff --git a/src/main/java/org/apache/commons/beanutils/BeanMap.java b/src/main/java/org/apache/commons/beanutils/BeanMap.java index 0a17e903..aef97ba9 100644 --- a/src/main/java/org/apache/commons/beanutils/BeanMap.java +++ b/src/main/java/org/apache/commons/beanutils/BeanMap.java @@ -445,12 +445,7 @@ public class BeanMap extends AbstractMap<Object, Object> implements Cloneable { } return new Object[] { value }; } - catch ( final InvocationTargetException e ) { - final IllegalArgumentException iae = new IllegalArgumentException(e.getMessage()); - BeanUtils.initCause(iae, e); - throw iae; - } - catch ( final InstantiationException e ) { + catch ( final InvocationTargetException | InstantiationException e ) { final IllegalArgumentException iae = new IllegalArgumentException(e.getMessage()); BeanUtils.initCause(iae, e); throw iae; diff --git a/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java index be3f0e66..7e544e47 100644 --- a/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java @@ -435,13 +435,12 @@ public class BeanificationTestCase extends TestCase { convertUtilsReference.get() == null) { break; - } else { - // create garbage: - @SuppressWarnings("unused") - final - byte[] b = new byte[bytz]; - bytz = bytz * 2; } + // create garbage: + @SuppressWarnings("unused") + final + byte[] b = new byte[bytz]; + bytz = bytz * 2; } } @@ -482,13 +481,12 @@ public class BeanificationTestCase extends TestCase { testReference.get() == null) { break; - } else { - // create garbage: - @SuppressWarnings("unused") - final - byte[] b = new byte[bytz]; - bytz = bytz * 2; } + // create garbage: + @SuppressWarnings("unused") + final + byte[] b = new byte[bytz]; + bytz = bytz * 2; } } @@ -517,13 +515,12 @@ public class BeanificationTestCase extends TestCase { if( reference.get() == null ) { break; - } else { - // create garbage: - @SuppressWarnings("unused") - final - byte[] b = new byte[bytz]; - bytz = bytz * 2; } + // create garbage: + @SuppressWarnings("unused") + final + byte[] b = new byte[bytz]; + bytz = bytz * 2; } } } diff --git a/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java b/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java index 79721599..af5ab1eb 100644 --- a/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/DynaBeanMapDecoratorTestCase.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -364,11 +363,10 @@ public class DynaBeanMapDecoratorTestCase extends TestCase { assertEquals("values size", values.length, collection.size()); - // Collection should be ordered in same sequence as properties - final Iterator<Object> iterator = collection.iterator(); int i = 0; - while (iterator.hasNext()) { - assertEquals("values("+i+")", values[i], iterator.next()); + // Collection should be ordered in same sequence as properties + for (final Object element : collection) { + assertEquals("values(" + i + ")", values[i], element); i++; } } diff --git a/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java b/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java index e8278068..9f14a0a4 100644 --- a/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/DynaRowSetTestCase.java @@ -102,9 +102,8 @@ public class DynaRowSetTestCase extends TestCase { } if (columnName.equals("timestampProperty")) { return CustomTimestamp.class.getName(); - } else { - return super.getColumnClassName(columnIndex); } + return super.getColumnClassName(columnIndex); } } diff --git a/src/test/java/org/apache/commons/beanutils/TestResultSet.java b/src/test/java/org/apache/commons/beanutils/TestResultSet.java index a3b1f194..58f60f4e 100644 --- a/src/test/java/org/apache/commons/beanutils/TestResultSet.java +++ b/src/test/java/org/apache/commons/beanutils/TestResultSet.java @@ -15,10 +15,8 @@ * limitations under the License. */ - package org.apache.commons.beanutils; - import java.io.InputStream; import java.io.Reader; import java.lang.reflect.InvocationHandler; @@ -41,18 +39,15 @@ import java.sql.Timestamp; import java.util.Calendar; import java.util.Map; - /** - * <p>Mock object that implements enough of <code>java.sql.ResultSet</code> - * to exercise the {@link ResultSetDynaClass} functionality.</p> + * <p> + * Mock object that implements enough of <code>java.sql.ResultSet</code> to exercise the {@link ResultSetDynaClass} functionality. + * </p> * */ public class TestResultSet implements InvocationHandler { - - - /** * Factory method for creating {@link ResultSet} proxies. * @@ -62,7 +57,6 @@ public class TestResultSet implements InvocationHandler { return TestResultSet.createProxy(new TestResultSet()); } - /** * Factory method for creating {@link ResultSet} proxies. * @@ -72,7 +66,7 @@ public class TestResultSet implements InvocationHandler { public static ResultSet createProxy(final InvocationHandler invocationHandler) { final ClassLoader classLoader = ResultSet.class.getClassLoader(); final Class<?>[] interfaces = new Class[] { ResultSet.class }; - return (ResultSet)Proxy.newProxyInstance(classLoader, interfaces, invocationHandler); + return (ResultSet) Proxy.newProxyInstance(classLoader, interfaces, invocationHandler); } /** @@ -114,18 +108,14 @@ public class TestResultSet implements InvocationHandler { throw new UnsupportedOperationException(); } - - public void beforeFirst() throws SQLException { throw new UnsupportedOperationException(); } - public void cancelRowUpdates() throws SQLException { throw new UnsupportedOperationException(); } - public void clearWarnings() throws SQLException { throw new UnsupportedOperationException(); } @@ -136,9 +126,9 @@ public class TestResultSet implements InvocationHandler { private String columnName(final Object arg) throws SQLException { if (arg instanceof Integer) { - return resultSetMetaData.getColumnName(((Integer)arg).intValue()); + return resultSetMetaData.getColumnName(((Integer) arg).intValue()); } - return (String)arg; + return (String) arg; } public void deleteRow() throws SQLException { @@ -149,80 +139,62 @@ public class TestResultSet implements InvocationHandler { throw new UnsupportedOperationException(); } - public boolean first() throws SQLException { throw new UnsupportedOperationException(); } - - - public Array getArray(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public Array getArray(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public InputStream getAsciiStream(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public InputStream getAsciiStream(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public BigDecimal getBigDecimal(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - /** @deprecated */ @Deprecated - public BigDecimal getBigDecimal(final int columnIndex, final int scale) - throws SQLException { + public BigDecimal getBigDecimal(final int columnIndex, final int scale) throws SQLException { throw new UnsupportedOperationException(); } - public BigDecimal getBigDecimal(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - /** @deprecated */ @Deprecated - public BigDecimal getBigDecimal(final String columnName, final int scale) - throws SQLException { + public BigDecimal getBigDecimal(final String columnName, final int scale) throws SQLException { throw new UnsupportedOperationException(); } - public InputStream getBinaryStream(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public InputStream getBinaryStream(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public Blob getBlob(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public Blob getBlob(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public boolean getBoolean(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } @@ -231,145 +203,114 @@ public class TestResultSet implements InvocationHandler { throw new UnsupportedOperationException(); } - public byte getByte(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public byte getByte(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public byte[] getBytes(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public byte[] getBytes(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - - public Reader getCharacterStream(final int columnIndex) - throws SQLException { + public Reader getCharacterStream(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public Reader getCharacterStream(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public Clob getClob(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public Clob getClob(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public int getConcurrency() throws SQLException { throw new UnsupportedOperationException(); } - public String getCursorName() throws SQLException { throw new UnsupportedOperationException(); } - public Date getDate(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public Date getDate(final int columnIndex, final Calendar cal) throws SQLException { throw new UnsupportedOperationException(); } - public Date getDate(final String columnName) throws SQLException { return new Date(timestamp); } - public Date getDate(final String columnName, final Calendar cal) throws SQLException { throw new UnsupportedOperationException(); } - public double getDouble(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public double getDouble(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public int getFetchDirection() throws SQLException { throw new UnsupportedOperationException(); } - public int getFetchSize() throws SQLException { throw new UnsupportedOperationException(); } - public float getFloat(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public float getFloat(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - - - public int getInt(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public int getInt(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public long getLong(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public long getLong(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public ResultSetMetaData getMetaData() throws SQLException { return resultSetMetaData; } - public Object getObject(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public Object getObject(final int columnIndex, final Map<?, ?> map) throws SQLException { throw new UnsupportedOperationException(); } - public Object getObject(final String columnName) throws SQLException { if (row > 5) { throw new SQLException("No current row"); @@ -380,171 +321,151 @@ public class TestResultSet implements InvocationHandler { if ("booleanProperty".equals(columnName)) { if (row % 2 == 0) { return Boolean.TRUE; - } else { - return Boolean.FALSE; } - } else if ("byteProperty".equals(columnName)) { + return Boolean.FALSE; + } + if ("byteProperty".equals(columnName)) { return Byte.valueOf((byte) row); - } else if ("dateProperty".equals(columnName)) { + } + if ("dateProperty".equals(columnName)) { return new Date(timestamp); - } else if ("doubleProperty".equals(columnName)) { + } + if ("doubleProperty".equals(columnName)) { return Double.valueOf(321.0); - } else if ("floatProperty".equals(columnName)) { + } + if ("floatProperty".equals(columnName)) { return Float.valueOf((float) 123.0); - } else if ("intProperty".equals(columnName)) { + } + if ("intProperty".equals(columnName)) { return Integer.valueOf(100 + row); - } else if ("longProperty".equals(columnName)) { + } + if ("longProperty".equals(columnName)) { return Long.valueOf(200 + row); - } else if ("nullProperty".equals(columnName)) { + } + if ("nullProperty".equals(columnName)) { return null; - } else if ("shortProperty".equals(columnName)) { + } + if ("shortProperty".equals(columnName)) { return Short.valueOf((short) (300 + row)); - } else if ("stringProperty".equals(columnName)) { + } + if ("stringProperty".equals(columnName)) { return "This is a string"; - } else if ("timeProperty".equals(columnName)) { + } + if ("timeProperty".equals(columnName)) { return new Time(timestamp); - } else if ("timestampProperty".equals(columnName)) { + } + if ("timestampProperty".equals(columnName)) { return new Timestamp(timestamp); - } else { - throw new SQLException("Unknown column name " + columnName); } + throw new SQLException("Unknown column name " + columnName); } - public Object getObject(final String columnName, final Map<?, ?> map) throws SQLException { throw new UnsupportedOperationException(); } - public Ref getRef(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public Ref getRef(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public int getRow() throws SQLException { throw new UnsupportedOperationException(); } - public short getShort(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public short getShort(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public Statement getStatement() throws SQLException { throw new UnsupportedOperationException(); } - public String getString(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public String getString(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public Time getTime(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public Time getTime(final int columnIndex, final Calendar cal) throws SQLException { throw new UnsupportedOperationException(); } - public Time getTime(final String columnName) throws SQLException { return new Time(timestamp); } - public Time getTime(final String columnName, final Calendar cal) throws SQLException { throw new UnsupportedOperationException(); } - public Timestamp getTimestamp(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - - public Timestamp getTimestamp(final int columnIndex, final Calendar cal) - throws SQLException { + public Timestamp getTimestamp(final int columnIndex, final Calendar cal) throws SQLException { throw new UnsupportedOperationException(); } - public Timestamp getTimestamp(final String columnName) throws SQLException { return new Timestamp(timestamp); } - - - public Timestamp getTimestamp(final String columnName, final Calendar cal) - throws SQLException { + public Timestamp getTimestamp(final String columnName, final Calendar cal) throws SQLException { throw new UnsupportedOperationException(); } - public int getType() throws SQLException { throw new UnsupportedOperationException(); } - /** @deprecated */ @Deprecated public InputStream getUnicodeStream(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - - /** @deprecated */ @Deprecated public InputStream getUnicodeStream(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public URL getURL(final int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } - public URL getURL(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - public SQLWarning getWarnings() throws SQLException { throw new UnsupportedOperationException(); } - public void insertRow() throws SQLException { throw new UnsupportedOperationException(); } - /** * Handles method invocation on the ResultSet proxy. * - * @param proxy The proxy ResultSet object + * @param proxy The proxy ResultSet object * @param method the method being invoked - * @param args The method arguments + * @param args The method arguments * @return The result of invoking the method. * @throws Throwable if an error occurs. */ @@ -553,62 +474,61 @@ public class TestResultSet implements InvocationHandler { final String methodName = method.getName(); if ("close".equals(methodName)) { return null; - } if ("getMetaData".equals(methodName)) { + } + if ("getMetaData".equals(methodName)) { return getMetaData(); - } if ("getObject".equals(methodName)) { + } + if ("getObject".equals(methodName)) { return getObject(columnName(args[0])); - } if ("getDate".equals(methodName)) { + } + if ("getDate".equals(methodName)) { return getDate(columnName(args[0])); - } if ("getTime".equals(methodName)) { + } + if ("getTime".equals(methodName)) { return getTime(columnName(args[0])); - } if ("getTimestamp".equals(methodName)) { + } + if ("getTimestamp".equals(methodName)) { return getTimestamp(columnName(args[0])); - } if ("next".equals(methodName)) { + } + if ("next".equals(methodName)) { return next() ? Boolean.TRUE : Boolean.FALSE; - } if ("updateObject".equals(methodName)) { - updateObject((String)args[0], args[1]); + } + if ("updateObject".equals(methodName)) { + updateObject((String) args[0], args[1]); return null; } throw new UnsupportedOperationException(methodName + " not implemented"); } - public boolean isAfterLast() throws SQLException { throw new UnsupportedOperationException(); } - public boolean isBeforeFirst() throws SQLException { throw new UnsupportedOperationException(); } - public boolean isFirst() throws SQLException { throw new UnsupportedOperationException(); } - public boolean isLast() throws SQLException { throw new UnsupportedOperationException(); } - public boolean last() throws SQLException { throw new UnsupportedOperationException(); } - public void moveToCurrentRow() throws SQLException { throw new UnsupportedOperationException(); } - public void moveToInsertRow() throws SQLException { throw new UnsupportedOperationException(); } - public boolean next() throws SQLException { if (row++ < 5) { return true; @@ -616,334 +536,231 @@ public class TestResultSet implements InvocationHandler { return false; } - public boolean previous() throws SQLException { throw new UnsupportedOperationException(); } - public void refreshRow() throws SQLException { throw new UnsupportedOperationException(); } - public boolean relative(final int rows) throws SQLException { throw new UnsupportedOperationException(); } - public boolean rowDeleted() throws SQLException { throw new UnsupportedOperationException(); } - public boolean rowInserted() throws SQLException { throw new UnsupportedOperationException(); } - public boolean rowUpdated() throws SQLException { throw new UnsupportedOperationException(); } - public void setFetchDirection(final int direction) throws SQLException { throw new UnsupportedOperationException(); } - public void setFetchSize(final int size) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateArray(final int columnPosition, final Array x) - throws SQLException { + public void updateArray(final int columnPosition, final Array x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateArray(final String columnName, final Array x) - throws SQLException { + public void updateArray(final String columnName, final Array x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateAsciiStream(final int columnPosition, final InputStream x, final int len) - throws SQLException { + public void updateAsciiStream(final int columnPosition, final InputStream x, final int len) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateAsciiStream(final String columnName, final InputStream x, final int len) - throws SQLException { + public void updateAsciiStream(final String columnName, final InputStream x, final int len) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateBigDecimal(final int columnPosition, final BigDecimal x) - throws SQLException { + public void updateBigDecimal(final int columnPosition, final BigDecimal x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateBigDecimal(final String columnName, final BigDecimal x) - throws SQLException { + public void updateBigDecimal(final String columnName, final BigDecimal x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateBinaryStream(final int columnPosition, final InputStream x, final int len) - throws SQLException { + public void updateBinaryStream(final int columnPosition, final InputStream x, final int len) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateBinaryStream(final String columnName, final InputStream x, final int len) - throws SQLException { + public void updateBinaryStream(final String columnName, final InputStream x, final int len) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateBlob(final int columnPosition, final Blob x) - throws SQLException { + public void updateBlob(final int columnPosition, final Blob x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateBlob(final String columnName, final Blob x) - throws SQLException { + public void updateBlob(final String columnName, final Blob x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateBoolean(final int columnPosition, final boolean x) - throws SQLException { + public void updateBoolean(final int columnPosition, final boolean x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateBoolean(final String columnName, final boolean x) - throws SQLException { + public void updateBoolean(final String columnName, final boolean x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateByte(final int columnPosition, final byte x) - throws SQLException { + public void updateByte(final int columnPosition, final byte x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateByte(final String columnName, final byte x) - throws SQLException { + public void updateByte(final String columnName, final byte x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateBytes(final int columnPosition, final byte x[]) - throws SQLException { + public void updateBytes(final int columnPosition, final byte x[]) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateBytes(final String columnName, final byte x[]) - throws SQLException { + public void updateBytes(final String columnName, final byte x[]) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateCharacterStream(final int columnPosition, final Reader x, final int len) - throws SQLException { + public void updateCharacterStream(final int columnPosition, final Reader x, final int len) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateCharacterStream(final String columnName, final Reader x, final int len) - throws SQLException { + public void updateCharacterStream(final String columnName, final Reader x, final int len) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateClob(final int columnPosition, final Clob x) - throws SQLException { + public void updateClob(final int columnPosition, final Clob x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateClob(final String columnName, final Clob x) - throws SQLException { + public void updateClob(final String columnName, final Clob x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateDate(final int columnPosition, final Date x) - throws SQLException { + public void updateDate(final int columnPosition, final Date x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateDate(final String columnName, final Date x) - throws SQLException { + public void updateDate(final String columnName, final Date x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateDouble(final int columnPosition, final double x) - throws SQLException { + public void updateDouble(final int columnPosition, final double x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateDouble(final String columnName, final double x) - throws SQLException { + public void updateDouble(final String columnName, final double x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateFloat(final int columnPosition, final float x) - throws SQLException { + public void updateFloat(final int columnPosition, final float x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateFloat(final String columnName, final float x) - throws SQLException { + public void updateFloat(final String columnName, final float x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateInt(final int columnPosition, final int x) - throws SQLException { + public void updateInt(final int columnPosition, final int x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateInt(final String columnName, final int x) - throws SQLException { + public void updateInt(final String columnName, final int x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateLong(final int columnPosition, final long x) - throws SQLException { + public void updateLong(final int columnPosition, final long x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateLong(final String columnName, final long x) - throws SQLException { + public void updateLong(final String columnName, final long x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateNull(final int columnPosition) - throws SQLException { + public void updateNull(final int columnPosition) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateNull(final String columnName) - throws SQLException { + public void updateNull(final String columnName) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateObject(final int columnPosition, final Object x) - throws SQLException { + public void updateObject(final int columnPosition, final Object x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateObject(final int columnPosition, final Object x, final int scale) - throws SQLException { + public void updateObject(final int columnPosition, final Object x, final int scale) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateObject(final String columnName, final Object x) - throws SQLException { + public void updateObject(final String columnName, final Object x) throws SQLException { if (row > 5) { throw new SQLException("No current row"); } // FIXME - updateObject() } - - public void updateObject(final String columnName, final Object x, final int scale) - throws SQLException { + public void updateObject(final String columnName, final Object x, final int scale) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateRef(final int columnPosition, final Ref x) - throws SQLException { + public void updateRef(final int columnPosition, final Ref x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateRef(final String columnName, final Ref x) - throws SQLException { + public void updateRef(final String columnName, final Ref x) throws SQLException { throw new UnsupportedOperationException(); } - public void updateRow() throws SQLException { throw new UnsupportedOperationException(); } - - public void updateShort(final int columnPosition, final short x) - throws SQLException { + public void updateShort(final int columnPosition, final short x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateShort(final String columnName, final short x) - throws SQLException { + public void updateShort(final String columnName, final short x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateString(final int columnPosition, final String x) - throws SQLException { + public void updateString(final int columnPosition, final String x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateString(final String columnName, final String x) - throws SQLException { + public void updateString(final String columnName, final String x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateTime(final int columnPosition, final Time x) - throws SQLException { + public void updateTime(final int columnPosition, final Time x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateTime(final String columnName, final Time x) - throws SQLException { + public void updateTime(final String columnName, final Time x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateTimestamp(final int columnPosition, final Timestamp x) - throws SQLException { + public void updateTimestamp(final int columnPosition, final Timestamp x) throws SQLException { throw new UnsupportedOperationException(); } - - public void updateTimestamp(final String columnName, final Timestamp x) - throws SQLException { + public void updateTimestamp(final String columnName, final Timestamp x) throws SQLException { throw new UnsupportedOperationException(); } - public boolean wasNull() throws SQLException { throw new UnsupportedOperationException(); } - } diff --git a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java index 15747478..275ce92a 100644 --- a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java @@ -476,11 +476,10 @@ public class LocaleBeanificationTestCase extends TestCase { convertUtilsReference.get() == null) { break; - } else { - // create garbage: - final byte[] b = new byte[bytz]; - bytz = bytz * 2; } + // create garbage: + final byte[] b = new byte[bytz]; + bytz = bytz * 2; } } @@ -521,11 +520,10 @@ public class LocaleBeanificationTestCase extends TestCase { testReference.get() == null) { break; - } else { - // create garbage: - final byte[] b = new byte[bytz]; - bytz = bytz * 2; } + // create garbage: + final byte[] b = new byte[bytz]; + bytz = bytz * 2; } } @@ -553,11 +551,10 @@ public class LocaleBeanificationTestCase extends TestCase { if( reference.get() == null ) { break; - } else { - // create garbage: - final byte[] b = new byte[bytz]; - bytz = bytz * 2; } + // create garbage: + final byte[] b = new byte[bytz]; + bytz = bytz * 2; } } }