You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2016/05/04 14:17:58 UTC
svn commit: r1742289 [3/3] - in /db/derby/code/trunk/java:
client/org/apache/derby/client/am/
testing/org/apache/derbyTesting/functionTests/harness/
testing/org/apache/derbyTesting/functionTests/tests/compatibility/
testing/org/apache/derbyTesting/func...
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SGVetter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SGVetter.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SGVetter.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SGVetter.java Wed May 4 14:17:57 2016
@@ -121,14 +121,14 @@ public class SGVetter
advance();
- return new Long( retval.longValue() );
+ return retval.longValue();
}
/** Get the upper bound */
public Long getUpperBound()
{
if ( _upperBound == null ) { return null; }
- else { return new Long( _upperBound.longValue() ); }
+ else { return _upperBound.longValue(); }
}
///////////////////////////////////////////////////////////////////////////////////
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceGeneratorTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceGeneratorTest.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceGeneratorTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceGeneratorTest.java Wed May 4 14:17:57 2016
@@ -179,7 +179,7 @@ public class SequenceGeneratorTest exte
T_SequenceUpdater updater;
updater = new T_SequenceUpdater
- ( new Long( Integer.MIN_VALUE ), true, 1L, (long) Integer.MAX_VALUE, (long) Integer.MIN_VALUE, (long) Integer.MIN_VALUE );
+ ( (long)Integer.MIN_VALUE, true, 1L, (long) Integer.MAX_VALUE, (long) Integer.MIN_VALUE, (long) Integer.MIN_VALUE );
assertEquals( -2147483648L, updater.getValueOnDisk().longValue() );
@@ -292,9 +292,9 @@ public class SequenceGeneratorTest exte
if ( _fullDebug) { println( "stepSize = " + stepSize + " and firstValue = " + firstValue + " and canCycle = " + canCycle ); }
SGVetter vetter = new SGVetter
- ( new Long( firstValue ), canCycle, stepSize, maxValue, minValue, restartValue, ALLOCATION_COUNT );
+ ( firstValue, canCycle, stepSize, maxValue, minValue, restartValue, ALLOCATION_COUNT );
T_SequenceUpdater updater = new T_SequenceUpdater
- ( new Long( firstValue ), canCycle, stepSize, maxValue, minValue, restartValue );
+ ( firstValue, canCycle, stepSize, maxValue, minValue, restartValue );
if ( _fullDebug) { println( "" ); }
for ( long i = 0; i < bumps; i++ ) { vetBump( vetter, updater ); }
@@ -393,9 +393,9 @@ public class SequenceGeneratorTest exte
}
SGVetter vetter = new SGVetter
- ( new Long( firstValue ), false, stepSize, maxValue, minValue, restartValue, ALLOCATION_COUNT );
+ ( firstValue, false, stepSize, maxValue, minValue, restartValue, ALLOCATION_COUNT );
T_SequenceUpdater updater = new T_SequenceUpdater
- ( new Long( firstValue ), false, stepSize, maxValue, minValue, restartValue );
+ ( firstValue, false, stepSize, maxValue, minValue, restartValue );
// make sure we can survive trying to bust the cycle more than once
long extraBumps = bumps + 2;
@@ -484,7 +484,7 @@ public class SequenceGeneratorTest exte
long stepSize = (Long.MAX_VALUE / ALLOCATION_COUNT) * 3;
updater = new T_SequenceUpdater
- ( new Long( Long.MIN_VALUE ), true, stepSize, (long) Long.MAX_VALUE, (long) Long.MIN_VALUE, (long) Long.MIN_VALUE );
+ ( Long.MIN_VALUE, true, stepSize, (long) Long.MAX_VALUE, (long) Long.MIN_VALUE, (long) Long.MIN_VALUE );
long nextValue = updater.getCurrentValueAndAdvance();
long currentValueOnDisk = updater.getValueOnDisk().longValue();
@@ -502,7 +502,7 @@ public class SequenceGeneratorTest exte
private void vetBigStep( long maxValue, long minValue )
throws Exception
{
- Long firstValue = new Long( minValue );
+ Long firstValue = minValue;
long restartValue = minValue;
long stepSize = maxValue - 1;
boolean canCycle = true;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableFunctionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableFunctionTest.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableFunctionTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TableFunctionTest.java Wed May 4 14:17:57 2016
@@ -253,42 +253,42 @@ public class TableFunctionTest extends B
private static final Integer FUNCTION_RETURNS_TABLE = DatabaseMetaData.functionReturnsTable;
- private static final Integer JDBC_TYPE_OTHER = new Integer( Types.OTHER );
- private static final Integer JDBC_TYPE_INT = new Integer( Types.INTEGER );
- private static final Integer JDBC_TYPE_VARCHAR = new Integer( Types.VARCHAR );
- private static final Integer JDBC_TYPE_BIGINT = new Integer( Types.BIGINT );
- private static final Integer JDBC_TYPE_BLOB = new Integer( Types.BLOB );
- private static final Integer JDBC_TYPE_CHAR = new Integer( Types.CHAR );
- private static final Integer JDBC_TYPE_CLOB = new Integer( Types.CLOB );
- private static final Integer JDBC_TYPE_DATE = new Integer( Types.DATE );
- private static final Integer JDBC_TYPE_DECIMAL = new Integer( Types.DECIMAL );
- private static final Integer JDBC_TYPE_DOUBLE = new Integer( Types.DOUBLE );
- private static final Integer JDBC_TYPE_REAL = new Integer( Types.REAL );
- private static final Integer JDBC_TYPE_NUMERIC = new Integer( Types.NUMERIC );
- private static final Integer JDBC_TYPE_SMALLINT = new Integer( Types.SMALLINT );
- private static final Integer JDBC_TYPE_TIME = new Integer( Types.TIME );
- private static final Integer JDBC_TYPE_TIMESTAMP = new Integer( Types.TIMESTAMP );
- private static final Integer JDBC_TYPE_BINARY = new Integer( Types.BINARY );
- private static final Integer JDBC_TYPE_LONGVARBINARY = new Integer( Types.LONGVARBINARY );
- private static final Integer JDBC_TYPE_LONGVARCHAR = new Integer( Types.LONGVARCHAR );
- private static final Integer JDBC_TYPE_VARBINARY = new Integer( Types.VARBINARY );
- private static final Integer JDBC_TYPE_BOOLEAN = new Integer( Types.BOOLEAN );
-
- private static final Integer PRECISION_NONE = new Integer( 0 );
- private static final Integer PRECISION_INTEGER = new Integer( 10 );
- private static final Integer PRECISION_BIGINT = new Integer( 19 );
- private static final Integer PRECISION_MAX = new Integer( 2147483647 );
-
- private static final Integer LENGTH_UNDEFINED = new Integer( -1 );
- private static final Integer LENGTH_INTEGER = new Integer( 4 );
- private static final Integer LENGTH_BIGINT = new Integer( 40 );
- private static final Integer LENGTH_MAX = new Integer( 2147483647 );
+ private static final Integer JDBC_TYPE_OTHER = Types.OTHER ;
+ private static final Integer JDBC_TYPE_INT = Types.INTEGER ;
+ private static final Integer JDBC_TYPE_VARCHAR = Types.VARCHAR ;
+ private static final Integer JDBC_TYPE_BIGINT = Types.BIGINT ;
+ private static final Integer JDBC_TYPE_BLOB = Types.BLOB ;
+ private static final Integer JDBC_TYPE_CHAR = Types.CHAR ;
+ private static final Integer JDBC_TYPE_CLOB = Types.CLOB ;
+ private static final Integer JDBC_TYPE_DATE = Types.DATE ;
+ private static final Integer JDBC_TYPE_DECIMAL = Types.DECIMAL ;
+ private static final Integer JDBC_TYPE_DOUBLE = Types.DOUBLE ;
+ private static final Integer JDBC_TYPE_REAL = Types.REAL ;
+ private static final Integer JDBC_TYPE_NUMERIC = Types.NUMERIC ;
+ private static final Integer JDBC_TYPE_SMALLINT = Types.SMALLINT ;
+ private static final Integer JDBC_TYPE_TIME = Types.TIME ;
+ private static final Integer JDBC_TYPE_TIMESTAMP = Types.TIMESTAMP ;
+ private static final Integer JDBC_TYPE_BINARY = Types.BINARY ;
+ private static final Integer JDBC_TYPE_LONGVARBINARY = Types.LONGVARBINARY ;
+ private static final Integer JDBC_TYPE_LONGVARCHAR = Types.LONGVARCHAR ;
+ private static final Integer JDBC_TYPE_VARBINARY = Types.VARBINARY ;
+ private static final Integer JDBC_TYPE_BOOLEAN = Types.BOOLEAN ;
+
+ private static final Integer PRECISION_NONE = 0 ;
+ private static final Integer PRECISION_INTEGER = 10 ;
+ private static final Integer PRECISION_BIGINT = 19 ;
+ private static final Integer PRECISION_MAX = 2147483647 ;
+
+ private static final Integer LENGTH_UNDEFINED = -1 ;
+ private static final Integer LENGTH_INTEGER = 4 ;
+ private static final Integer LENGTH_BIGINT = 40 ;
+ private static final Integer LENGTH_MAX = 2147483647 ;
private static final Integer SCALE_UNDEFINED = null;
- private static final Integer SCALE_INTEGER = new Integer( 0 );
+ private static final Integer SCALE_INTEGER = 0 ;
private static final Integer RADIX_UNDEFINED = null;
- private static final Integer RADIX_INTEGER = new Integer( 10 );
+ private static final Integer RADIX_INTEGER = 10 ;
private static final Object NO_CATALOG = null;
private static final String RETURN_VALUE_NAME = "";
@@ -297,18 +297,18 @@ public class TableFunctionTest extends B
private static final Object UNDEFINED_CHAR_OCTET_LENGTH = null;
private static final String IS_NULLABLE = "YES";
- private static final Integer ROW_ORDER_RETURN_VALUE = new Integer( -1 );
- private static final Integer ROW_ORDER_1 = new Integer( 0 );
- private static final Integer ROW_ORDER_2 = new Integer( 1 );
-
- private static final Integer POSITION_RETURN_VALUE = new Integer( 0 );
- private static final Integer POSITION_ARG_1 = new Integer( 1 );
- private static final Integer POSITION_ARG_2 = new Integer( 2 );
-
- private static final Integer ARG_COUNT_0 = new Integer( 0 );
- private static final Integer ARG_COUNT_1 = new Integer( 1 );
- private static final Integer ARG_COUNT_2 = new Integer( 2 );
- private static final Integer ARG_COUNT_3 = new Integer( 3 );
+ private static final Integer ROW_ORDER_RETURN_VALUE = -1 ;
+ private static final Integer ROW_ORDER_1 = 0 ;
+ private static final Integer ROW_ORDER_2 = 1 ;
+
+ private static final Integer POSITION_RETURN_VALUE = 0 ;
+ private static final Integer POSITION_ARG_1 = 1 ;
+ private static final Integer POSITION_ARG_2 = 2 ;
+
+ private static final Integer ARG_COUNT_0 = 0 ;
+ private static final Integer ARG_COUNT_1 = 1 ;
+ private static final Integer ARG_COUNT_2 = 2 ;
+ private static final Integer ARG_COUNT_3 = 3 ;
private static final JDBC.GeneratedId GENERIC_NAME = new JDBC.GeneratedId();
@@ -334,7 +334,7 @@ public class TableFunctionTest extends B
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 1 ), // ORDINAL_POSITION
+ 1 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_0,
@@ -348,14 +348,14 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_VARCHAR,
"VARCHAR",
- new Integer( 10 ), // PRECISION
- new Integer( 20 ), // LENGTH
+ 10 , // PRECISION
+ 20 , // LENGTH
SCALE_UNDEFINED,
RADIX_UNDEFINED,
ALLOWS_NULLS,
EMPTY_REMARKS,
- new Integer( 20 ), // CHAR_OCTET_LENGTH
- new Integer( 2 ), // ORDINAL_POSITION
+ 20 , // CHAR_OCTET_LENGTH
+ 2 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_0,
@@ -399,13 +399,13 @@ public class TableFunctionTest extends B
FUNCTION_COLUMN_IN,
JDBC_TYPE_VARCHAR,
"VARCHAR",
- new Integer( 10 ), // PRECISION
- new Integer( 20 ), // LENGTH
+ 10 , // PRECISION
+ 20 , // LENGTH
SCALE_UNDEFINED,
RADIX_UNDEFINED,
ALLOWS_NULLS,
EMPTY_REMARKS,
- new Integer( 20 ), // CHAR_OCTET_LENGTH
+ 20 , // CHAR_OCTET_LENGTH
POSITION_ARG_2,
IS_NULLABLE,
GENERIC_NAME,
@@ -428,11 +428,11 @@ public class TableFunctionTest extends B
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 1 ), // ORDINAL_POSITION
+ 1 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 2 )
+ 2
},
{
NO_CATALOG,
@@ -449,11 +449,11 @@ public class TableFunctionTest extends B
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 2 ), // ORDINAL_POSITION
+ 2 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 3 )
+ 3
},
{
NO_CATALOG,
@@ -463,18 +463,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_CHAR,
"CHAR",
- new Integer( 10 ) , // PRECISION
- new Integer( 20 ), // LENGTH
+ 10 , // PRECISION
+ 20 , // LENGTH
SCALE_UNDEFINED,
RADIX_UNDEFINED,
ALLOWS_NULLS,
EMPTY_REMARKS,
- new Integer( 20 ), // CHAR_OCTET_LENGTH
- new Integer( 3 ), // ORDINAL_POSITION
+ 20 , // CHAR_OCTET_LENGTH
+ 3 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 4 )
+ 4
},
{
NO_CATALOG,
@@ -484,18 +484,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_BINARY,
"CHAR () FOR BIT DATA",
- new Integer( 10 ) , // PRECISION
- new Integer( 10 ), // LENGTH
+ 10 , // PRECISION
+ 10 , // LENGTH
SCALE_UNDEFINED,
RADIX_UNDEFINED,
ALLOWS_NULLS,
EMPTY_REMARKS,
- new Integer( 10 ), // CHAR_OCTET_LENGTH
- new Integer( 4 ), // ORDINAL_POSITION
+ 10 , // CHAR_OCTET_LENGTH
+ 4 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 5 )
+ 5
},
{
NO_CATALOG,
@@ -512,11 +512,11 @@ public class TableFunctionTest extends B
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 5 ), // ORDINAL_POSITION
+ 5 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 6 )
+ 6
},
{
NO_CATALOG,
@@ -526,18 +526,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_DATE,
"DATE",
- new Integer( 10 ) , // PRECISION
- new Integer( 6 ), // LENGTH
- new Integer( 0 ), // SCALE
- new Integer( 10 ), // RADIX
+ 10 , // PRECISION
+ 6 , // LENGTH
+ 0 , // SCALE
+ 10 , // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 6 ), // ORDINAL_POSITION
+ 6 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 7 )
+ 7
},
{
NO_CATALOG,
@@ -547,18 +547,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_DECIMAL,
"DECIMAL",
- new Integer( 5 ) , // PRECISION
- new Integer( 14 ), // LENGTH
- new Integer( 0 ), // SCALE
- new Integer( 10 ), // RADIX
+ 5 , // PRECISION
+ 14 , // LENGTH
+ 0 , // SCALE
+ 10 , // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 7 ), // ORDINAL_POSITION
+ 7 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 8 )
+ 8
},
{
NO_CATALOG,
@@ -568,18 +568,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_DOUBLE,
"DOUBLE",
- new Integer( 52 ) , // PRECISION
- new Integer( 8 ), // LENGTH
+ 52 , // PRECISION
+ 8 , // LENGTH
SCALE_UNDEFINED, // SCALE
- new Integer( 2 ), // RADIX
+ 2 , // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 8 ), // ORDINAL_POSITION
+ 8 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 9 )
+ 9
},
{
NO_CATALOG,
@@ -589,18 +589,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_DOUBLE,
"DOUBLE",
- new Integer( 52 ) , // PRECISION
- new Integer( 8 ), // LENGTH
+ 52 , // PRECISION
+ 8 , // LENGTH
SCALE_UNDEFINED, // SCALE
- new Integer( 2 ), // RADIX
+ 2 , // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 9 ), // ORDINAL_POSITION
+ 9 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 10 )
+ 10
},
{
NO_CATALOG,
@@ -610,18 +610,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_REAL,
"REAL",
- new Integer( 23 ) , // PRECISION
- new Integer( 4 ), // LENGTH
+ 23 , // PRECISION
+ 4 , // LENGTH
SCALE_UNDEFINED, // SCALE
- new Integer( 2 ), // RADIX
+ 2 , // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 10 ), // ORDINAL_POSITION
+ 10 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 11 )
+ 11
},
{
NO_CATALOG,
@@ -631,18 +631,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_DOUBLE,
"DOUBLE",
- new Integer( 52 ) , // PRECISION
- new Integer( 8 ), // LENGTH
+ 52 , // PRECISION
+ 8 , // LENGTH
SCALE_UNDEFINED, // SCALE
- new Integer( 2 ), // RADIX
+ 2 , // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 11 ), // ORDINAL_POSITION
+ 11 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 12 )
+ 12
},
{
NO_CATALOG,
@@ -659,11 +659,11 @@ public class TableFunctionTest extends B
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 12 ), // ORDINAL_POSITION
+ 12 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 13 )
+ 13
},
{
NO_CATALOG,
@@ -673,18 +673,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_LONGVARCHAR,
"LONG VARCHAR",
- new Integer( 32700 ), // PRECISION
- new Integer( 65400 ), // LENGTH
+ 32700 , // PRECISION
+ 65400 , // LENGTH
SCALE_UNDEFINED, // SCALE
RADIX_UNDEFINED, // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 13 ), // ORDINAL_POSITION
+ 13 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 14 )
+ 14
},
{
NO_CATALOG,
@@ -694,18 +694,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_LONGVARBINARY,
"LONG VARCHAR FOR BIT DATA",
- new Integer( 32700 ), // PRECISION
- new Integer( 32700 ), // LENGTH
+ 32700 , // PRECISION
+ 32700 , // LENGTH
SCALE_UNDEFINED, // SCALE
RADIX_UNDEFINED, // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 14 ), // ORDINAL_POSITION
+ 14 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 15 )
+ 15
},
{
NO_CATALOG,
@@ -715,18 +715,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_NUMERIC,
"NUMERIC",
- new Integer( 5 ), // PRECISION
- new Integer( 14 ), // LENGTH
- new Integer( 0 ), // SCALE
- new Integer( 10 ), // RADIX
+ 5 , // PRECISION
+ 14 , // LENGTH
+ 0 , // SCALE
+ 10 , // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 15 ), // ORDINAL_POSITION
+ 15 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 16 )
+ 16
},
{
NO_CATALOG,
@@ -736,18 +736,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_REAL,
"REAL",
- new Integer( 23 ), // PRECISION
- new Integer( 4 ), // LENGTH
+ 23 , // PRECISION
+ 4 , // LENGTH
SCALE_UNDEFINED, // SCALE
- new Integer( 2 ), // RADIX
+ 2 , // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 16 ), // ORDINAL_POSITION
+ 16 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 17 )
+ 17
},
{
NO_CATALOG,
@@ -757,18 +757,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_SMALLINT,
"SMALLINT",
- new Integer( 5 ), // PRECISION
- new Integer( 2 ), // LENGTH
+ 5 , // PRECISION
+ 2 , // LENGTH
SCALE_INTEGER, // SCALE
RADIX_INTEGER, // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 17 ), // ORDINAL_POSITION
+ 17 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 18 )
+ 18
},
{
NO_CATALOG,
@@ -778,18 +778,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_TIME,
"TIME",
- new Integer( 8 ), // PRECISION
- new Integer( 6 ), // LENGTH
+ 8 , // PRECISION
+ 6 , // LENGTH
SCALE_INTEGER, // SCALE
RADIX_INTEGER, // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 18 ), // ORDINAL_POSITION
+ 18 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 19 )
+ 19
},
{
NO_CATALOG,
@@ -799,18 +799,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_TIMESTAMP,
"TIMESTAMP",
- new Integer( 29 ), // PRECISION
- new Integer( 16 ), // LENGTH
- new Integer( 9 ), // SCALE
+ 29 , // PRECISION
+ 16 , // LENGTH
+ 9 , // SCALE
RADIX_INTEGER, // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH,
- new Integer( 19 ), // ORDINAL_POSITION
+ 19 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 20 )
+ 20
},
{
NO_CATALOG,
@@ -820,18 +820,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_VARCHAR,
"VARCHAR",
- new Integer( 10 ), // PRECISION
- new Integer( 20 ), // LENGTH
+ 10 , // PRECISION
+ 20 , // LENGTH
SCALE_UNDEFINED, // SCALE
RADIX_UNDEFINED, // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
- new Integer( 20 ), // CHAR_OCTET_LENGTH
- new Integer( 20 ), // ORDINAL_POSITION
+ 20 , // CHAR_OCTET_LENGTH
+ 20 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 21 )
+ 21
},
{
NO_CATALOG,
@@ -841,18 +841,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_VARBINARY,
"VARCHAR () FOR BIT DATA",
- new Integer( 10 ), // PRECISION
- new Integer( 10 ), // LENGTH
+ 10 , // PRECISION
+ 10 , // LENGTH
SCALE_UNDEFINED, // SCALE
RADIX_UNDEFINED, // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
- new Integer( 10 ), // CHAR_OCTET_LENGTH
- new Integer( 21 ), // ORDINAL_POSITION
+ 10 , // CHAR_OCTET_LENGTH
+ 21 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 22 )
+ 22
},
{
NO_CATALOG,
@@ -862,18 +862,18 @@ public class TableFunctionTest extends B
FUNCTION_RESULT_COLUMN,
JDBC_TYPE_BOOLEAN,
"BOOLEAN",
- new Integer( 1 ), // PRECISION
- new Integer( 1 ), // LENGTH
+ 1 , // PRECISION
+ 1 , // LENGTH
SCALE_UNDEFINED, // SCALE
RADIX_UNDEFINED, // RADIX
ALLOWS_NULLS,
EMPTY_REMARKS,
UNDEFINED_CHAR_OCTET_LENGTH, // CHAR_OCTET_LENGTH
- new Integer( 22 ), // ORDINAL_POSITION
+ 22 , // ORDINAL_POSITION
IS_NULLABLE,
GENERIC_NAME,
ARG_COUNT_2,
- new Integer( 23 )
+ 23
},
};
@@ -2760,41 +2760,41 @@ public class TableFunctionTest extends B
switch( actualJdbcType )
{
case Types.BOOLEAN:
- actualValue = new Boolean( rs.getBoolean( column ) ).toString();
- actualValueByName = new Boolean( rs.getBoolean( columnName ) ).toString();
+ actualValue = Boolean.toString( rs.getBoolean( column ) );
+ actualValueByName = Boolean.toString( rs.getBoolean( columnName ) );
if ( rs.wasNull() ) { actualValue = actualValueByName = null; }
break;
case Types.BIGINT:
- actualValue = new Long( rs.getLong( column ) ).toString();
- actualValueByName = new Long( rs.getLong( columnName ) ).toString();
+ actualValue = Long.toString( rs.getLong( column ) );
+ actualValueByName = Long.toString( rs.getLong( columnName ) ).toString();
if ( rs.wasNull() ) { actualValue = actualValueByName = null; }
break;
case Types.INTEGER:
- actualValue = new Integer( rs.getInt( column ) ).toString();
- actualValueByName = new Integer( rs.getInt( columnName ) ).toString();
+ actualValue = Integer.toString( rs.getInt( column ) );
+ actualValueByName = Integer.toString( rs.getInt( columnName ) );
if ( rs.wasNull() ) { actualValue = actualValueByName = null; }
break;
case Types.SMALLINT:
- actualValue = new Short( rs.getShort( column ) ).toString();
- actualValueByName = new Short( rs.getShort( columnName ) ).toString();
+ actualValue = Short.toString( rs.getShort( column ) );
+ actualValueByName = Short.toString( rs.getShort( columnName ) );
if ( rs.wasNull() ) { actualValue = actualValueByName = null; }
break;
case Types.TINYINT:
- actualValue = new Byte( rs.getByte( column ) ).toString();
- actualValueByName = new Byte( rs.getByte( columnName ) ).toString();
+ actualValue = Byte.toString( rs.getByte( column ) );
+ actualValueByName = Byte.toString( rs.getByte( columnName ) );
if ( rs.wasNull() ) { actualValue = actualValueByName = null; }
break;
case Types.DOUBLE:
- actualValue = new Double( rs.getDouble( column ) ).toString();
- actualValueByName = new Double( rs.getDouble( columnName ) ).toString();
+ actualValue = Double.toString( rs.getDouble( column ) );
+ actualValueByName = Double.toString( rs.getDouble( columnName ) );
if ( rs.wasNull() ) { actualValue = actualValueByName = null; }
break;
case Types.REAL:
case Types.FLOAT:
- actualValue = new Float( rs.getFloat( column ) ).toString();
- actualValueByName = new Float( rs.getFloat( columnName ) ).toString();
+ actualValue = Float.toString( rs.getFloat( column ) );
+ actualValueByName = Float.toString( rs.getFloat( columnName ) );
if ( rs.wasNull() ) { actualValue = actualValueByName = null; }
break;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TimestampArithTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TimestampArithTest.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TimestampArithTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TimestampArithTest.java Wed May 4 14:17:57 2016
@@ -525,11 +525,11 @@ public class TimestampArithTest extends
}
public void testInvalidArgTypes() throws SQLException {
- expectException( tsDiffPS[ HOUR_INTERVAL], ts( "2005-05-21 15:26:00"), new Double( 2.0), "XCL12",
+ expectException( tsDiffPS[ HOUR_INTERVAL], ts( "2005-05-21 15:26:00"), 2.0, "XCL12",
"TIMESTAMPDIFF with double ts2");
- expectException( tsDiffPS[ HOUR_INTERVAL], new Double( 2.0), ts( "2005-05-11 15:26:00"), "XCL12",
+ expectException( tsDiffPS[ HOUR_INTERVAL], 2.0, ts( "2005-05-11 15:26:00"), "XCL12",
"TIMESTAMPDIFF with double ts1");
- expectException( tsAddPS[ MINUTE_INTERVAL], new Integer(1), new Integer(-1), "XCL12",
+ expectException( tsAddPS[ MINUTE_INTERVAL], 1, -1, "XCL12",
"TIMESTAMPADD with int ts");
expectException( tsAddPS[ MINUTE_INTERVAL], ts( "2005-05-11 15:26:00"), ts( "2005-05-11 15:26:00"), "XCL12",
"TIMESTAMPADD with timestamp count");
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerTest.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerTest.java Wed May 4 14:17:57 2016
@@ -1714,19 +1714,19 @@ public class TriggerTest extends BaseJDB
switch (jdbcType)
{
case Types.SMALLINT:
- return new Integer((short) r.nextInt());
+ return (short) r.nextInt();
case Types.INTEGER:
- return new Integer(r.nextInt());
+ return r.nextInt();
case Types.BIGINT:
- return new Long(r.nextLong());
+ return r.nextLong();
case Types.FLOAT:
case Types.REAL:
- return new Float(r.nextFloat());
+ return r.nextFloat();
case Types.DOUBLE:
- return new Double(r.nextDouble());
+ return r.nextDouble();
case Types.DATE:
long d = r.nextLong();
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java Wed May 4 14:17:57 2016
@@ -1281,7 +1281,7 @@ public class UDTTest extends GeneratedC
return ps.executeQuery();
}
- public static Number makeNumber( int arg ) { return new Integer( arg ); }
+ public static Number makeNumber( int arg ) { return arg; }
public static Integer getIntValue( HashMap<String,Integer> map, String key )
{
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UnaryArithmeticParameterTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UnaryArithmeticParameterTest.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UnaryArithmeticParameterTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UnaryArithmeticParameterTest.java Wed May 4 14:17:57 2016
@@ -106,10 +106,10 @@ public class UnaryArithmeticParameterTes
ps.setInt(1,1);
expectedTypes=new int[] {Types.INTEGER};
JDBC.assertParameterTypes(ps,expectedTypes);
- Object[][] expectedRows = new Object[][]{{new Integer(1),new Integer(1),new Double(1.1),new String("abc")},
- {new Integer(-1),new Integer(-1),new Double(-1.0),new String("def")},
- {new Integer(3),new Integer(3),new Double(3.1),new String("ghi")},
- {new Integer(-1),new Integer(-1),new Double(-1.0),new String("jkl")}};
+ Object[][] expectedRows = new Object[][]{{1,1,1.1,new String("abc")},
+ {-1,-1,-1.0,new String("def")},
+ {3,3,3.1,new String("ghi")},
+ {-1,-1,-1.0,new String("jkl")}};
JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
ps =prepareStatement("select * from t1 where c11 = -? and c12 = +? and c13 = ?");
ps.setInt(1,-1);
@@ -117,14 +117,14 @@ public class UnaryArithmeticParameterTes
ps.setDouble(3,1.1);
expectedTypes= new int[]{Types.INTEGER, Types.SMALLINT,Types.DOUBLE};
JDBC.assertParameterTypes(ps,expectedTypes);
- expectedRows = new Object[][]{{new Integer(1),new Integer(1),new Double(1.1),new String("abc")}};
+ expectedRows = new Object[][]{{1,1,1.1,new String("abc")}};
JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
ps.setShort(1,(short) 1);
ps.setInt(2,-1);
ps.setInt(3,-1);
- expectedRows = new Object[][]{{new Integer(-1),new Integer(-1),new Double(-1.0),new String("def")},
- {new Integer(-1),new Integer(-1),new Double(-1.0),new String("jkl")}};
+ expectedRows = new Object[][]{{-1,-1,-1.0,new String("def")},
+ {-1,-1,-1.0,new String("jkl")}};
JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
ps.close();
}
@@ -140,8 +140,8 @@ public class UnaryArithmeticParameterTes
ps.setInt(2,1);
int[] expectedTypes= new int[]{Types.INTEGER,Types.INTEGER};
JDBC.assertParameterTypes(ps,expectedTypes);
- Object[][] expectedRows = new Object[][]{{new Integer(1),new Integer(1),new Double(1.1),new String("abc")},
- {new Integer(-1),new Integer(-1),new Double(-1.0),new String("def")}};
+ Object[][] expectedRows = new Object[][]{{1,1,1.1,new String("abc")},
+ {-1,-1,-1.0,new String("def")}};
JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
ps.close();
s.execute("Drop function ABS_FUNCT" );
@@ -158,8 +158,8 @@ public class UnaryArithmeticParameterTes
ps.setInt(1,1);
int[] expectedTypes= new int[]{Types.INTEGER};
JDBC.assertParameterTypes(ps,expectedTypes);
- Object[][] expectedRows = new Object[][]{{new Integer(1),new Integer(1),new Double(1.1),new String("abc")},
- {new Integer(-1),new Integer(-1),new Double(-1.0),new String("def")}};
+ Object[][] expectedRows = new Object[][]{{1,1,1.1,new String("abc")},
+ {-1,-1,-1.0,new String("def")}};
JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
ps = prepareStatement("select * from t1 where -? = max_cni(-?,+?)");
@@ -192,7 +192,7 @@ public class UnaryArithmeticParameterTes
ps.setInt(2,1);
int[] expectedTypes= new int[]{Types.INTEGER,Types.INTEGER};
JDBC.assertParameterTypes(ps,expectedTypes);
- Object[][] expectedRows = new Object[][]{{new Integer(1),new Integer(1),new Double(1.1),new String("abc")}};
+ Object[][] expectedRows = new Object[][]{{1,1,1.1,new String("abc")}};
JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
ps.close();
}
@@ -208,8 +208,8 @@ public class UnaryArithmeticParameterTes
ps.setInt(4,4);
int[] expectedTypes= new int[]{Types.INTEGER,Types.INTEGER, Types.INTEGER,Types.INTEGER};
JDBC.assertParameterTypes(ps,expectedTypes);
- Object[][] expectedRows = new Object[][]{{new Integer(1),new Integer(1),new Double(1.1),new String("abc")},
- {new Integer(-1),new Integer(-1),new Double(-1.0),new String("def")}};
+ Object[][] expectedRows = new Object[][]{{1,1,1.1,new String("abc")},
+ {-1,-1,-1.0,new String("def")}};
JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
ps = prepareStatement("select * from t1 where -? not in (select c21+? from t2)");
@@ -229,7 +229,7 @@ public class UnaryArithmeticParameterTes
ps.setInt(1,0);
int[] expectedTypes=new int[]{Types.SMALLINT};
JDBC.assertParameterTypes(ps,expectedTypes);
- Object[][] expectedRows = new Object[][]{{new Integer(1),new Integer(1),new Double(1.1),new String("abc")}};
+ Object[][] expectedRows = new Object[][]{{1,1,1.1,new String("abc")}};
JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
ps = prepareStatement("select * from t1 where -? = c11 + ?");
@@ -237,7 +237,7 @@ public class UnaryArithmeticParameterTes
ps.setInt(2,-1);
expectedTypes = new int[]{Types.INTEGER,Types.INTEGER};
JDBC.assertParameterTypes(ps,expectedTypes);
- expectedRows = new Object[][]{{new Integer(-1),new Integer(-1),new Double(-1.0),new String("def")}};
+ expectedRows = new Object[][]{{-1,-1,-1.0,new String("def")}};
JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
ps = prepareStatement("select * from t1 where c11 + ? = -?");
@@ -303,7 +303,7 @@ public class UnaryArithmeticParameterTes
ps.setInt(2,22);
int[] expectedTypes = new int[]{Types.INTEGER,Types.SMALLINT};
JDBC.assertParameterTypes(ps, expectedTypes);
- Object[][] expectedRows = new Object[][]{{new Integer("1")},{new Integer("-22")}};
+ Object[][] expectedRows = new Object[][]{{1},{-22}};
JDBC.assertFullResultSet(ps.executeQuery(), expectedRows, false);
ps.close();
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java Wed May 4 14:17:57 2016
@@ -2925,28 +2925,28 @@ public class UpdatableResultSetTest ext
println(displayString + " Short object as parameters");
if (indexOrName == 1) //test by passing column position
rs.updateObject(sqlType,
- new Short(rs1.getShort(updateXXXName)));
+ rs1.getShort(updateXXXName));
else //test by passing column name
rs.updateObject(ColumnNames[sqlType-1],
- new Short(rs1.getShort(updateXXXName)));
+ rs1.getShort(updateXXXName));
} else if (updateXXXName == 2) {
//updateObject using Integer object
println(displayString + " Integer object as parameters");
if (indexOrName == 1) //test by passing column position
rs.updateObject(sqlType,
- new Integer(rs1.getInt(updateXXXName)));
+ rs1.getInt(updateXXXName));
else //test by passing column name
rs.updateObject(ColumnNames[sqlType-1],
- new Integer(rs1.getInt(updateXXXName)));
+ rs1.getInt(updateXXXName));
} else if (updateXXXName == 3) {
//updateObject using Long object
println(displayString + " Long object as parameters");
if (indexOrName == 1) //test by passing column position
rs.updateObject(sqlType,
- new Long(rs1.getLong(updateXXXName)));
+ rs1.getLong(updateXXXName));
else //test by passing column name
rs.updateObject(ColumnNames[sqlType-1],
- new Long(rs1.getLong(updateXXXName)));
+ rs1.getLong(updateXXXName));
} else if (updateXXXName == 4) {
//updateObject using BigDecimal object
if(!JDBC.vmSupportsJSR169()) {
@@ -2964,19 +2964,19 @@ public class UpdatableResultSetTest ext
println(displayString + " Float object as parameters");
if (indexOrName == 1) //test by passing column position
rs.updateObject(sqlType,
- new Float(rs1.getFloat(updateXXXName)));
+ rs1.getFloat(updateXXXName));
else //test by passing column name
rs.updateObject(ColumnNames[sqlType-1],
- new Float(rs1.getFloat(updateXXXName)));
+ rs1.getFloat(updateXXXName));
} else if (updateXXXName == 6) {
//updateObject using Double object
println(displayString + " Double object as parameters");
if (indexOrName == 1) //test by passing column position
rs.updateObject(sqlType,
- new Double(rs1.getDouble(updateXXXName)));
+ rs1.getDouble(updateXXXName));
else //test by passing column name
rs.updateObject(ColumnNames[sqlType-1],
- new Double(rs1.getDouble(updateXXXName)));
+ rs1.getDouble(updateXXXName));
} else if (updateXXXName == 7) {
//updateObject using String object
println(displayString + " String object as parameters");
@@ -3068,10 +3068,10 @@ public class UpdatableResultSetTest ext
//since Derby don't support boolean datatype
if (indexOrName == 1) //test by passing column position
rs.updateObject(sqlType,
- new Boolean(rs1.getBoolean(1)));
+ rs1.getBoolean(1));
else //test by passing column name
rs.updateObject(ColumnNames[sqlType-1],
- new Boolean(rs1.getBoolean(1)));
+ rs1.getBoolean(1));
} else if (updateXXXName == 19) {
//update column with updateNull methods
println(displayString + " null as parameters");
@@ -4599,8 +4599,8 @@ public class UpdatableResultSetTest ext
} else if (sqlType == 6) {
// verify update made to DOUBLE column with updateXXX methods
Double d1, d2;
- d1 = new Double(rs.getDouble(sqlType));
- d2 = new Double(rs1.getDouble(updateXXXName));
+ d1 = rs.getDouble(sqlType);
+ d2 = rs1.getDouble(updateXXXName);
// can have precision problems with updateFloat
if (updateXXXName == 5) {
assertTrue("FAIL - wrong value on " + allSQLTypes[sqlType - 1] +
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdateCursorTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdateCursorTest.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdateCursorTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdateCursorTest.java Wed May 4 14:17:57 2016
@@ -113,9 +113,9 @@ public class UpdateCursorTest extends Ba
for (int j = 0; j < 5; j++) {
pstmt.setInt(1 + k, i + (4 - j));
- pstmt.setString(2 + k, new Integer(i).toString());
+ pstmt.setString(2 + k, Integer.toString(i));
pstmt.setInt(3 + k, i + j);
- pstmt.setString(4 + k, new Integer(i).toString());
+ pstmt.setString(4 + k, Integer.toString(i));
pstmt.setInt(5 + k, i);
pstmt.setString(6 + k, largeString);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/outparams.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/outparams.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/outparams.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/outparams.java Wed May 4 14:17:57 2016
@@ -1016,38 +1016,38 @@ public class outparams
case Types.BIT:
case Types.BOOLEAN:
strbuf.append("setObject("+arg+", true)");
- cs.setObject(arg, new Boolean(true));
+ cs.setObject(arg, true);
break;
case Types.TINYINT:
strbuf.append("setObject("+arg+", 6)");
- cs.setObject(arg, new Integer((byte)6));
+ cs.setObject(arg, 6);
break;
case Types.SMALLINT:
strbuf.append("setObject("+arg+", 66)");
- cs.setObject(arg, new Integer((short)66));
+ cs.setObject(arg, 66);
break;
case Types.INTEGER:
strbuf.append("setObject("+arg+", 666)");
- cs.setObject(arg, new Integer(666));
+ cs.setObject(arg, 666);
break;
case Types.BIGINT:
strbuf.append("setObject("+arg+", 666)");
- cs.setObject(arg, new Long(666));
+ cs.setObject(arg, 666L);
break;
case Types.FLOAT:
case Types.REAL:
strbuf.append("setObject("+arg+", 666)");
- cs.setObject(arg, new Float(666));
+ cs.setObject(arg, 666f);
break;
case Types.DOUBLE:
strbuf.append("setObject("+arg+", 666)");
- cs.setObject(arg, new Double(666));
+ cs.setObject(arg, 666.0);
break;
case Types.DECIMAL:
@@ -1364,7 +1364,7 @@ public class outparams
}
}
- retval[0] = (setToNull.booleanValue()) ? null : new Integer((short)66);
+ retval[0] = (setToNull.booleanValue()) ? null : 66;
}
public static void testNullBug4317(String passedInNull) throws Throwable
@@ -1380,7 +1380,7 @@ public class outparams
}
public static void takesByte(Byte[] outparam, int type)
{
- outparam[0] = new Byte((byte)(outparam[0] == null ? 33 : outparam[0].byteValue()*2));
+ outparam[0] = ((byte)(outparam[0] == null ? 33 : outparam[0].byteValue()*2));
}
public static void takesShortPrimitive(short[] outparam, int type)
@@ -1389,7 +1389,7 @@ public class outparams
}
public static void takesShort(Short[] outparam, int type)
{
- outparam[0] = new Short((byte)(outparam[0] == null ? 33 : outparam[0].shortValue()*2));
+ outparam[0] = (short) ((byte)(outparam[0] == null ? 33 : outparam[0].shortValue()*2));
}
public static void takesIntegerPrimitive(int[] outparam, int type)
@@ -1398,7 +1398,7 @@ public class outparams
}
public static void takesInteger(Integer[] outparam, int type)
{
- outparam[0] = new Integer(outparam[0] == null ? 33 : outparam[0].intValue()*2);
+ outparam[0] = outparam[0] == null ? 33 : outparam[0].intValue()*2;
}
public static void takesLongPrimitive(long[] outparam, int type)
@@ -1407,7 +1407,7 @@ public class outparams
}
public static void takesLong(Long[] outparam, int type)
{
- outparam[0] = new Long(outparam[0] == null ? 33 : outparam[0].longValue()*2);
+ outparam[0] = (long)(outparam[0] == null ? 33 : outparam[0].longValue()*2);
}
public static void takesDoublePrimitive(double[] outparam, int type)
@@ -1416,7 +1416,7 @@ public class outparams
}
public static void takesDouble(Double[] outparam, int type)
{
- outparam[0] = new Double(outparam[0] == null ? 33 : outparam[0].doubleValue()*2);
+ outparam[0] = (double) (outparam[0] == null ? 33 : outparam[0].doubleValue()*2);
}
public static void takesFloatPrimitive(float[] outparam, int type)
@@ -1425,7 +1425,7 @@ public class outparams
}
public static void takesFloat(Float[] outparam, int type)
{
- outparam[0] = new Float(outparam[0] == null ? 33 : outparam[0].floatValue()*2);
+ outparam[0] = (float) (outparam[0] == null ? 33 : outparam[0].floatValue()*2);
}
public static void takesBooleanPrimitive(boolean[] outparam, int type)
@@ -1434,7 +1434,7 @@ public class outparams
}
public static void takesBoolean(Boolean[] outparam, int type)
{
- outparam[0] = new Boolean(true);
+ outparam[0] = true;
}
public static void takesByteArray(byte[][] outparam, int type)
@@ -1485,7 +1485,7 @@ public class outparams
}
public static Byte returnsByte(int type)
{
- return new Byte((byte)66);
+ return (byte)66;
}
public static short returnsShortP(int type)
@@ -1494,7 +1494,7 @@ public class outparams
}
public static Short returnsShort(int type)
{
- return new Short((short)666);
+ return (short)666;
}
public static int returnsIntegerP(int type)
@@ -1503,7 +1503,7 @@ public class outparams
}
public static Integer returnsInteger(int type)
{
- return new Integer(666);
+ return 666;
}
public static long returnsLongP(int type)
@@ -1512,7 +1512,7 @@ public class outparams
}
public static Long returnsLong(int type)
{
- return new Long(666);
+ return 666L;
}
public static float returnsFloatP(int type)
@@ -1521,7 +1521,7 @@ public class outparams
}
public static Float returnsFloat(int type)
{
- return new Float(666);
+ return 666f;
}
public static double returnsDoubleP(int type)
@@ -1530,7 +1530,7 @@ public class outparams
}
public static Double returnsDouble(int type)
{
- return new Double(666);
+ return 666.0;
}
public static byte[] returnsByteArray(int type)
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/userDefMethods.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/userDefMethods.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/userDefMethods.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/userDefMethods.java Wed May 4 14:17:57 2016
@@ -38,7 +38,7 @@ public class userDefMethods
ResultSet rs = s.executeQuery("SELECT c1 from new org.apache.derby.catalog.TriggerOldTransitionRows() AS EQ");
Vector<Long> keys = new Vector<Long>();
while(rs.next()){
- keys.addElement(new Long(rs.getLong(1)));
+ keys.addElement(rs.getLong(1));
}
rs.close();
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/BlobMemTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/BlobMemTest.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/BlobMemTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/BlobMemTest.java Wed May 4 14:17:57 2016
@@ -82,7 +82,7 @@ public class BlobMemTest extends BaseJDB
println("Skipping lengthless insert because method is not available");
return;
}
- m.invoke(ps, new Object[] {new Integer(2),stream});
+ m.invoke(ps, new Object[] {2,stream});
}
else
ps.setBinaryStream(2, stream,blobLen);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/ClobMemTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/ClobMemTest.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/ClobMemTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memory/ClobMemTest.java Wed May 4 14:17:57 2016
@@ -83,7 +83,7 @@ public class ClobMemTest extends BaseJDB
println("Skipping lengthless insert because method is not available");
return;
}
- m.invoke(ps, new Object[] {new Integer(2), reader});
+ m.invoke(ps, new Object[] {2, reader});
}
else
ps.setCharacterStream(2, reader, LONG_CLOB_LENGTH);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/DerbyJUnitTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/DerbyJUnitTest.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/DerbyJUnitTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/DerbyJUnitTest.java Wed May 4 14:17:57 2016
@@ -557,11 +557,11 @@ public class DerbyJUnitTest extends Test
switch( jdbcType )
{
case JDBC_BOOLEAN:
- retval = new Boolean( rs.getBoolean( columnName ) );
+ retval = rs.getBoolean( columnName );
break;
case Types.BIGINT:
- retval = new Long( rs.getLong( columnName ) );
+ retval = rs.getLong( columnName );
break;
case Types.BLOB:
@@ -594,19 +594,19 @@ public class DerbyJUnitTest extends Test
break;
case Types.DOUBLE:
- retval = new Double( rs.getDouble( columnName ) );
+ retval = rs.getDouble( columnName );
break;
case Types.REAL:
- retval = new Float( rs.getFloat( columnName ) );
+ retval = rs.getFloat( columnName );
break;
case Types.INTEGER:
- retval = new Integer( rs.getInt( columnName ) );
+ retval = rs.getInt( columnName );
break;
case Types.SMALLINT:
- retval = new Short( rs.getShort( columnName ) );
+ retval = rs.getShort( columnName );
break;
case Types.TIME:
@@ -647,13 +647,13 @@ public class DerbyJUnitTest extends Test
{
retval = rs.getObject( param );
}
- else if ( value instanceof Boolean ) { retval = new Boolean( rs.getBoolean( param ) ); }
- else if ( value instanceof Byte ) { retval = new Byte( rs.getByte( param ) ); }
- else if ( value instanceof Short ) { retval = new Short( rs.getShort( param ) ); }
- else if ( value instanceof Integer ) { retval = new Integer( rs.getInt( param ) ); }
- else if ( value instanceof Long ) { retval = new Long( rs.getLong( param ) ); }
- else if ( value instanceof Float ) { retval = new Float( rs.getFloat( param ) ); }
- else if ( value instanceof Double ) { retval = new Double( rs.getDouble( param ) ); }
+ else if ( value instanceof Boolean ) { retval = rs.getBoolean( param ); }
+ else if ( value instanceof Byte ) { retval = rs.getByte( param ); }
+ else if ( value instanceof Short ) { retval = rs.getShort( param ); }
+ else if ( value instanceof Integer ) { retval = rs.getInt( param ); }
+ else if ( value instanceof Long ) { retval = rs.getLong( param ); }
+ else if ( value instanceof Float ) { retval = rs.getFloat( param ); }
+ else if ( value instanceof Double ) { retval = rs.getDouble( param ); }
else if ( value instanceof String ) { retval = rs.getString( param ); }
else if ( value instanceof BigDecimal ) { retval = rs.getBigDecimal( param ); }
else { retval = rs.getObject( param ); }
@@ -678,11 +678,11 @@ public class DerbyJUnitTest extends Test
switch( jdbcType )
{
case JDBC_BOOLEAN:
- retval = new Boolean( cs.getBoolean( arg ) );
+ retval = cs.getBoolean( arg );
break;
case Types.BIGINT:
- retval = new Long( cs.getLong( arg ) );
+ retval = cs.getLong( arg );
break;
case Types.BLOB:
@@ -715,19 +715,19 @@ public class DerbyJUnitTest extends Test
break;
case Types.DOUBLE:
- retval = new Double( cs.getDouble( arg ) );
+ retval = cs.getDouble( arg );
break;
case Types.REAL:
- retval = new Float( cs.getFloat( arg ) );
+ retval = cs.getFloat( arg );
break;
case Types.INTEGER:
- retval = new Integer( cs.getInt( arg ) );
+ retval = cs.getInt( arg );
break;
case Types.SMALLINT:
- retval = new Short( cs.getShort( arg ) );
+ retval = cs.getShort( arg );
break;
case Types.TIME:
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ManyMethods.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ManyMethods.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ManyMethods.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ManyMethods.java Wed May 4 14:17:57 2016
@@ -74,13 +74,13 @@ public class ManyMethods implements Seri
privateValue = value;
publicValue = value;
publicint = value;
- publicInteger = new Integer(value);
+ publicInteger = value;
publicshort = (short) value;
- publicShort = new Short((short) value);
+ publicShort = (short) value;
publicbyte = (byte) value;
- publicByte = new Byte((byte) value);
+ publicByte = (byte) value;
publiclong = (long) value;
- publicLong = new Long((long) value);
+ publicLong = (long) value;
publicboolean = booleanMethod();
publicBoolean = BooleanMethod();
publicfloat = floatMethod();
@@ -228,7 +228,7 @@ public class ManyMethods implements Seri
public Byte ByteMethod()
{
- return new Byte((byte) 1);
+ return (byte) 1;
}
public char charMethod()
@@ -238,7 +238,7 @@ public class ManyMethods implements Seri
public Character CharacterMethod()
{
- return new Character('a');
+ return 'a';
}
public double doubleMethod()
@@ -248,7 +248,7 @@ public class ManyMethods implements Seri
public Double DoubleMethod()
{
- return new Double(1.5);
+ return 1.5;
}
public BigDecimal BigDecimalMethod()
@@ -263,7 +263,7 @@ public class ManyMethods implements Seri
public Float FloatMethod()
{
- return new Float(2.5F);
+ return 2.5F;
}
public int intMethod()
@@ -273,7 +273,7 @@ public class ManyMethods implements Seri
public Integer IntegerMethod()
{
- return new Integer(2);
+ return 2;
}
public long longMethod()
@@ -283,7 +283,7 @@ public class ManyMethods implements Seri
public Long LongMethod()
{
- return new Long(3L);
+ return 3L;
}
public short shortMethod()
@@ -293,7 +293,7 @@ public class ManyMethods implements Seri
public Short ShortMethod()
{
- return new Short((short) 4);
+ return (short) 4;
}
public boolean booleanMethod()
@@ -303,7 +303,7 @@ public class ManyMethods implements Seri
public Boolean BooleanMethod()
{
- return new Boolean(true);
+ return true;
}
public String StringMethod()
@@ -455,17 +455,17 @@ public class ManyMethods implements Seri
public static Byte staticByteMethod()
{
- return new Byte((byte) 1);
+ return (byte) 1;
}
public static Character staticCharacterMethod()
{
- return new Character('a');
+ return 'a';
}
public static Double staticDoubleMethod()
{
- return new Double(1.5);
+ return 1.5;
}
public static BigDecimal staticBigDecimalMethod()
@@ -475,27 +475,27 @@ public class ManyMethods implements Seri
public static Float staticFloatMethod()
{
- return new Float(2.5F);
+ return 2.5F;
}
public static Long staticLongMethod()
{
- return new Long(3L);
+ return 3L;
}
public static Short staticShortMethod()
{
- return new Short((short) 4);
+ return (short) 4;
}
public static Integer staticIntegerMethod()
{
- return new Integer(2);
+ return 2;
}
public static Boolean staticBooleanMethod()
{
- return new Boolean(true);
+ return true;
}
public static String staticStringMethod()
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/ProcedureTest.java Wed May 4 14:17:57 2016
@@ -596,7 +596,7 @@ public abstract class ProcedureTest exte
if (in == null)
inout[0] = null;
else
- inout[0] = new Boolean(inout[0].booleanValue() && in.booleanValue());
+ inout[0] = inout[0].booleanValue() && in.booleanValue();
}
@@ -618,9 +618,9 @@ public abstract class ProcedureTest exte
if (in == null)
;//inout[0] = null;
else if (inout[0] == null)
- inout[0] = new Integer(3 * in.intValue());
+ inout[0] = 3 * in.intValue();
else
- inout[0] = new Integer(inout[0].intValue() + in.intValue());
+ inout[0] = inout[0].intValue() + in.intValue();
}
public static void pTINYINT(byte in, byte[] inout, byte[] out) throws SQLException {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestUtil.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestUtil.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/TestUtil.java Wed May 4 14:17:57 2016
@@ -419,11 +419,11 @@ public class TestUtil {
if (argType == INT_ARG_TYPE)
{
args = new Integer[]
- { new Integer(Integer.parseInt(value)) };
+ { Integer.valueOf(value) };
}
else if (argType == BOOLEAN_ARG_TYPE)
{
- args = new Boolean[] { new Boolean(value) };
+ args = new Boolean[] { Boolean.valueOf(value) };
}
else if (argType == STRING_ARG_TYPE)
{
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/ConnectionPoolDataSourceConnector.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/ConnectionPoolDataSourceConnector.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/ConnectionPoolDataSourceConnector.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/ConnectionPoolDataSourceConnector.java Wed May 4 14:17:57 2016
@@ -71,7 +71,7 @@ public class ConnectionPoolDataSourceCon
// Note that this does not automatically test the pooling itself, but it
// should test basic JDBC operations on the logical wrapper classes.
try {
- J2EEDataSource.setBeanProperty(ds, "maxStatements", new Integer(2));
+ J2EEDataSource.setBeanProperty(ds, "maxStatements", 2);
} catch (AssertionFailedError afe) {
// Ignore this, it will fail later if it is an actual error.
// An assertion error will be thrown every time until statement
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBC.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBC.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBC.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBC.java Wed May 4 14:17:57 2016
@@ -1024,7 +1024,7 @@ public class JDBC {
Assert.assertEquals
("Types do not match for parameter " + (i+1),
expectedTypes[i],
- ((Integer) getParameterType.invoke( pmd, new Object[] { new Integer( i + 1 ) } )).intValue()
+ ((Integer) getParameterType.invoke( pmd, new Object[] { i + 1 } )).intValue()
);
}
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCDataSource.java Wed May 4 14:17:57 2016
@@ -118,7 +118,7 @@ public class JDBCDataSource {
if (!config.getJDBCClient().isEmbedded()) {
beanProperties.put("serverName", config.getHostName());
- beanProperties.put("portNumber", new Integer(config.getPort()));
+ beanProperties.put("portNumber", config.getPort());
}
beanProperties.put("databaseName", config.getDefaultDatabaseName());
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SpawnedProcess.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SpawnedProcess.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SpawnedProcess.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/SpawnedProcess.java Wed May 4 14:17:57 2016
@@ -311,7 +311,7 @@ public final class SpawnedProcess {
Integer exitCode = null;
while (exitCode == null) {
try {
- exitCode = new Integer(javaProcess.exitValue());
+ exitCode = javaProcess.exitValue();
} catch (IllegalThreadStateException itse) {
// This exception means the process is running.
if (System.currentTimeMillis() - start > timeout) {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/OperationsTester.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/OperationsTester.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/OperationsTester.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/test/OperationsTester.java Wed May 4 14:17:57 2016
@@ -74,8 +74,8 @@ public class OperationsTester extends Ba
int threshold = rand.threshold();
HashMap<String, Number> inputData = new HashMap<String, Number>();
- inputData.put("d", new Short(d));
- inputData.put("threshold", new Integer(threshold));
+ inputData.put("d", d);
+ inputData.put("threshold", threshold);
ops.stockLevel(this, inputData,
w, d, threshold);
@@ -102,8 +102,8 @@ public class OperationsTester extends Ba
int c = rand.NURand1023();
HashMap<String, Number> inputData = new HashMap<String, Number>();
- inputData.put("d", new Short(d));
- inputData.put("c", new Integer(c));
+ inputData.put("d", d);
+ inputData.put("c", c);
ops.orderStatus(this, inputData, w, d, c);
// Ensures the Display object read it.
@@ -119,7 +119,7 @@ public class OperationsTester extends Ba
String customerLast = rand.randomCLast();
HashMap<String, Object> inputData = new HashMap<String, Object>();
- inputData.put("d", new Short(d));
+ inputData.put("d", d);
inputData.put("customerLast", customerLast);
ops.orderStatus(this, inputData, w, d, customerLast);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/harness/BasicUnitTestManager.java Wed May 4 14:17:57 2016
@@ -213,7 +213,7 @@ public class BasicUnitTestManager implem
if (performanceReportOn){
endTime = new Date();
- emitAMessage("Test '" + thisTestName + "' took " + new Long(endTime.getTime() - startTime.getTime()) + " milliseconds.");
+ emitAMessage("Test '" + thisTestName + "' took " + (endTime.getTime() - startTime.getTime()) + " milliseconds.");
}
return result;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/FormatableBitSetTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/FormatableBitSetTest.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/FormatableBitSetTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/FormatableBitSetTest.java Wed May 4 14:17:57 2016
@@ -662,7 +662,7 @@ public class FormatableBitSetTest extend
// count one-bits in a byte with Integer.bitCount()
private static int bitsInByte(byte b) throws Exception {
- Integer arg = new Integer(b & 0xff);
+ Integer arg = b & 0xff;
Integer ret = (Integer) bitCount.invoke(null, new Object[] { arg });
return ret.intValue();
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Diagnosticable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Diagnosticable.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Diagnosticable.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Diagnosticable.java Wed May 4 14:17:57 2016
@@ -90,7 +90,7 @@ public class T_Diagnosticable extends T_
Object diagSubObj = new T_DiagTestClass1Sub("sub-class");
// Create object with neither Diagnosticable:
- Object obj = new Long(5);
+ Object obj = (long) 5;
// Test just getting a single string back, from each type of object.
String str = null;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Key.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Key.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Key.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_Key.java Wed May 4 14:17:57 2016
@@ -40,13 +40,13 @@ public class T_Key {
private boolean raiseException;
public static T_Key simpleInt(int value) {
- return new T_Key(new Integer(value), 0, true, false);
+ return new T_Key(value, 0, true, false);
}
public static T_Key dontFindInt(int value) {
- return new T_Key(new Integer(value), 0, false, false);
+ return new T_Key(value, 0, false, false);
}
public static T_Key exceptionInt(int value) {
- return new T_Key(new Integer(value), 0, true, true);
+ return new T_Key(value, 0, true, true);
}
/**
@@ -59,9 +59,9 @@ public class T_Key {
T_Key tkey = new T_Key();
if (rand < 0.48)
- tkey.value = new Integer((int) (100.0 * rand));
+ tkey.value = (int) (100.0 * rand);
else if (rand < 0.96)
- tkey.value = new Integer((int) (100.0 * rand));
+ tkey.value = (int) (100.0 * rand);
else
tkey.value = Boolean.FALSE;
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_User.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_User.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_User.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_User.java Wed May 4 14:17:57 2016
@@ -70,7 +70,7 @@ class T_User implements Runnable {
private void T001() throws StandardException, T_Fail {
CompatibilitySpace cs = lf.createCompatibilitySpace(null);
- Integer g0 = new Integer(1); // create an object for a lock group
+ Integer g0 = 1; // create an object for a lock group
// check we have no locks held
checkLockCount(cs, 0);
@@ -113,7 +113,7 @@ class T_User implements Runnable {
private void T002() throws StandardException, T_Fail {
CompatibilitySpace cs = lf.createCompatibilitySpace(null);
- Integer g0 = new Integer(1); // create an object for a lock group
+ Integer g0 = 1; // create an object for a lock group
// check we have no locks held
checkLockCount(cs, 0);
@@ -138,7 +138,7 @@ class T_User implements Runnable {
private void T003() throws StandardException, T_Fail {
CompatibilitySpace cs = lf.createCompatibilitySpace(null);
- Integer g0 = new Integer(1); // create an object for a lock group
+ Integer g0 = 1; // create an object for a lock group
// check we have no locks held
checkLockCount(cs, 0);
@@ -157,7 +157,7 @@ class T_User implements Runnable {
private void T004() throws StandardException, T_Fail {
CompatibilitySpace cs = lf.createCompatibilitySpace(null);
- Integer g0 = new Integer(1); // create an object for a lock group
+ Integer g0 = 1; // create an object for a lock group
// check we have no locks held
checkLockCount(cs, 0);
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_QualifierTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_QualifierTest.java?rev=1742289&r1=1742288&r2=1742289&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_QualifierTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_QualifierTest.java Wed May 4 14:17:57 2016
@@ -94,7 +94,7 @@ public class T_QualifierTest
int key_val = expect_key;
for (int i = 0; i < expect_numrows; i++)
{
- set.add(new Long(key_val));
+ set.add((long)key_val);
if (order == ORDER_DESC)
key_val--;
else
@@ -273,7 +273,7 @@ public class T_QualifierTest
}
else
{
- if (!set.remove(new Long(key)))
+ if (!set.remove(key))
{
return(
fail("(t_scanNext) wrong key, expected (" +
@@ -460,7 +460,7 @@ public class T_QualifierTest
}
else
{
- if (!set.remove(new Long(key)))
+ if (!set.remove(key))
{
return(
fail("(t_scanFetchNext) wrong key, expected (" +
@@ -651,7 +651,7 @@ public class T_QualifierTest
}
else
{
- if (!set.remove(new Long(key)))
+ if (!set.remove(key))
{
return(fail(
"(t_scanFetchNextGroup-forward) wrong key, expected (" +
@@ -868,7 +868,7 @@ public class T_QualifierTest
}
else
{
- if (!set.remove(new Long(key)))
+ if (!set.remove(key))
{
return(
fail("(t_scanFetchNext) wrong key, expected (" +
@@ -1035,7 +1035,7 @@ public class T_QualifierTest
row = (DataValueDescriptor[] ) obj;
key = ((SQLLongint)(row[2])).getLong();
- if (!set.remove(new Long(key)))
+ if (!set.remove(key))
{
return(
fail("(t_scanFetchHashtable-obj) wrong key, expected (" +
@@ -1054,7 +1054,7 @@ public class T_QualifierTest
key = ((SQLLongint)(row[2])).getLong();
- if (!set.remove(new Long(key)))
+ if (!set.remove(key))
{
return(fail(
"(t_scanFetchHashtable-vector) wrong key, expected (" +