Revision: 8522
http://datanucleus.svn.sourceforge.net/datanucleus/?rev=8522&view=rev
Author: andy_jefferson
Date: 2010-01-12 10:51:38 +0000 (Tue, 12 Jan 2010)
Log Message:
-----------
[NUCACCESS-60] Use "XXX.valueOf" in preference of "new XXX"
Modified Paths:
--------------
platform/accessplatform/trunk/build.properties
platform/core/trunk/src/java/org/datanucleus/FetchGroup.java
platform/core/trunk/src/java/org/datanucleus/FetchPlanForClass.java
platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
platform/core/trunk/src/java/org/datanucleus/TransactionImpl.java
platform/core/trunk/src/java/org/datanucleus/identity/ByteFieldPK.java
platform/core/trunk/src/java/org/datanucleus/identity/IntFieldPK.java
platform/core/trunk/src/java/org/datanucleus/identity/LongFieldPK.java
platform/core/trunk/src/java/org/datanucleus/identity/ShortFieldPK.java
platform/core/trunk/src/java/org/datanucleus/jdo/JDOQuery.java
platform/core/trunk/src/java/org/datanucleus/jdo/state/JDOStateManagerImpl.java
platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java
platform/core/trunk/src/java/org/datanucleus/properties/IntegerPropertyValidator.java
platform/core/trunk/src/java/org/datanucleus/query/compiler/JPQLParser.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/AbsFunctionEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/ContainerSizeMethodEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetDayMethodEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetHoursMethodEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetMinutesMethodEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetMonthMethodEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetSecondsMethodEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetYearMethodEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/InMemoryExpressionEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/IntegerAggregateExpression.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/LengthFunctionEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/LocateFunctionEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/ModFunctionEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/SetExpression.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/SizeFunctionEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/StringIndexOfMethodEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/StringLengthMethodEvaluator.java
platform/core/trunk/src/java/org/datanucleus/query/expression/Literal.java
platform/core/trunk/src/java/org/datanucleus/state/RelationshipManager.java
platform/core/trunk/src/java/org/datanucleus/store/AbstractStoreManager.java
platform/core/trunk/src/java/org/datanucleus/store/fieldmanager/SingleValueFieldManager.java
platform/core/trunk/src/java/org/datanucleus/store/mapped/expression/ArrayExpression.java
platform/core/trunk/src/java/org/datanucleus/store/mapped/expression/CharacterLiteral.java
platform/core/trunk/src/java/org/datanucleus/store/mapped/expression/MathExpression.java
platform/core/trunk/src/java/org/datanucleus/store/mapped/mapping/EmbeddedMapping.java
platform/core/trunk/src/java/org/datanucleus/store/mapped/mapping/IndexMapping.java
platform/core/trunk/src/java/org/datanucleus/store/mapped/mapping/IntegerMapping.java
platform/core/trunk/src/java/org/datanucleus/store/mapped/scostore/FKListStore.java
platform/core/trunk/src/java/org/datanucleus/store/query/AbstractSQLQuery.java
platform/core/trunk/src/java/org/datanucleus/store/query/Query.java
platform/core/trunk/src/java/org/datanucleus/util/ClassUtils.java
platform/core/trunk/src/java/org/datanucleus/util/JavaUtils.java
platform/core/trunk/src/java/org/datanucleus/util/StringUtils.java
platform/core/trunk/src/java/org/datanucleus/util/TypeConversionHelper.java
platform/jpa/trunk/src/java/org/datanucleus/jpa/metadata/JPAAnnotationReader.java
platform/jpa/trunk/src/java/org/datanucleus/jpa/metadata/JPAMetaDataHandler.java
platform/store.excel/trunk/src/java/org/datanucleus/store/excel/ExcelPersistenceHandler.java
platform/store.excel/trunk/src/java/org/datanucleus/store/excel/fieldmanager/FetchFieldManager.java
platform/store.excel/trunk/src/java/org/datanucleus/store/excel/valuegenerator/MaxGenerator.java
platform/store.odf/trunk/META-INF/MANIFEST.MF
platform/store.odf/trunk/pom.xml
platform/store.odf/trunk/src/java/org/datanucleus/store/odf/ODFPersistenceHandler.java
platform/store.odf/trunk/src/java/org/datanucleus/store/odf/ODFUtils.java
platform/store.rdbms/trunk/META-INF/MANIFEST.MF
platform/store.rdbms/trunk/pom.xml
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/JDBCUtils.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/ParamLoggingPreparedStatement.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/DecimalRDBMSMapping.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/DoubleRDBMSMapping.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/FloatRDBMSMapping.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/IntegerRDBMSMapping.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/NumericRDBMSMapping.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/SmallIntRDBMSMapping.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/legacy/JDOQLQueryCompiler.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/legacy/JPQLQueryCompiler.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/legacy/QueryStatement.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/UpdateRequest.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/BackingStoreHelper.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/SQLStatementHelper.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/expression/CharacterLiteral.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/expression/ExpressionUtils.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/expression/TemporalLiteral.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/ArraySizeMethod.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/CollectionSizeMethod.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/MapSizeMethod.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/MathAbsMethod.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/StringLength2Method.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/StringLength3Method.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/sql/method/StringLengthMethod.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/TableImpl.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/valuegenerator/TableGenerator.java
Modified: platform/accessplatform/trunk/build.properties
===================================================================
--- platform/accessplatform/trunk/build.properties 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/accessplatform/trunk/build.properties 2010-01-12 10:51:38 UTC (rev 8522)
@@ -30,9 +30,9 @@
datanucleus-jpa.version=2.0.1-SNAPSHOT
datanucleus-rest.version=1.0.2-SNAPSHOT
-datanucleus-rdbms.version=2.0.0-release
+datanucleus-rdbms.version=2.0.1-SNAPSHOT
datanucleus-excel.version=2.0.1-SNAPSHOT
-datanucleus-odf.version=2.0.0-release
+datanucleus-odf.version=2.0.1-SNAPSHOT
datanucleus-xml.version=2.0.0-release
datanucleus-db4o.version=2.0.0-release
datanucleus-neodatis.version=2.0.0-release
Modified: platform/core/trunk/src/java/org/datanucleus/FetchGroup.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FetchGroup.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/FetchGroup.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -177,7 +177,7 @@
{
recursionDepthByMemberName = new HashMap();
}
- recursionDepthByMemberName.put(memberName, new Integer(recursionDepth));
+ recursionDepthByMemberName.put(memberName, Integer.valueOf(recursionDepth));
}
return this;
}
Modified: platform/core/trunk/src/java/org/datanucleus/FetchPlanForClass.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/FetchPlanForClass.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/FetchPlanForClass.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -438,7 +438,7 @@
if (cmd.hasFetchGroupWithPostLoad())
{
// field must be in a fetch-group which has post-load set to true
- Integer fieldNumberInteger = new Integer(fieldNumber);
+ Integer fieldNumberInteger = Integer.valueOf(fieldNumber);
Set<FetchGroupMetaData> fetchGroups = fetchGroupsByMemberNumber.get(fieldNumberInteger);
if (fetchGroups == null)
{
Modified: platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/PersistenceConfiguration.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -232,7 +232,7 @@
}
else if (obj instanceof String)
{
- Integer intVal = new Integer((String)obj);
+ Integer intVal = Integer.valueOf((String)obj);
setPropertyInternal(name, intVal); // Replace String value with Integer
return intVal.intValue();
}
Modified: platform/core/trunk/src/java/org/datanucleus/TransactionImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/TransactionImpl.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/TransactionImpl.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -776,7 +776,7 @@
public void setOption(String option, int value)
{
- options.put(option, new Integer(value));
+ options.put(option, Integer.valueOf(value));
}
public void setOption(String option, boolean value)
Modified: platform/core/trunk/src/java/org/datanucleus/identity/ByteFieldPK.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/identity/ByteFieldPK.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/identity/ByteFieldPK.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -133,7 +133,7 @@
*/
protected Object createKeyAsObject()
{
- return new Byte(key);
+ return Byte.valueOf(key);
}
/**
Modified: platform/core/trunk/src/java/org/datanucleus/identity/IntFieldPK.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/identity/IntFieldPK.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/identity/IntFieldPK.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -133,7 +133,7 @@
*/
protected Object createKeyAsObject()
{
- return new Integer(key);
+ return Integer.valueOf(key);
}
/**
Modified: platform/core/trunk/src/java/org/datanucleus/identity/LongFieldPK.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/identity/LongFieldPK.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/identity/LongFieldPK.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -133,7 +133,7 @@
*/
protected Object createKeyAsObject()
{
- return new Long(key);
+ return Long.valueOf(key);
}
/**
Modified: platform/core/trunk/src/java/org/datanucleus/identity/ShortFieldPK.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/identity/ShortFieldPK.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/identity/ShortFieldPK.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -133,7 +133,7 @@
*/
protected Object createKeyAsObject()
{
- return new Short(key);
+ return Short.valueOf(key);
}
/**
Modified: platform/core/trunk/src/java/org/datanucleus/jdo/JDOQuery.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/jdo/JDOQuery.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/jdo/JDOQuery.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -729,7 +729,7 @@
if (parameter != null)
{
// Positional parameter so key by Integer
- paramMap.put(new Integer(0), parameter);
+ paramMap.put(Integer.valueOf(0), parameter);
}
addSubquery(sub, variableDecl, candidateExpr, paramMap);
}
@@ -751,7 +751,7 @@
for (int i=0;i<parameters.length;i++)
{
// Positional parameter so key by Integer
- paramMap.put(new Integer(i), parameters[i]);
+ paramMap.put(Integer.valueOf(i), parameters[i]);
}
}
addSubquery(sub, variableDecl, candidateExpr, paramMap);
Modified: platform/core/trunk/src/java/org/datanucleus/jdo/state/JDOStateManagerImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/jdo/state/JDOStateManagerImpl.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/jdo/state/JDOStateManagerImpl.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -2057,7 +2057,7 @@
{
if (pc != myPC)
{
- replaceField(pc, field, new Byte(newValue), true);
+ replaceField(pc, field, Byte.valueOf(newValue), true);
disconnectClone(pc);
}
else if (myLC != null)
@@ -2071,13 +2071,13 @@
if (!loadedFields[field] || currentValue != newValue)
{
boolean wasDirty = preWriteField(field);
- writeField(field, new Byte(newValue));
+ writeField(field, Byte.valueOf(newValue));
postWriteField(wasDirty);
}
}
else
{
- replaceField(field, new Byte(newValue), true);
+ replaceField(field, Byte.valueOf(newValue), true);
}
}
@@ -2131,7 +2131,7 @@
{
if (pc != myPC)
{
- replaceField(pc, field, new Double(newValue), true);
+ replaceField(pc, field, Double.valueOf(newValue), true);
disconnectClone(pc);
}
else if (myLC != null)
@@ -2145,13 +2145,13 @@
if (!loadedFields[field] || currentValue != newValue)
{
boolean wasDirty = preWriteField(field);
- writeField(field, new Double(newValue));
+ writeField(field, Double.valueOf(newValue));
postWriteField(wasDirty);
}
}
else
{
- replaceField(field, new Double(newValue), true);
+ replaceField(field, Double.valueOf(newValue), true);
}
}
@@ -2168,7 +2168,7 @@
{
if (pc != myPC)
{
- replaceField(pc, field, new Float(newValue), true);
+ replaceField(pc, field, Float.valueOf(newValue), true);
disconnectClone(pc);
}
else if (myLC != null)
@@ -2182,13 +2182,13 @@
if (!loadedFields[field] || currentValue != newValue)
{
boolean wasDirty = preWriteField(field);
- writeField(field, new Float(newValue));
+ writeField(field, Float.valueOf(newValue));
postWriteField(wasDirty);
}
}
else
{
- replaceField(field, new Float(newValue), true);
+ replaceField(field, Float.valueOf(newValue), true);
}
}
@@ -2205,7 +2205,7 @@
{
if (pc != myPC)
{
- replaceField(pc, field, new Integer(newValue), true);
+ replaceField(pc, field, Integer.valueOf(newValue), true);
disconnectClone(pc);
}
else if (myLC != null)
@@ -2219,13 +2219,13 @@
if (!loadedFields[field] || currentValue != newValue)
{
boolean wasDirty = preWriteField(field);
- writeField(field, new Integer(newValue));
+ writeField(field, Integer.valueOf(newValue));
postWriteField(wasDirty);
}
}
else
{
- replaceField(field, new Integer(newValue), true);
+ replaceField(field, Integer.valueOf(newValue), true);
}
}
@@ -2242,7 +2242,7 @@
{
if (pc != myPC)
{
- replaceField(pc, field, new Long(newValue), true);
+ replaceField(pc, field, Long.valueOf(newValue), true);
disconnectClone(pc);
}
else if (myLC != null)
@@ -2256,13 +2256,13 @@
if (!loadedFields[field] || currentValue != newValue)
{
boolean wasDirty = preWriteField(field);
- writeField(field, new Long(newValue));
+ writeField(field, Long.valueOf(newValue));
postWriteField(wasDirty);
}
}
else
{
- replaceField(field, new Long(newValue), true);
+ replaceField(field, Long.valueOf(newValue), true);
}
}
@@ -2279,7 +2279,7 @@
{
if (pc != myPC)
{
- replaceField(pc, field, new Short(newValue), true);
+ replaceField(pc, field, Short.valueOf(newValue), true);
disconnectClone(pc);
}
else if (myLC != null)
@@ -2293,13 +2293,13 @@
if (!loadedFields[field] || currentValue != newValue)
{
boolean wasDirty = preWriteField(field);
- writeField(field, new Short(newValue));
+ writeField(field, Short.valueOf(newValue));
postWriteField(wasDirty);
}
}
else
{
- replaceField(field, new Short(newValue), true);
+ replaceField(field, Short.valueOf(newValue), true);
}
}
Modified: platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/AbstractClassMetaData.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -1180,7 +1180,7 @@
{
// primary key fields found, but not using application identity
throw new InvalidMetaDataException(LOCALISER, "044078",
- fullName, new Integer(pk_field_count), identityType);
+ fullName, Integer.valueOf(pk_field_count), identityType);
}
else if (pk_field_count > 0)
{
Modified: platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/ClassMetaData.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -638,7 +638,7 @@
{
mmd.setFieldId(field_id);
managedMembers[field_id] = mmd;
- memberPositionsByName.put(mmd.getName(),new Integer(field_id));
+ memberPositionsByName.put(mmd.getName(), Integer.valueOf(field_id));
field_id++;
}
else
Modified: platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/metadata/InterfaceMetaData.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -130,7 +130,7 @@
{
fmd.setFieldId(field_id);
managedMembers[field_id] = fmd;
- memberPositionsByName.put(fmd.getName(),new Integer(field_id));
+ memberPositionsByName.put(fmd.getName(), Integer.valueOf(field_id));
field_id++;
}
else
Modified: platform/core/trunk/src/java/org/datanucleus/properties/IntegerPropertyValidator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/properties/IntegerPropertyValidator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/properties/IntegerPropertyValidator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -43,7 +43,7 @@
String val = ((String)value).trim();
try
{
- new Integer(val);
+ Integer.valueOf(val);
return true;
}
catch (NumberFormatException nfe)
Modified: platform/core/trunk/src/java/org/datanucleus/query/compiler/JPQLParser.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/compiler/JPQLParser.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/compiler/JPQLParser.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -1745,7 +1745,7 @@
String paramName = id.substring(1);
try
{
- Node expr = new ParameterNode(Node.PARAMETER, new Integer(paramName), parameterPosition);
+ Node expr = new ParameterNode(Node.PARAMETER, Integer.valueOf(paramName), parameterPosition);
parameterPosition++;
stack.push(expr);
return true;
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/AbsFunctionEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/AbsFunctionEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/AbsFunctionEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -67,11 +67,11 @@
Object result = null;
if (paramValue instanceof Double)
{
- result = new Double(Math.abs(((Double)paramValue).doubleValue()));
+ result = Double.valueOf(Math.abs(((Double)paramValue).doubleValue()));
}
else if (paramValue instanceof Float)
{
- result = new Float(Math.abs(((Float)paramValue).floatValue()));
+ result = Float.valueOf(Math.abs(((Float)paramValue).floatValue()));
}
else if (paramValue instanceof BigDecimal)
{
@@ -79,11 +79,11 @@
}
else if (paramValue instanceof Integer)
{
- result = new Integer(Math.abs(((Integer)paramValue).intValue()));
+ result = Integer.valueOf(Math.abs(((Integer)paramValue).intValue()));
}
else if (paramValue instanceof Long)
{
- result = new Long(Math.abs(((Long)paramValue).longValue()));
+ result = Long.valueOf(Math.abs(((Long)paramValue).longValue()));
}
else
{
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/ContainerSizeMethodEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/ContainerSizeMethodEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/ContainerSizeMethodEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -44,15 +44,15 @@
Integer result = null;
if (invokedValue == null)
{
- result = new Integer(0);
+ result = Integer.valueOf(0);
}
else if (invokedValue instanceof Collection)
{
- result = new Integer(((Collection)invokedValue).size());
+ result = Integer.valueOf(((Collection)invokedValue).size());
}
else if (invokedValue instanceof Map)
{
- result = new Integer(((Map)invokedValue).size());
+ result = Integer.valueOf(((Map)invokedValue).size());
}
else
{
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetDayMethodEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetDayMethodEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetDayMethodEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -52,6 +52,6 @@
Calendar cal = Calendar.getInstance();
cal.setTime((Date)invokedValue);
- return new Integer(cal.get(Calendar.DAY_OF_MONTH));
+ return Integer.valueOf(cal.get(Calendar.DAY_OF_MONTH));
}
}
\ No newline at end of file
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetHoursMethodEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetHoursMethodEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetHoursMethodEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -52,6 +52,6 @@
Calendar cal = Calendar.getInstance();
cal.setTime((Date)invokedValue);
- return new Integer(cal.get(Calendar.HOUR_OF_DAY));
+ return Integer.valueOf(cal.get(Calendar.HOUR_OF_DAY));
}
}
\ No newline at end of file
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetMinutesMethodEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetMinutesMethodEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetMinutesMethodEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -52,6 +52,6 @@
Calendar cal = Calendar.getInstance();
cal.setTime((Date)invokedValue);
- return new Integer(cal.get(Calendar.MINUTE));
+ return Integer.valueOf(cal.get(Calendar.MINUTE));
}
}
\ No newline at end of file
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetMonthMethodEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetMonthMethodEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetMonthMethodEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -52,6 +52,6 @@
Calendar cal = Calendar.getInstance();
cal.setTime((Date)invokedValue);
- return new Integer(cal.get(Calendar.MONTH));
+ return Integer.valueOf(cal.get(Calendar.MONTH));
}
}
\ No newline at end of file
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetSecondsMethodEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetSecondsMethodEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetSecondsMethodEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -52,6 +52,6 @@
Calendar cal = Calendar.getInstance();
cal.setTime((Date)invokedValue);
- return new Integer(cal.get(Calendar.SECOND));
+ return Integer.valueOf(cal.get(Calendar.SECOND));
}
}
\ No newline at end of file
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetYearMethodEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetYearMethodEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/DateGetYearMethodEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -52,6 +52,6 @@
Calendar cal = Calendar.getInstance();
cal.setTime((Date)invokedValue);
- return new Integer(cal.get(Calendar.YEAR));
+ return Integer.valueOf(cal.get(Calendar.YEAR));
}
}
\ No newline at end of file
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/InMemoryExpressionEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/InMemoryExpressionEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/InMemoryExpressionEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -402,17 +402,17 @@
// Other types?
if (val instanceof Integer)
{
- stack.push(new Integer(-val.intValue()));
+ stack.push(Integer.valueOf(-val.intValue()));
return stack.peek();
}
else if (val instanceof Long)
{
- stack.push(new Long(-val.longValue()));
+ stack.push(Long.valueOf(-val.longValue()));
return stack.peek();
}
else if (val instanceof Short)
{
- stack.push(new Short((short)-val.shortValue()));
+ stack.push(Short.valueOf((short)-val.shortValue()));
return stack.peek();
}
else if (val instanceof BigInteger)
@@ -422,12 +422,12 @@
}
else if (val instanceof Double)
{
- stack.push(new Double(-val.doubleValue()));
+ stack.push(Double.valueOf(-val.doubleValue()));
return stack.peek();
}
else if (val instanceof Float)
{
- stack.push(new Float(-val.floatValue()));
+ stack.push(Float.valueOf(-val.floatValue()));
return stack.peek();
}
else if (val instanceof BigDecimal)
@@ -454,7 +454,7 @@
{
val = ((Number)primVal).intValue();
}
- Integer result = new Integer(~val);
+ Integer result = Integer.valueOf(~val);
stack.push(result);
return stack.peek();
}
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/IntegerAggregateExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/IntegerAggregateExpression.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/IntegerAggregateExpression.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -31,7 +31,7 @@
{
if (obj instanceof Integer)
{
- return new Integer(((Integer) obj).intValue() + ((Integer) value).intValue());
+ return Integer.valueOf(((Integer) obj).intValue() + ((Integer) value).intValue());
}
return super.add(obj);
}
@@ -45,7 +45,7 @@
{
if (obj instanceof Integer)
{
- return new Integer(((Integer) value).intValue() / ((Integer) obj).intValue());
+ return Integer.valueOf(((Integer) value).intValue() / ((Integer) obj).intValue());
}
return super.add(obj);
}
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/LengthFunctionEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/LengthFunctionEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/LengthFunctionEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -63,12 +63,12 @@
}
if (paramValue == null)
{
- return new Integer(0);
+ return Integer.valueOf(0);
}
if (!(paramValue instanceof String))
{
throw new NucleusException(LOCALISER.msg("021011", method, paramValue.getClass().getName()));
}
- return new Integer(((String)paramValue).length());
+ return Integer.valueOf(((String)paramValue).length());
}
}
\ No newline at end of file
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/LocateFunctionEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/LocateFunctionEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/LocateFunctionEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -63,7 +63,7 @@
}
if (paramValue == null)
{
- return new Integer(-1);
+ return Integer.valueOf(-1);
}
Object locStr = expr.getArguments().get(1);
@@ -89,11 +89,11 @@
{
throw new NucleusException(method + "(str, str2, pos) where pos is instanceof " + pos.getClass().getName() + " not supported");
}
- return new Integer(((String)paramValue).indexOf(locStrValue, num2Value));
+ return Integer.valueOf(((String)paramValue).indexOf(locStrValue, num2Value));
}
else
{
- return new Integer(((String)paramValue).indexOf(locStrValue));
+ return Integer.valueOf(((String)paramValue).indexOf(locStrValue));
}
}
}
\ No newline at end of file
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/ModFunctionEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/ModFunctionEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/ModFunctionEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -131,6 +131,6 @@
throw new NucleusException(method + "(num1, num2) where num2 is instanceof " + param2.getClass().getName() + " not supported");
}
- return new Integer(param1Value%param2Value);
+ return Integer.valueOf(param1Value%param2Value);
}
}
\ No newline at end of file
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/SetExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/SetExpression.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/SetExpression.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -204,7 +204,7 @@
{
if (val == null)
{
- val = new Float(0);
+ val = Float.valueOf(0);
}
memexpr = new FloatAggregateExpression((Float)result);
}
@@ -212,7 +212,7 @@
{
if (val == null)
{
- val = new Double(0);
+ val = Double.valueOf(0);
}
memexpr = new DoubleAggregateExpression((Double)result);
}
@@ -220,7 +220,7 @@
{
if (val == null)
{
- val = new Long(0);
+ val = Long.valueOf(0);
}
memexpr = new LongAggregateExpression((Long)result);
}
@@ -228,7 +228,7 @@
{
if (val == null)
{
- val = new Integer(0);
+ val = Integer.valueOf(0);
}
memexpr = new IntegerAggregateExpression((Integer)result);
}
@@ -236,7 +236,7 @@
{
if (val == null)
{
- val = new Short((short)0);
+ val = Short.valueOf((short)0);
}
memexpr = new ShortAggregateExpression((Short)result);
}
@@ -312,7 +312,7 @@
{
if (val == null)
{
- val = new Integer(0);
+ val = Integer.valueOf(0);
}
memexpr = new IntegerAggregateExpression((Integer)result);
}
@@ -368,7 +368,7 @@
else if (val instanceof Integer)
{
memexpr = new IntegerAggregateExpression((Integer)val);
- divisor = new Integer(i);
+ divisor = Integer.valueOf(i);
}
else if (val instanceof Short)
{
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/SizeFunctionEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/SizeFunctionEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/SizeFunctionEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -71,11 +71,11 @@
if (paramValue instanceof Collection)
{
- return new Integer(((Collection)paramValue).size());
+ return Integer.valueOf(((Collection)paramValue).size());
}
else if (paramValue instanceof Map)
{
- return new Integer(((Map)paramValue).size());
+ return Integer.valueOf(((Map)paramValue).size());
}
return null;
}
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/StringIndexOfMethodEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/StringIndexOfMethodEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/StringIndexOfMethodEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -44,7 +44,7 @@
if (invokedValue == null)
{
- return new Integer(-1);
+ return Integer.valueOf(-1);
}
if (!(invokedValue instanceof String))
{
@@ -96,11 +96,11 @@
{
throw new NucleusException(method + "(param1, param2) where param2 is instanceof " + param.getClass().getName() + " not supported");
}
- result = new Integer(((String)invokedValue).indexOf(arg1, arg2));
+ result = Integer.valueOf(((String)invokedValue).indexOf(arg1, arg2));
}
else
{
- result = new Integer(((String)invokedValue).indexOf(arg1));
+ result = Integer.valueOf(((String)invokedValue).indexOf(arg1));
}
return result;
}
Modified: platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/StringLengthMethodEvaluator.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/StringLengthMethodEvaluator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/evaluator/memory/StringLengthMethodEvaluator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -41,11 +41,11 @@
Integer result = null;
if (invokedValue == null)
{
- result = new Integer(0);
+ result = Integer.valueOf(0);
}
else if (invokedValue instanceof String)
{
- result = new Integer(((String)invokedValue).length());
+ result = Integer.valueOf(((String)invokedValue).length());
}
else
{
Modified: platform/core/trunk/src/java/org/datanucleus/query/expression/Literal.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/query/expression/Literal.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/query/expression/Literal.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -56,23 +56,23 @@
}
else if (value instanceof Integer)
{
- value = new Integer(-1*(Integer)value);
+ value = Integer.valueOf(-1*(Integer)value);
}
else if (value instanceof Long)
{
- value = new Long(-1*(Long)value);
+ value = Long.valueOf(-1*(Long)value);
}
else if (value instanceof Double)
{
- value = new Double(-1*(Double)value);
+ value = Double.valueOf(-1*(Double)value);
}
else if (value instanceof Float)
{
- value = new Float(-1*(Float)value);
+ value = Float.valueOf(-1*(Float)value);
}
else if (value instanceof Short)
{
- value = new Short((short)(-1*(Short)value));
+ value = Short.valueOf((short)(-1*(Short)value));
}
}
Modified: platform/core/trunk/src/java/org/datanucleus/state/RelationshipManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/state/RelationshipManager.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/state/RelationshipManager.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -122,7 +122,7 @@
return;
}
- Integer fieldKey = new Integer(fieldNumber);
+ Integer fieldKey = Integer.valueOf(fieldNumber);
AbstractClassMetaData cmd = ownerSM.getClassMetaData();
AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
int relationType = mmd.getRelationType(ownerSM.getObjectManager().getClassLoaderResolver());
@@ -237,7 +237,7 @@
return;
}
- Integer fieldKey = new Integer(fieldNumber);
+ Integer fieldKey = Integer.valueOf(fieldNumber);
Object changes = fieldChanges.get(fieldKey);
ArrayList changeList = null;
if (changes == null)
@@ -274,7 +274,7 @@
return;
}
- Integer fieldKey = new Integer(fieldNumber);
+ Integer fieldKey = Integer.valueOf(fieldNumber);
Object changes = fieldChanges.get(fieldKey);
ArrayList changeList = null;
if (changes == null)
@@ -297,7 +297,7 @@
*/
private boolean managesField(int fieldNumber)
{
- return fieldChanges.containsKey(new Integer(fieldNumber));
+ return fieldChanges.containsKey(Integer.valueOf(fieldNumber));
}
/**
Modified: platform/core/trunk/src/java/org/datanucleus/store/AbstractStoreManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/AbstractStoreManager.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/store/AbstractStoreManager.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -363,7 +363,7 @@
if (isolation_level >= 0)
{
options = new HashMap();
- options.put(Transaction.TRANSACTION_ISOLATION_OPTION, new Integer(isolation_level));
+ options.put(Transaction.TRANSACTION_ISOLATION_OPTION, Integer.valueOf(isolation_level));
}
return connFactory.getConnection(null, null, options);
}
Modified: platform/core/trunk/src/java/org/datanucleus/store/fieldmanager/SingleValueFieldManager.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/fieldmanager/SingleValueFieldManager.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/store/fieldmanager/SingleValueFieldManager.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -116,7 +116,7 @@
**/
public void storeIntField(int fieldNumber, int value)
{
- fieldValue = new Integer(value);
+ fieldValue = Integer.valueOf(value);
}
/**
Modified: platform/core/trunk/src/java/org/datanucleus/store/mapped/expression/ArrayExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/mapped/expression/ArrayExpression.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/store/mapped/expression/ArrayExpression.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -104,7 +104,7 @@
{
JavaTypeMapping mapping = qs.getStoreManager().getMappingManager().getMappingWithDatastoreMapping(
Integer.class, false, false, qs.getClassLoaderResolver());
- return new IntegerLiteral(qs,mapping,new Integer(exprs.length));
+ return new IntegerLiteral(qs,mapping, Integer.valueOf(exprs.length));
}
}
Modified: platform/core/trunk/src/java/org/datanucleus/store/mapped/expression/CharacterLiteral.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/mapped/expression/CharacterLiteral.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/store/mapped/expression/CharacterLiteral.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -148,12 +148,12 @@
if (expr instanceof CharacterLiteral)
{
int v = value.charAt(0)+((CharacterLiteral)expr).value.charAt(0);
- return new IntegerLiteral(qs, mapping, new Integer(v));
+ return new IntegerLiteral(qs, mapping, Integer.valueOf(v));
}
else if (expr instanceof IntegerLiteral)
{
int v = value.charAt(0)+((Number)((IntegerLiteral)expr).getValue()).intValue();
- return new IntegerLiteral(qs, mapping, new Integer(v));
+ return new IntegerLiteral(qs, mapping, Integer.valueOf(v));
}
else
{
@@ -166,12 +166,12 @@
if (expr instanceof CharacterLiteral)
{
int v = value.charAt(0)-((CharacterLiteral)expr).value.charAt(0);
- return new IntegerLiteral(qs, mapping, new Integer(v));
+ return new IntegerLiteral(qs, mapping, Integer.valueOf(v));
}
else if (expr instanceof IntegerLiteral)
{
int v = value.charAt(0)-((Number)((IntegerLiteral)expr).getValue()).intValue();
- return new IntegerLiteral(qs, mapping, new Integer(v));
+ return new IntegerLiteral(qs, mapping, Integer.valueOf(v));
}
else
{
@@ -184,12 +184,12 @@
if (expr instanceof CharacterLiteral)
{
int v = value.charAt(0)%((CharacterLiteral)expr).value.charAt(0);
- return new IntegerLiteral(qs, mapping, new Integer(v));
+ return new IntegerLiteral(qs, mapping, Integer.valueOf(v));
}
else if (expr instanceof IntegerLiteral)
{
int v = value.charAt(0)%((Number)((IntegerLiteral)expr).getValue()).intValue();
- return new IntegerLiteral(qs, mapping, new Integer(v));
+ return new IntegerLiteral(qs, mapping, Integer.valueOf(v));
}
else
{
@@ -218,13 +218,13 @@
public ScalarExpression neg()
{
int v = -(value.charAt(0));
- return new IntegerLiteral(qs, mapping, new Integer(v));
+ return new IntegerLiteral(qs, mapping, Integer.valueOf(v));
}
public ScalarExpression com()
{
int v = ~(value.charAt(0));
- return new IntegerLiteral(qs, mapping, new Integer(v));
+ return new IntegerLiteral(qs, mapping, Integer.valueOf(v));
}
/**
Modified: platform/core/trunk/src/java/org/datanucleus/store/mapped/expression/MathExpression.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/mapped/expression/MathExpression.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/store/mapped/expression/MathExpression.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -57,13 +57,13 @@
else if (expr instanceof IntegerLiteral)
{
int originalValue = ((Number) ((IntegerLiteral) expr).getValue()).intValue();
- Integer absValue = new Integer(Math.abs(originalValue));
+ Integer absValue = Integer.valueOf(Math.abs(originalValue));
return new IntegerLiteral(qs, expr.mapping, absValue);
}
else if (expr instanceof FloatingPointLiteral)
{
double originalValue = ((BigDecimal) ((FloatingPointLiteral) expr).getValue()).doubleValue();
- Double absValue = new Double(Math.abs(originalValue));
+ Double absValue = Double.valueOf(Math.abs(originalValue));
return new FloatingPointLiteral(qs, expr.mapping, absValue);
}
throw new IllegalOperationException(this, "absMethod", expr);
Modified: platform/core/trunk/src/java/org/datanucleus/store/mapped/mapping/EmbeddedMapping.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/mapped/mapping/EmbeddedMapping.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/store/mapped/mapping/EmbeddedMapping.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -351,12 +351,12 @@
if (mapping instanceof IntegerMapping ||
mapping instanceof ShortMapping)
{
- convertedValue = new Integer(nullValue);
+ convertedValue = Integer.valueOf(nullValue);
}
else if (mapping instanceof LongMapping ||
mapping instanceof BigIntegerMapping)
{
- convertedValue = new Long(nullValue);
+ convertedValue = Long.valueOf(nullValue);
}
}
catch (Exception e)
Modified: platform/core/trunk/src/java/org/datanucleus/store/mapped/mapping/IndexMapping.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/mapped/mapping/IndexMapping.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/store/mapped/mapping/IndexMapping.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -31,7 +31,7 @@
*/
public final class IndexMapping extends SingleFieldMapping
{
- private static Integer mappingSampleValue = new Integer(0);
+ private static Integer mappingSampleValue = Integer.valueOf(0);
/**
* Accessor for a sample value for this field
Modified: platform/core/trunk/src/java/org/datanucleus/store/mapped/mapping/IntegerMapping.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/mapped/mapping/IntegerMapping.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/store/mapped/mapping/IntegerMapping.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -41,7 +41,7 @@
}
// TODO Delete when we drop legacy support
- private static Integer mappingSampleValue = new Integer(0);
+ private static Integer mappingSampleValue = Integer.valueOf(0);
public Object getSampleValue(ClassLoaderResolver clr)
{
return mappingSampleValue;
Modified: platform/core/trunk/src/java/org/datanucleus/store/mapped/scostore/FKListStore.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/mapped/scostore/FKListStore.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/store/mapped/scostore/FKListStore.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -663,18 +663,18 @@
if (orderMapping.getMemberMetaData().getTypeName().equals(ClassNameConstants.JAVA_LANG_LONG) ||
orderMapping.getMemberMetaData().getTypeName().equals(ClassNameConstants.LONG))
{
- indexValue = new Long(index);
+ indexValue = Long.valueOf(index);
}
else
{
- indexValue = new Integer(index);
+ indexValue = Integer.valueOf(index);
}
esm.replaceField(orderMapping.getMemberMetaData().getAbsoluteFieldNumber(), indexValue, true);
}
else
{
// Order is stored in a surrogate column so save its vaue for the element to use later
- esm.setAssociatedValue(orderMapping, new Integer(index));
+ esm.setAssociatedValue(orderMapping, Integer.valueOf(index));
}
}
}
Modified: platform/core/trunk/src/java/org/datanucleus/store/query/AbstractSQLQuery.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/query/AbstractSQLQuery.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/store/query/AbstractSQLQuery.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -310,7 +310,7 @@
{
for (int i = 0; i < parameters.length; ++i)
{
- parameterMap.put(new Integer(i+1), parameters[i]);
+ parameterMap.put(Integer.valueOf(i+1), parameters[i]);
}
}
@@ -461,7 +461,7 @@
{
try
{
- Integer num = new Integer(paramName.toString());
+ Integer num = Integer.valueOf(paramName.toString());
expectedParams.add(num);
}
catch (NumberFormatException nfe)
@@ -476,7 +476,7 @@
if (!colonParam)
{
// Positional parameter
- expectedParams.add(new Integer(paramPos));
+ expectedParams.add(Integer.valueOf(paramPos));
}
else
{
@@ -510,7 +510,7 @@
throw new NucleusUserException(LOCALISER.msg("059030", inputSQL, "" + key));
}
- executeMap.put(new Integer(paramPos), params.get(key));
+ executeMap.put(Integer.valueOf(paramPos), params.get(key));
paramNames.add("" + paramPos);
paramPos++;
}
Modified: platform/core/trunk/src/java/org/datanucleus/store/query/Query.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/store/query/Query.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/store/query/Query.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -729,7 +729,7 @@
{
implicitParameters = new HashMap();
}
- implicitParameters.put(new Integer(position), value);
+ implicitParameters.put(Integer.valueOf(position), value);
if (compilation == null)
{
@@ -2145,7 +2145,7 @@
for (int i = 0; i < parameterValues.length; ++i)
{
// Dummy parameter name for DataNucleus, utilised by the implementation
- parameterMap.put(new Integer(i), parameterValues[i]);
+ parameterMap.put(Integer.valueOf(i), parameterValues[i]);
}
}
return parameterMap;
Modified: platform/core/trunk/src/java/org/datanucleus/util/ClassUtils.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/util/ClassUtils.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/util/ClassUtils.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -837,23 +837,23 @@
if (type == Long.class && value instanceof Number)
{
- return new Long(((Number)value).longValue());
+ return Long.valueOf(((Number)value).longValue());
}
else if (type == Integer.class && value instanceof Number)
{
- return new Integer(((Number)value).intValue());
+ return Integer.valueOf(((Number)value).intValue());
}
else if (type == Short.class && value instanceof Number)
{
- return new Short(((Number)value).shortValue());
+ return Short.valueOf(((Number)value).shortValue());
}
else if (type == Float.class && value instanceof Number)
{
- return new Float(((Number)value).doubleValue());
+ return Float.valueOf(((Number)value).floatValue());
}
else if (type == Double.class && value instanceof Number)
{
- return new Double(((Number)value).doubleValue());
+ return Double.valueOf(((Number)value).doubleValue());
}
return null;
}
Modified: platform/core/trunk/src/java/org/datanucleus/util/JavaUtils.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/util/JavaUtils.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/util/JavaUtils.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -115,11 +115,11 @@
String token = tokeniser.nextToken();
try
{
- Integer ver = new Integer(token);
+ Integer ver = Integer.valueOf(token);
majorVersion = ver.intValue();
token = tokeniser.nextToken();
- ver = new Integer(token);
+ ver = Integer.valueOf(token);
minorVersion = ver.intValue();
}
catch (Exception e)
@@ -141,11 +141,11 @@
String token = tokeniser.nextToken();
try
{
- Integer ver = new Integer(token);
+ Integer ver = Integer.valueOf(token);
int majorVersion = ver.intValue();
token = tokeniser.nextToken();
- ver = new Integer(token);
+ ver = Integer.valueOf(token);
int minorVersion = ver.intValue();
if (getJREMajorVersion() >= majorVersion && getJREMinorVersion() >= minorVersion)
{
@@ -172,11 +172,11 @@
String token = tokeniser.nextToken();
try
{
- Integer ver = new Integer(token);
+ Integer ver = Integer.valueOf(token);
int majorVersion = ver.intValue();
token = tokeniser.nextToken();
- ver = new Integer(token);
+ ver = Integer.valueOf(token);
int minorVersion = ver.intValue();
if (getJREMajorVersion() == majorVersion && getJREMinorVersion() == minorVersion)
{
Modified: platform/core/trunk/src/java/org/datanucleus/util/StringUtils.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/util/StringUtils.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/util/StringUtils.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -494,7 +494,7 @@
{
try
{
- value = (new Integer(props.getProperty(propName))).intValue();
+ value = (Integer.valueOf(props.getProperty(propName))).intValue();
}
catch (NumberFormatException nfe)
{
Modified: platform/core/trunk/src/java/org/datanucleus/util/TypeConversionHelper.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/util/TypeConversionHelper.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/core/trunk/src/java/org/datanucleus/util/TypeConversionHelper.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -806,7 +806,7 @@
Integer[] a = new Integer[d.length];
for (int i=0; i < a.length; i++)
{
- a[i] = new Integer(d[i]);
+ a[i] = Integer.valueOf(d[i]);
}
return a;
}
@@ -909,11 +909,11 @@
}
else if (type == int.class || type == Integer.class)
{
- return new Integer(value.toString());
+ return Integer.valueOf(value.toString());
}
else if (type == long.class || type == Long.class)
{
- return new Long(value.toString());
+ return Long.valueOf(value.toString());
}
else if (type == boolean.class || type == Boolean.class)
{
@@ -921,15 +921,15 @@
}
else if (type == byte.class || type == Byte.class)
{
- return new Byte(value.toString());
+ return Byte.valueOf(value.toString());
}
else if (type == float.class || type == Float.class)
{
- return new Float(value.toString());
+ return Float.valueOf(value.toString());
}
else if (type == double.class || type == Double.class)
{
- return new Double(value.toString());
+ return Double.valueOf(value.toString());
}
else if (type == BigDecimal.class)
{
@@ -1101,7 +1101,7 @@
{
if (!Character.isDigit(str.charAt(i)))
{
- list.add(new Integer(str.substring(start, i)));
+ list.add(Integer.valueOf(str.substring(start, i)));
start = -1;
}
}
@@ -1179,7 +1179,7 @@
{
try
{
- Integer val = new Integer(str);
+ Integer val = Integer.valueOf(str);
return val.intValue();
}
catch (NumberFormatException nfe)
Modified: platform/jpa/trunk/src/java/org/datanucleus/jpa/metadata/JPAAnnotationReader.java
===================================================================
--- platform/jpa/trunk/src/java/org/datanucleus/jpa/metadata/JPAAnnotationReader.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/jpa/trunk/src/java/org/datanucleus/jpa/metadata/JPAAnnotationReader.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -2038,12 +2038,12 @@
Integer initialValue = (Integer)annotationValues.get("initialValue");
if (initialValue == null)
{
- initialValue = new Integer(1); // JPA default
+ initialValue = Integer.valueOf(1); // JPA default
}
Integer allocationSize = (Integer)annotationValues.get("allocationSize");
if (allocationSize == null)
{
- allocationSize = new Integer(50); // JPA default
+ allocationSize = Integer.valueOf(50); // JPA default
}
SequenceMetaData seqmd = pmd.newSequenceMetadata(name, null);
seqmd.setDatastoreSequence(seqName);
Modified: platform/jpa/trunk/src/java/org/datanucleus/jpa/metadata/JPAMetaDataHandler.java
===================================================================
--- platform/jpa/trunk/src/java/org/datanucleus/jpa/metadata/JPAMetaDataHandler.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/jpa/trunk/src/java/org/datanucleus/jpa/metadata/JPAMetaDataHandler.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -911,7 +911,7 @@
{
try
{
- int origin = new Integer(orderingOrigin).intValue();
+ int origin = Integer.valueOf(orderingOrigin).intValue();
ordermd.setOrderOrigin(origin);
}
catch (NumberFormatException nfe)
Modified: platform/store.excel/trunk/src/java/org/datanucleus/store/excel/ExcelPersistenceHandler.java
===================================================================
--- platform/store.excel/trunk/src/java/org/datanucleus/store/excel/ExcelPersistenceHandler.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.excel/trunk/src/java/org/datanucleus/store/excel/ExcelPersistenceHandler.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -269,14 +269,14 @@
if (currentVersion instanceof Integer)
{
// Cater for Integer-based versions TODO Generalise this
- currentVersion = new Long(((Integer)currentVersion).longValue());
+ currentVersion = Long.valueOf(((Integer)currentVersion).longValue());
}
nextVersion = acmd.getVersionMetaData().getNextVersion(currentVersion);
if (verfmd.getType() == Integer.class || verfmd.getType() == int.class)
{
// Cater for Integer-based versions TODO Generalise this
- nextVersion = new Integer(((Long)nextVersion).intValue());
+ nextVersion = Integer.valueOf(((Long)nextVersion).intValue());
}
sm.replaceField(verfmd.getAbsoluteFieldNumber(), nextVersion, false);
}
Modified: platform/store.excel/trunk/src/java/org/datanucleus/store/excel/fieldmanager/FetchFieldManager.java
===================================================================
--- platform/store.excel/trunk/src/java/org/datanucleus/store/excel/fieldmanager/FetchFieldManager.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.excel/trunk/src/java/org/datanucleus/store/excel/fieldmanager/FetchFieldManager.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -94,23 +94,23 @@
double val = cell.getNumericCellValue();
if (Double.class.isAssignableFrom(mmd.getType()))
{
- return new Double(val);
+ return Double.valueOf(val);
}
else if (Float.class.isAssignableFrom(mmd.getType()))
{
- return new Float(val);
+ return Float.valueOf((float)val);
}
else if (Integer.class.isAssignableFrom(mmd.getType()))
{
- return new Integer((int)val);
+ return Integer.valueOf((int)val);
}
else if (Long.class.isAssignableFrom(mmd.getType()))
{
- return new Long((long)val);
+ return Long.valueOf((long)val);
}
else if (Short.class.isAssignableFrom(mmd.getType()))
{
- return new Short((short)val);
+ return Short.valueOf((short)val);
}
else if (BigDecimal.class.isAssignableFrom(mmd.getType()))
{
Modified: platform/store.excel/trunk/src/java/org/datanucleus/store/excel/valuegenerator/MaxGenerator.java
===================================================================
--- platform/store.excel/trunk/src/java/org/datanucleus/store/excel/valuegenerator/MaxGenerator.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.excel/trunk/src/java/org/datanucleus/store/excel/valuegenerator/MaxGenerator.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -54,7 +54,7 @@
}
try
{
- columnIndex = new Integer(val).intValue();
+ columnIndex = Integer.valueOf(val).intValue();
}
catch (NumberFormatException nfe)
{
Modified: platform/store.odf/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.odf/trunk/META-INF/MANIFEST.MF 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.odf/trunk/META-INF/MANIFEST.MF 2010-01-12 10:51:38 UTC (rev 8522)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: ODF Plugin
Bundle-SymbolicName: org.datanucleus.store.odf;singleton:=true
-Bundle-Version: 2.0.0.release
+Bundle-Version: 2.0.1
Bundle-Vendor: DataNucleus
Require-Bundle: org.datanucleus;bundle-version="2.0.0.m4"
Import-Package: org.apache.xerces.dom,
Modified: platform/store.odf/trunk/pom.xml
===================================================================
--- platform/store.odf/trunk/pom.xml 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.odf/trunk/pom.xml 2010-01-12 10:51:38 UTC (rev 8522)
@@ -2,7 +2,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.datanucleus</groupId>
- <version>2.0.0-release</version>
+ <version>2.0.1-SNAPSHOT</version>
<artifactId>datanucleus-odf</artifactId>
<name>DataNucleus OpenOffice plugin</name>
<description>
Modified: platform/store.odf/trunk/src/java/org/datanucleus/store/odf/ODFPersistenceHandler.java
===================================================================
--- platform/store.odf/trunk/src/java/org/datanucleus/store/odf/ODFPersistenceHandler.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.odf/trunk/src/java/org/datanucleus/store/odf/ODFPersistenceHandler.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -263,14 +263,14 @@
if (currentVersion instanceof Integer)
{
// Cater for Integer-based versions TODO Generalise this
- currentVersion = new Long(((Integer)currentVersion).longValue());
+ currentVersion = Long.valueOf(((Integer)currentVersion).longValue());
}
nextVersion = acmd.getVersionMetaData().getNextVersion(currentVersion);
if (verfmd.getType() == Integer.class || verfmd.getType() == int.class)
{
// Cater for Integer-based versions TODO Generalise this
- nextVersion = new Integer(((Long)nextVersion).intValue());
+ nextVersion = Integer.valueOf(((Long)nextVersion).intValue());
}
sm.replaceField(verfmd.getAbsoluteFieldNumber(), nextVersion, false);
}
Modified: platform/store.odf/trunk/src/java/org/datanucleus/store/odf/ODFUtils.java
===================================================================
--- platform/store.odf/trunk/src/java/org/datanucleus/store/odf/ODFUtils.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.odf/trunk/src/java/org/datanucleus/store/odf/ODFUtils.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -263,7 +263,7 @@
String colName = ammd.getColumn();
try
{
- return new Integer(colName).intValue();
+ return Integer.valueOf(colName).intValue();
}
catch (NumberFormatException nfe)
{
@@ -279,7 +279,7 @@
{
try
{
- return new Integer(index).intValue();
+ return Integer.valueOf(index).intValue();
}
catch (NumberFormatException nfe)
{
@@ -301,7 +301,7 @@
String colName = imd.getColumnMetaData()[0].getName();
try
{
- return new Integer(colName).intValue();
+ return Integer.valueOf(colName).intValue();
}
catch (NumberFormatException nfe)
{
@@ -317,7 +317,7 @@
{
try
{
- return new Integer(index).intValue();
+ return Integer.valueOf(index).intValue();
}
catch (NumberFormatException nfe)
{
@@ -341,7 +341,7 @@
String colName = vmd.getColumnMetaData()[0].getName();
try
{
- return new Integer(colName).intValue();
+ return Integer.valueOf(colName).intValue();
}
catch (NumberFormatException nfe)
{
@@ -357,7 +357,7 @@
{
try
{
- return new Integer(index).intValue();
+ return Integer.valueOf(index).intValue();
}
catch (NumberFormatException nfe)
{
Modified: platform/store.rdbms/trunk/META-INF/MANIFEST.MF
===================================================================
--- platform/store.rdbms/trunk/META-INF/MANIFEST.MF 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/META-INF/MANIFEST.MF 2010-01-12 10:51:38 UTC (rev 8522)
@@ -3,7 +3,7 @@
Bundle-Name: DataNucleus RDBMS
Bundle-SymbolicName: org.datanucleus.store.rdbms;singleton:=true
Bundle-Vendor: DataNucleus
-Bundle-Version: 2.0.0.release
+Bundle-Version: 2.0.1
Bundle-Localization: plugin
Require-Bundle: org.datanucleus;bundle-version="2.0.0.m4"
Export-Package: org.datanucleus.store.rdbms,
Modified: platform/store.rdbms/trunk/pom.xml
===================================================================
--- platform/store.rdbms/trunk/pom.xml 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/pom.xml 2010-01-12 10:51:38 UTC (rev 8522)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.datanucleus</groupId>
<artifactId>datanucleus-rdbms</artifactId>
- <version>2.0.0-release</version>
+ <version>2.0.1-SNAPSHOT</version>
<name>DataNucleus RDBMS</name>
<description>
Plugin for DataNucleus providing persistence to RDBMS datastores.
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/JDBCUtils.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/JDBCUtils.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/JDBCUtils.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -48,41 +48,41 @@
static
{
// Add the supported types
- supportedJdbcTypesById.put(new Integer(Types.BIGINT), "BIGINT");
- supportedJdbcTypesById.put(new Integer(Types.BIT), "BIT");
- supportedJdbcTypesById.put(new Integer(Types.BLOB), "BLOB");
- supportedJdbcTypesById.put(new Integer(Types.BOOLEAN), "BOOLEAN");
- supportedJdbcTypesById.put(new Integer(Types.CHAR), "CHAR");
- supportedJdbcTypesById.put(new Integer(Types.CLOB), "CLOB");
- supportedJdbcTypesById.put(new Integer(Types.DATALINK), "DATALINK");
- supportedJdbcTypesById.put(new Integer(Types.DATE), "DATE");
- supportedJdbcTypesById.put(new Integer(Types.DECIMAL), "DECIMAL");
- supportedJdbcTypesById.put(new Integer(Types.DOUBLE), "DOUBLE");
- supportedJdbcTypesById.put(new Integer(Types.FLOAT), "FLOAT");
- supportedJdbcTypesById.put(new Integer(Types.INTEGER), "INTEGER");
- supportedJdbcTypesById.put(new Integer(Types.LONGVARBINARY), "LONGVARBINARY");
- supportedJdbcTypesById.put(new Integer(Types.LONGVARCHAR), "LONGVARCHAR");
- supportedJdbcTypesById.put(new Integer(Types.NUMERIC), "NUMERIC");
- supportedJdbcTypesById.put(new Integer(Types.REAL), "REAL");
- supportedJdbcTypesById.put(new Integer(Types.SMALLINT), "SMALLINT");
- supportedJdbcTypesById.put(new Integer(Types.TIME), "TIME");
- supportedJdbcTypesById.put(new Integer(Types.TIMESTAMP), "TIMESTAMP");
- supportedJdbcTypesById.put(new Integer(Types.TINYINT), "TINYINT");
- supportedJdbcTypesById.put(new Integer(Types.VARBINARY), "VARBINARY");
- supportedJdbcTypesById.put(new Integer(Types.VARCHAR), "VARCHAR");
- supportedJdbcTypesById.put(new Integer(-9), "NVARCHAR"); // JDK 1.6 addition
- supportedJdbcTypesById.put(new Integer(-15), "NCHAR"); // JDK 1.6 addition
- supportedJdbcTypesById.put(new Integer(2011), "NCLOB"); // JDK 1.6 addition
+ supportedJdbcTypesById.put(Integer.valueOf(Types.BIGINT), "BIGINT");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.BIT), "BIT");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.BLOB), "BLOB");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.BOOLEAN), "BOOLEAN");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.CHAR), "CHAR");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.CLOB), "CLOB");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.DATALINK), "DATALINK");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.DATE), "DATE");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.DECIMAL), "DECIMAL");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.DOUBLE), "DOUBLE");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.FLOAT), "FLOAT");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.INTEGER), "INTEGER");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.LONGVARBINARY), "LONGVARBINARY");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.LONGVARCHAR), "LONGVARCHAR");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.NUMERIC), "NUMERIC");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.REAL), "REAL");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.SMALLINT), "SMALLINT");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.TIME), "TIME");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.TIMESTAMP), "TIMESTAMP");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.TINYINT), "TINYINT");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.VARBINARY), "VARBINARY");
+ supportedJdbcTypesById.put(Integer.valueOf(Types.VARCHAR), "VARCHAR");
+ supportedJdbcTypesById.put(Integer.valueOf(-9), "NVARCHAR"); // JDK 1.6 addition
+ supportedJdbcTypesById.put(Integer.valueOf(-15), "NCHAR"); // JDK 1.6 addition
+ supportedJdbcTypesById.put(Integer.valueOf(2011), "NCLOB"); // JDK 1.6 addition
// Add the unsupported types
- unsupportedJdbcTypesById.put(new Integer(Types.ARRAY), "ARRAY");
- unsupportedJdbcTypesById.put(new Integer(Types.BINARY), "BINARY");
- unsupportedJdbcTypesById.put(new Integer(Types.DISTINCT), "DISTINCT");
- unsupportedJdbcTypesById.put(new Integer(Types.JAVA_OBJECT), "JAVA_OBJECT");
- unsupportedJdbcTypesById.put(new Integer(Types.NULL), "NULL");
- unsupportedJdbcTypesById.put(new Integer(Types.OTHER), "OTHER");
- unsupportedJdbcTypesById.put(new Integer(Types.REF), "REF");
- unsupportedJdbcTypesById.put(new Integer(Types.STRUCT), "STRUCT");
+ unsupportedJdbcTypesById.put(Integer.valueOf(Types.ARRAY), "ARRAY");
+ unsupportedJdbcTypesById.put(Integer.valueOf(Types.BINARY), "BINARY");
+ unsupportedJdbcTypesById.put(Integer.valueOf(Types.DISTINCT), "DISTINCT");
+ unsupportedJdbcTypesById.put(Integer.valueOf(Types.JAVA_OBJECT), "JAVA_OBJECT");
+ unsupportedJdbcTypesById.put(Integer.valueOf(Types.NULL), "NULL");
+ unsupportedJdbcTypesById.put(Integer.valueOf(Types.OTHER), "OTHER");
+ unsupportedJdbcTypesById.put(Integer.valueOf(Types.REF), "REF");
+ unsupportedJdbcTypesById.put(Integer.valueOf(Types.STRUCT), "STRUCT");
}
/**
@@ -137,10 +137,10 @@
*/
public static String getNameForJDBCType(int jdbcType)
{
- String typeName = (String)supportedJdbcTypesById.get(new Integer(jdbcType));
+ String typeName = (String)supportedJdbcTypesById.get(Integer.valueOf(jdbcType));
if (typeName == null)
{
- typeName = (String)unsupportedJdbcTypesById.get(new Integer(jdbcType));
+ typeName = (String)unsupportedJdbcTypesById.get(Integer.valueOf(jdbcType));
}
return typeName;
}
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/ParamLoggingPreparedStatement.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/ParamLoggingPreparedStatement.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/ParamLoggingPreparedStatement.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -142,7 +142,7 @@
String token = tokenizer.nextToken();
if (token.equals("?"))
{
- final Object paramValue = stParams.parameters.get(new Integer(i++));
+ final Object paramValue = stParams.parameters.get(Integer.valueOf(i++));
appendParamValue(statementWithParams, paramValue);
}
else
@@ -190,7 +190,7 @@
private void setParameter(int i, Object p)
{
- currentStatement.parameters.put(new Integer(i), p);
+ currentStatement.parameters.put(Integer.valueOf(i), p);
}
/**
@@ -201,7 +201,7 @@
*/
public Object getParameter(int i)
{
- return currentStatement.parameters.get(new Integer(i));
+ return currentStatement.parameters.get(Integer.valueOf(i));
}
/*
@@ -737,7 +737,7 @@
*/
public void setFloat(int parameterIndex, float x) throws SQLException
{
- setParameter(parameterIndex, new Float(x));
+ setParameter(parameterIndex, Float.valueOf(x));
ps.setFloat(parameterIndex, x);
}
@@ -747,7 +747,7 @@
*/
public void setInt(int parameterIndex, int x) throws SQLException
{
- setParameter(parameterIndex, new Integer(x));
+ setParameter(parameterIndex, Integer.valueOf(x));
ps.setInt(parameterIndex, x);
}
@@ -757,7 +757,7 @@
*/
public void setLong(int parameterIndex, long x) throws SQLException
{
- setParameter(parameterIndex, new Long(x));
+ setParameter(parameterIndex, Long.valueOf(x));
ps.setLong(parameterIndex, x);
}
@@ -855,7 +855,7 @@
*/
public void setShort(int parameterIndex, short x) throws SQLException
{
- setParameter(parameterIndex, new Short(x));
+ setParameter(parameterIndex, Short.valueOf(x));
ps.setShort(parameterIndex, x);
}
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/DecimalRDBMSMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/DecimalRDBMSMapping.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/DecimalRDBMSMapping.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -312,12 +312,12 @@
if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_INTEGER))
{
value = ((ResultSet) rs).getBigDecimal(param);
- value = value == null ? null : new Integer(((BigDecimal)value).toBigInteger().intValue());
+ value = value == null ? null : Integer.valueOf(((BigDecimal)value).toBigInteger().intValue());
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_LONG))
{
value = ((ResultSet) rs).getBigDecimal(param);
- value = value == null ? null : new Long(((BigDecimal)value).toBigInteger().longValue());
+ value = value == null ? null : Long.valueOf(((BigDecimal)value).toBigInteger().longValue());
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_MATH_BIGINTEGER))
{
@@ -341,7 +341,7 @@
else
{
int i = ((ResultSet) rs).getInt(param);
- value = ((ResultSet) rs).wasNull() ? null : new Integer(i);
+ value = ((ResultSet) rs).wasNull() ? null : Integer.valueOf(i);
}
}
catch (SQLException e)
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/DoubleRDBMSMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/DoubleRDBMSMapping.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/DoubleRDBMSMapping.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -272,11 +272,11 @@
double d = ((ResultSet) rs).getDouble(param);
if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_INTEGER))
{
- value = ((ResultSet) rs).wasNull() ? null : new Integer((int)d);
+ value = ((ResultSet) rs).wasNull() ? null : Integer.valueOf((int)d);
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_LONG))
{
- value = ((ResultSet) rs).wasNull() ? null : new Long((long)d);
+ value = ((ResultSet) rs).wasNull() ? null : Long.valueOf((long)d);
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_FLOAT))
{
@@ -284,7 +284,7 @@
}
else
{
- value = ((ResultSet) rs).wasNull() ? null : new Double(d);
+ value = ((ResultSet) rs).wasNull() ? null : Double.valueOf(d);
}
}
catch (SQLException e)
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/FloatRDBMSMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/FloatRDBMSMapping.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/FloatRDBMSMapping.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -148,11 +148,11 @@
float d = ((ResultSet) rs).getFloat(param);
if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_INTEGER))
{
- value = ((ResultSet) rs).wasNull() ? null : new Integer((int) d);
+ value = ((ResultSet) rs).wasNull() ? null : Integer.valueOf((int) d);
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_LONG))
{
- value = ((ResultSet) rs).wasNull() ? null : new Long((long) d);
+ value = ((ResultSet) rs).wasNull() ? null : Long.valueOf((long) d);
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_FLOAT))
{
@@ -161,11 +161,11 @@
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_DOUBLE))
{
double dbl = ((ResultSet)rs).getDouble(param);
- value = ((ResultSet) rs).wasNull() ? null : new Double(dbl);
+ value = ((ResultSet) rs).wasNull() ? null : Double.valueOf(dbl);
}
else
{
- value = ((ResultSet) rs).wasNull() ? null : new Double(d);
+ value = ((ResultSet) rs).wasNull() ? null : Double.valueOf(d);
}
}
catch (SQLException e)
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/IntegerRDBMSMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/IntegerRDBMSMapping.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/IntegerRDBMSMapping.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -258,11 +258,11 @@
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_LONG))
{
- value = ((ResultSet) rs).wasNull() ? null : new Long(i);
+ value = ((ResultSet) rs).wasNull() ? null : Long.valueOf(i);
}
else
{
- value = ((ResultSet) rs).wasNull() ? null : new Integer((int)i);
+ value = ((ResultSet) rs).wasNull() ? null : Integer.valueOf((int)i);
}
}
catch (SQLException e)
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/NumericRDBMSMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/NumericRDBMSMapping.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/NumericRDBMSMapping.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -491,11 +491,11 @@
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_INTEGER))
{
- return new Integer(value.intValue());
+ return Integer.valueOf(value.intValue());
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_LONG))
{
- return new Long(value.longValue());
+ return Long.valueOf(value.longValue());
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_BOOLEAN))
{
@@ -503,19 +503,19 @@
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_BYTE))
{
- return new Byte(value.byteValue());
+ return Byte.valueOf(value.byteValue());
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_SHORT))
{
- return new Short(value.shortValue());
+ return Short.valueOf(value.shortValue());
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_FLOAT))
{
- return new Float(value.floatValue());
+ return Float.valueOf(value.floatValue());
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_DOUBLE))
{
- return new Double(value.doubleValue());
+ return Double.valueOf(value.doubleValue());
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_CHARACTER))
{
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/SmallIntRDBMSMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/SmallIntRDBMSMapping.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/SmallIntRDBMSMapping.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -374,11 +374,11 @@
short d = ((ResultSet) rs).getShort(param);
if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_SHORT))
{
- value = ((ResultSet)rs).wasNull() ? null : new Short(d);
+ value = ((ResultSet)rs).wasNull() ? null : Short.valueOf(d);
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_INTEGER))
{
- value = ((ResultSet)rs).wasNull() ? null : new Integer(d);
+ value = ((ResultSet)rs).wasNull() ? null : Integer.valueOf(d);
}
else if (getJavaTypeMapping().getJavaType().getName().equals(ClassNameConstants.JAVA_LANG_BYTE))
{
@@ -394,7 +394,7 @@
}
else
{
- value = ((ResultSet) rs).wasNull() ? null : new Short(d);
+ value = ((ResultSet) rs).wasNull() ? null : Short.valueOf(d);
}
}
catch (SQLException e)
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultClassROF.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -659,7 +659,7 @@
{
public Object getValue(ResultSet rs, int i) throws SQLException
{
- return new Byte(rs.getByte(i));
+ return Byte.valueOf(rs.getByte(i));
}
});
@@ -667,7 +667,7 @@
{
public Object getValue(ResultSet rs, int i) throws SQLException
{
- return new Short(rs.getShort(i));
+ return Short.valueOf(rs.getShort(i));
}
});
@@ -675,7 +675,7 @@
{
public Object getValue(ResultSet rs, int i) throws SQLException
{
- return new Integer(rs.getInt(i));
+ return Integer.valueOf(rs.getInt(i));
}
});
@@ -683,7 +683,7 @@
{
public Object getValue(ResultSet rs, int i) throws SQLException
{
- return new Long(rs.getLong(i));
+ return Long.valueOf(rs.getLong(i));
}
});
@@ -691,7 +691,7 @@
{
public Object getValue(ResultSet rs, int i) throws SQLException
{
- return new Float(rs.getFloat(i));
+ return Float.valueOf(rs.getFloat(i));
}
});
@@ -699,7 +699,7 @@
{
public Object getValue(ResultSet rs, int i) throws SQLException
{
- return new Double(rs.getDouble(i));
+ return Double.valueOf(rs.getDouble(i));
}
});
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/ResultMetaDataROF.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -227,7 +227,7 @@
{
if (fmds != null && fmds[k] == apmd)
{
- indexes.add(new Integer(k));
+ indexes.add(Integer.valueOf(k));
}
}
int[] indxs = new int[indexes.size()];
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/SQLQuery.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -221,7 +221,7 @@
{
for (int i=0;i<parameters.size();i++)
{
- Object obj = parameters.get(new Integer(i+1));
+ Object obj = parameters.get(Integer.valueOf(i+1));
ps.setObject((i+1), obj);
}
}
@@ -332,7 +332,7 @@
{
for (int i=0;i<parameters.size();i++)
{
- Object obj = parameters.get(new Integer(i+1));
+ Object obj = parameters.get(Integer.valueOf(i+1));
ps.setObject((i+1), obj);
}
}
@@ -438,7 +438,7 @@
for (int colNum = 0;colNum<fmd.getColumnMetaData().length;colNum++)
{
columnName = fmd.getColumnMetaData()[colNum].getName();
- columnFieldNumberMap.put(columnName, new Integer(fieldNumber));
+ columnFieldNumberMap.put(columnName, Integer.valueOf(fieldNumber));
}
}
else
@@ -446,7 +446,7 @@
columnName = storeMgr.getIdentifierFactory().newDatastoreFieldIdentifier(
fieldName, om.getOMFContext().getTypeManager().isDefaultEmbeddedType(fieldType),
FieldRole.ROLE_NONE).getIdentifierName();
- columnFieldNumberMap.put(columnName, new Integer(fieldNumber));
+ columnFieldNumberMap.put(columnName, Integer.valueOf(fieldNumber));
}
}
else
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/legacy/JDOQLQueryCompiler.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/legacy/JDOQLQueryCompiler.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/legacy/JDOQLQueryCompiler.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -1123,7 +1123,7 @@
// Find the next implicit parameter available and assign to this implicit parameter
// All numbered parameters are keyed by the Integer form
- Integer paramNoInt = new Integer(implicitParamNo);
+ Integer paramNoInt = Integer.valueOf(implicitParamNo);
if (!parameters.containsKey(paramNoInt))
{
throw new NucleusUserException(LOCALISER.msg("021056", "" + id, "" + implicitParamNo));
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/legacy/JPQLQueryCompiler.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/legacy/JPQLQueryCompiler.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/legacy/JPQLQueryCompiler.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -1974,7 +1974,7 @@
MappedStoreManager srm = (MappedStoreManager)query.getObjectManager().getStoreManager();
ClassLoaderResolver clr = query.getObjectManager().getClassLoaderResolver();
id = id.substring(1); // Omit the "?"
- Integer position = new Integer(id);
+ Integer position = Integer.valueOf(id);
if (processedParameters == null)
{
processedParameters = new HashSet();
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/legacy/QueryStatement.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/legacy/QueryStatement.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/query/legacy/QueryStatement.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -1517,7 +1517,7 @@
return;
}
JavaTypeMapping m = storeMgr.getMappingManager().getMapping(Integer.class);
- condition = m.newLiteral(this, new Integer("1")).eq(m.newLiteral(this, new Integer("0")));
+ condition = m.newLiteral(this, Integer.valueOf("1")).eq(m.newLiteral(this, Integer.valueOf("0")));
}
if (whereExpr == null)
@@ -1569,7 +1569,7 @@
return;
}
JavaTypeMapping m = storeMgr.getMappingManager().getMapping(Integer.class);
- condition = m.newLiteral(this, new Integer("1")).eq(m.newLiteral(this, new Integer("0")));
+ condition = m.newLiteral(this, Integer.valueOf("1")).eq(m.newLiteral(this, Integer.valueOf("0")));
}
if (whereExpr == null)
@@ -1910,7 +1910,7 @@
else
{
JavaTypeMapping m = storeMgr.getMappingManager().getMapping(Integer.class);
- stmtText.append(m.newLiteral(this, new Integer("1")).toStatementText(ScalarExpression.PROJECTION).toStatementString(ScalarExpression.PROJECTION));
+ stmtText.append(m.newLiteral(this, Integer.valueOf("1")).toStatementText(ScalarExpression.PROJECTION).toStatementString(ScalarExpression.PROJECTION));
}
/*
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -479,7 +479,7 @@
{
if (fmd.isPrimaryKey())
{
- Integer abs_field_num = new Integer(fmd.getAbsoluteFieldNumber());
+ Integer abs_field_num = Integer.valueOf(fmd.getAbsoluteFieldNumber());
int parametersIndex[] = new int[m.getNumberOfDatastoreMappings()];
StatementMappingIndex sei = new StatementMappingIndex(m);
sei.addParameterOccurrence(parametersIndex);
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -218,7 +218,7 @@
if (verfmd.getType() == Integer.class || verfmd.getType() == int.class)
{
// Cater for Integer based versions TODO Generalise this
- nextOptimisticVersion = new Integer(((Long)nextOptimisticVersion).intValue());
+ nextOptimisticVersion = Integer.valueOf(((Long)nextOptimisticVersion).intValue());
}
sm.replaceField(verfmd.getAbsoluteFieldNumber(), nextOptimisticVersion, false);
}
@@ -393,7 +393,7 @@
if (orderValue == null)
{
// No order value so use -1
- orderValue = new Integer(-1);
+ orderValue = Integer.valueOf(-1);
}
for (int k=0;k<externalOrderStmtMappings[i].getNumberOfParameterOccurrences();k++)
{
@@ -712,7 +712,7 @@
if (fmd.getMappedBy() != null)
{
// 1-1 Non-owner bidirectional field (no datastore columns)
- reachableFields.add(new Integer(fmd.getAbsoluteFieldNumber()));
+ reachableFields.add(Integer.valueOf(fmd.getAbsoluteFieldNumber()));
}
}
else if (relationType == Relation.MANY_TO_ONE_BI)
@@ -721,7 +721,7 @@
if (fmd.getJoinMetaData() != null || relatedMmds[0].getJoinMetaData() != null)
{
// N-1 bidirectional field using join (no datastore columns)
- reachableFields.add(new Integer(fmd.getAbsoluteFieldNumber()));
+ reachableFields.add(Integer.valueOf(fmd.getAbsoluteFieldNumber()));
}
}
// TODO What about 1-N non-owner
@@ -761,7 +761,7 @@
if (fmd.getJoinMetaData() == null && relatedMmds[0].getJoinMetaData() == null)
{
// N-1 bidirectional field using FK (in this table)
- relationFields.add(new Integer(fmd.getAbsoluteFieldNumber()));
+ relationFields.add(Integer.valueOf(fmd.getAbsoluteFieldNumber()));
}
}
@@ -795,7 +795,7 @@
if (((RDBMSMapping)m.getDatastoreMapping(j)).insertValuesOnInsert())
{
// only add fields to be replaced by the real values only if the param value has ?
- Integer abs_field_num = new Integer(fmd.getAbsoluteFieldNumber());
+ Integer abs_field_num = Integer.valueOf(fmd.getAbsoluteFieldNumber());
if (fmd.isPrimaryKey())
{
if (!pkFields.contains(abs_field_num))
@@ -812,7 +812,7 @@
}
parametersIndex[j] = paramIndex++;
}
- assignedColumns.put(c.getIdentifier().toString(),new Integer(fmd.getAbsoluteFieldNumber()));
+ assignedColumns.put(c.getIdentifier().toString(),Integer.valueOf(fmd.getAbsoluteFieldNumber()));
}
else
{
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/UpdateRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/UpdateRequest.java 2010-01-12 09:03:15 UTC (rev 8521)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/UpdateRequest.java 2010-01-12 10:51:38 UTC (rev 8522)
@@ -257,13 +257,13 @@
if (currentVersion instanceof Number)
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|