This is an automated email from the ASF dual-hosted git repository.
pcristof pushed a commit to branch OPENJPA-2940
in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit 3fe110eda45d93d6357c366c066da8f2d4134dc7
Author: Paulo Cristovão de Araújo Silva Filho <pcris...@gmail.com>
AuthorDate: Thu Jul 3 17:34:23 2025 -0300
[OPENJPA-2940][WIP] Updating project to JDK17
* Replacing string number constructors
* Removing dangling SecurityContext references
---
.../validation/TestTraversableResolver.java | 4 +-
.../jdbc/kernel/exps/JDBCExpressionFactory.java | 2 +-
.../org/apache/openjpa/jdbc/meta/MappingInfo.java | 4 +-
.../org/apache/openjpa/jdbc/schema/Column.java | 8 +--
.../openjpa/jdbc/schema/XMLSchemaParser.java | 4 +-
.../org/apache/openjpa/jdbc/sql/DB2Dictionary.java | 12 ++--
.../openjpa/ee/InvocationManagedRuntime.java | 5 +-
.../org/apache/openjpa/ee/WLSManagedRuntime.java | 11 ++--
.../org/apache/openjpa/enhance/Reflection.java | 4 +-
.../java/org/apache/openjpa/kernel/Filters.java | 2 +-
.../openjpa/enhance/TestGetDeclaredMethod.java | 6 +-
.../apache/openjpa/meta/TestMemberProvider.java | 3 +-
.../openjpa/lib/meta/ClassMetaDataIterator.java | 3 +-
.../openjpa/lib/util/TestPropertiesParser.java | 11 ++--
.../apache/openjpa/lib/util/TestUUIDGenerator.java | 73 +++++++++-------------
.../apache/openjpa/conf/TestQueryProperties.java | 3 +-
.../kernel/AbstractBrokerSerializationTest.java | 2 +-
.../kernel/TestBrokerFactoryListenerRegistry.java | 2 +-
.../persistence/annotations/TestOneToOne.java | 4 +-
.../datacache/TestMutableParameters.java | 2 +-
.../persistence/datacache/TestStatistics.java | 5 +-
.../persistence/embed/TestEmbeddedWithQuery.java | 8 +--
.../embed/attrOverrides/TestAttrOverrides.java | 2 +-
.../embed/attrOverrides/TestAttrOverridesXml.java | 2 +-
.../compositepk/TestCompositePrimaryKeys.java | 2 +-
.../TestAbstractJoinedAppId.java | 2 +-
.../persistence/jdbc/annotations/AnnoTest1.java | 2 +-
.../persistence/jdbc/annotations/TestOneToOne.java | 4 +-
.../jdbc/query/TestAggregateQueryWithNoResult.java | 10 +--
.../persistence/kernel/common/apps/AppIdSubA.java | 2 +-
.../openjpa/persistence/merge/TestMergeNew.java | 8 +--
.../persistence/meta/TestSequenceAssigned.java | 2 +-
.../persistence/proxy/delayed/Location.java | 2 +-
.../persistence/proxy/delayed/pqueue/Account.java | 2 +-
.../persistence/proxy/delayed/tset/Account.java | 2 +-
.../persistence/proxy/entities/Annuity.java | 4 +-
.../persistence/proxy/entities/FixedAnnuity.java | 2 +-
.../persistence/query/TestQueryTimeout.java | 8 +--
.../AnnotationPersistenceXMLMetaDataParser.java | 72 ++++++++++-----------
.../openjpa/enhance/stats/FetchStatsCollector.java | 20 ++----
.../apache/openjpa/xmlstore/XMLFileHandler.java | 14 ++---
41 files changed, 149 insertions(+), 191 deletions(-)
diff --git
a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestTraversableResolver.java
b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestTraversableResolver.java
index 6c3576add..484e8d7c9 100644
---
a/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestTraversableResolver.java
+++
b/openjpa-integration/validation/src/test/java/org/apache/openjpa/integration/validation/TestTraversableResolver.java
@@ -21,7 +21,6 @@ package org.apache.openjpa.integration.validation;
import java.lang.annotation.ElementType;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.security.AccessController;
import java.util.HashMap;
import java.util.Map;
@@ -30,7 +29,6 @@ import jakarta.validation.Path;
import jakarta.validation.TraversableResolver;
import org.apache.openjpa.lib.log.Log;
-import org.apache.openjpa.lib.util.J2DoPrivHelper;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
import org.apache.openjpa.persistence.OpenJPAEntityManagerFactorySPI;
import org.apache.openjpa.persistence.OpenJPAPersistence;
@@ -258,7 +256,7 @@ public class TestTraversableResolver extends TestCase {
Method getLeafNode = PathImpl.getMethod("getLeafNode");
assertNotNull(getLeafNode);
Object path = createPathFromString.invoke(null, s);
- node = (Path.Node) getLeafNode.invoke(path, null);
+ node = (Path.Node) getLeafNode.invoke(path);
} catch (NoSuchMethodException | InvocationTargetException |
IllegalAccessException e) {
}
return node;
diff --git
a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
index 55812de59..e0f7d67d4 100644
---
a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
+++
b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
@@ -412,7 +412,7 @@ public class JDBCExpressionFactory
@Override
public Arguments newArgumentList(Value... vs) {
if (vs == null)
- return new Args(null);
+ return new Args();
Val[] vals = new Val[vs.length];
int i = 0;
for (Value v : vs) {
diff --git
a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
index 5ccfc89be..edcd7afa8 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
@@ -1450,9 +1450,9 @@ public abstract class MappingInfo implements Serializable
{
constant = true;
try {
if (targetNameStr.indexOf('.') == -1)
- target = new Integer(targetNameStr);
+ target = Integer.valueOf(targetNameStr);
else
- target = new Double(targetNameStr);
+ target = Double.valueOf(targetNameStr);
} catch (RuntimeException re) {
throw new MetaDataException(_loc.get(prefix
+ "-bad-fkconst", context, targetName, name));
diff --git
a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java
b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java
index 625380809..5df2e1fdc 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java
@@ -447,7 +447,7 @@ public class Column extends ReferenceCounter {
break;
case JavaTypes.BYTE:
case JavaTypes.BYTE_OBJ:
- _default = new Byte(_defaultStr);
+ _default = Byte.parseByte(_defaultStr);
break;
case JavaTypes.CHAR:
case JavaTypes.CHAR_OBJ:
@@ -455,11 +455,11 @@ public class Column extends ReferenceCounter {
break;
case JavaTypes.DOUBLE:
case JavaTypes.DOUBLE_OBJ:
- _default = new Double(_defaultStr);
+ _default = Double.valueOf(_defaultStr);
break;
case JavaTypes.FLOAT:
case JavaTypes.FLOAT_OBJ:
- _default = new Float(_defaultStr);
+ _default = Float.valueOf(_defaultStr);
break;
case JavaTypes.INT:
case JavaTypes.INT_OBJ:
@@ -475,7 +475,7 @@ public class Column extends ReferenceCounter {
break;
case JavaTypes.SHORT:
case JavaTypes.SHORT_OBJ:
- _default = new Short(_defaultStr);
+ _default = Short.valueOf(_defaultStr);
break;
case JavaTypes.DATE:
_default = new java.util.Date(_defaultStr);
diff --git
a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaParser.java
b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaParser.java
index da8538fb3..b3926e79e 100644
---
a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaParser.java
+++
b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/XMLSchemaParser.java
@@ -575,8 +575,8 @@ public class XMLSchemaParser
if (val.startsWith("'"))
return val.substring(1, val.length() - 1);
if (val.indexOf('.') == -1)
- return new Long(val);
- return new Double(val);
+ return Long.valueOf(val);
+ return Double.valueOf(val);
}
private void throwUserException(Message msg) {
diff --git
a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
index 046c1a455..c77a3ad8a 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
@@ -590,16 +590,12 @@ public class DB2Dictionary
private String appendExtendedExceptionMsg(String msg, SQLException sqle){
final String GETSQLCA ="getSqlca";
try {
- Method sqlcaM2 = sqle.getNextException().getClass()
- .getMethod(GETSQLCA,null);
+ Method sqlcaM2 =
sqle.getNextException().getClass().getMethod(GETSQLCA);
Object sqlca = sqlcaM2.invoke(sqle.getNextException(),
new Object[] {});
- Method getSqlErrpMethd = sqlca.getClass().
- getMethod("getSqlErrp", null);
- Method getSqlWarnMethd = sqlca.getClass().
- getMethod("getSqlWarn", null);
- Method getSqlErrdMethd = sqlca.getClass().
- getMethod("getSqlErrd", null);
+ Method getSqlErrpMethd = sqlca.getClass().getMethod("getSqlErrp");
+ Method getSqlWarnMethd = sqlca.getClass().getMethod("getSqlWarn");
+ Method getSqlErrdMethd = sqlca.getClass().getMethod("getSqlErrd");
StringBuilder errdStr = new StringBuilder();
int[] errds = (int[]) getSqlErrdMethd.invoke(sqlca, new
Object[]{});
diff --git
a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/InvocationManagedRuntime.java
b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/InvocationManagedRuntime.java
index cb74d942b..f9a092b61 100644
---
a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/InvocationManagedRuntime.java
+++
b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/InvocationManagedRuntime.java
@@ -66,10 +66,9 @@ public class InvocationManagedRuntime extends
AbstractManagedRuntime
if (_method == null) {
ClassLoader loader = _conf.getClassResolverInstance().
getClassLoader(getClass(), null);
- _method = Class.forName(_clazz, true, loader)
- .getMethod(_methodName, null);
+ _method = Class.forName(_clazz, true,
loader).getMethod(_methodName);
}
- return (TransactionManager) _method.invoke(null, null);
+ return (TransactionManager) _method.invoke(null);
}
@Override
diff --git
a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WLSManagedRuntime.java
b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WLSManagedRuntime.java
index 6ef9e452e..c6a0a7ca7 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WLSManagedRuntime.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/ee/WLSManagedRuntime.java
@@ -37,10 +37,9 @@ public class WLSManagedRuntime extends AbstractManagedRuntime
public WLSManagedRuntime()
throws ClassNotFoundException, NoSuchMethodException {
- Class txHelper = Class.forName
- ("weblogic.transaction.TransactionHelper");
- _txHelperMeth = txHelper.getMethod("getTransactionHelper", null);
- _txManagerMeth = txHelper.getMethod("getTransactionManager", null);
+ Class<?> txHelper =
Class.forName("weblogic.transaction.TransactionHelper");
+ _txHelperMeth = txHelper.getMethod("getTransactionHelper");
+ _txManagerMeth = txHelper.getMethod("getTransactionManager");
}
@Override
@@ -48,8 +47,8 @@ public class WLSManagedRuntime extends AbstractManagedRuntime
throws Exception {
// return TransactionHelper.getTransactionHelper ().
// getTransactionManager ();
- Object o = _txHelperMeth.invoke(null, null);
- return (TransactionManager) _txManagerMeth.invoke(o, null);
+ Object o = _txHelperMeth.invoke(null);
+ return (TransactionManager) _txManagerMeth.invoke(o);
}
@Override
diff --git
a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java
b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java
index 5e5a28098..c03b8e4ed 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java
@@ -799,14 +799,14 @@ public class Reflection {
* Invoke the given setter on the given object.
*/
public static void set(Object target, Method setter, double value) {
- set(target, setter, new Double(value));
+ set(target, setter, Double.valueOf(value));
}
/**
* Invoke the given setter on the given object.
*/
public static void set(Object target, Method setter, float value) {
- set(target, setter, new Float(value));
+ set(target, setter, Float.valueOf(value));
}
/**
diff --git
a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
index 5532b9626..3ec3f331b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
@@ -302,7 +302,7 @@ public class Filters {
}
else if (type == Integer.class && o instanceof String) {
try {
- return new Integer(o.toString());
+ return Integer.valueOf(o.toString());
}
catch (NumberFormatException e) {
throw new ClassCastException(_loc.get("cant-convert", o,
o.getClass(), type).getMessage());
diff --git
a/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestGetDeclaredMethod.java
b/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestGetDeclaredMethod.java
index 043995700..25c3cdbd1 100644
---
a/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestGetDeclaredMethod.java
+++
b/openjpa-kernel/src/test/java/org/apache/openjpa/enhance/TestGetDeclaredMethod.java
@@ -43,9 +43,9 @@ public class TestGetDeclaredMethod {
@Test
public void testMostDerived() throws NoSuchMethodException {
- Method impl = Impl.class.getDeclaredMethod("getObject", null);
- Method iface = Iface.class.getDeclaredMethod("getObject", null);
- Method other = Other.class.getDeclaredMethod("getObject", null);
+ Method impl = Impl.class.getDeclaredMethod("getObject");
+ Method iface = Iface.class.getDeclaredMethod("getObject");
+ Method other = Other.class.getDeclaredMethod("getObject");
assertEquals(Impl.class, Reflection.mostDerived(impl, iface)
.getDeclaringClass());
assertEquals(Impl.class, Reflection.mostDerived(iface, impl)
diff --git
a/openjpa-kernel/src/test/java/org/apache/openjpa/meta/TestMemberProvider.java
b/openjpa-kernel/src/test/java/org/apache/openjpa/meta/TestMemberProvider.java
index c1ea049ae..c3da057c4 100644
---
a/openjpa-kernel/src/test/java/org/apache/openjpa/meta/TestMemberProvider.java
+++
b/openjpa-kernel/src/test/java/org/apache/openjpa/meta/TestMemberProvider.java
@@ -47,8 +47,7 @@ public class TestMemberProvider {
@Test
public void testMethod()
throws NoSuchMethodException, IOException, ClassNotFoundException {
- MemberProvider b = new MemberProvider(
- getClass().getDeclaredMethod("testMethod", null));
+ MemberProvider b = new
MemberProvider(getClass().getDeclaredMethod("testMethod"));
MemberProvider b2 = roundtrip(b);
assertEquals(b.getMember(), b2.getMember());
}
diff --git
a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
index 17d1813c7..52f530707 100644
---
a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
+++
b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.net.URLDecoder;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
@@ -175,7 +176,7 @@ public class ClassMetaDataIterator implements
MetaDataIterator {
public File getFile() throws IOException {
if (_url == -1 || _url >= _urls.size())
throw new IllegalStateException();
- File file = new File(URLDecoder.decode((_urls.get(_url)).getFile()));
+ File file = new File(URLDecoder.decode((_urls.get(_url)).getFile(),
Charset.forName("UTF-8")));
return file.exists() ? file : null;
}
diff --git
a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestPropertiesParser.java
b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestPropertiesParser.java
index cb8bd78e5..55831e029 100644
---
a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestPropertiesParser.java
+++
b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestPropertiesParser.java
@@ -33,8 +33,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.Properties;
-import org.apache.openjpa.lib.util.FormatPreservingProperties.
- DuplicateKeyException;
+import
org.apache.openjpa.lib.util.FormatPreservingProperties.DuplicateKeyException;
import org.junit.Test;
@@ -169,7 +168,7 @@ public class TestPropertiesParser {
*/
private void testSpecialChars(boolean formattingProps, boolean value)
throws Throwable {
- List valueList = new ArrayList(Arrays.asList(new String[]{
+ List<String> valueList = new ArrayList<>(Arrays.asList(new String[]{
"xxyy", "xx\\yy", "xx" + LS + "yy", "xx\\nyy", "xx\tyy", "xx\\tyy",
"xx\ryy", "xx\\ryy", "xx\fyy", "xx\\fyy", "xx\r" + LS + "\\\t\r\t"
+ LS + "yy",
@@ -344,10 +343,8 @@ public class TestPropertiesParser {
String props = "foo=bar" + LS + "baz=quux";
String props2 = "a=b" + LS + "c=d";
Properties vanilla = new Properties();
- vanilla.load(new BufferedInputStream
- (new StringBufferInputStream(props)));
- vanilla.load(new BufferedInputStream
- (new StringBufferInputStream(props2)));
+ vanilla.load(new BufferedInputStream(new
StringBufferInputStream(props)));
+ vanilla.load(new BufferedInputStream(new
StringBufferInputStream(props2)));
Properties p = new FormatPreservingProperties();
p.load(new BufferedInputStream(new StringBufferInputStream(props)));
diff --git
a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestUUIDGenerator.java
b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestUUIDGenerator.java
index 9fb316196..0c979a125 100644
---
a/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestUUIDGenerator.java
+++
b/openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestUUIDGenerator.java
@@ -19,8 +19,6 @@
package org.apache.openjpa.lib.util;
import java.lang.reflect.Field;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
import java.util.HashSet;
import java.util.Set;
@@ -37,44 +35,39 @@ public class TestUUIDGenerator {
@Test
public void testUniqueString() {
- Set seen = new HashSet();
+ Set<String> seen = new HashSet<>();
for (int i = 0; i < 10000; i++)
- assertTrue(seen.add(
- UUIDGenerator.nextString(UUIDGenerator.TYPE1)));
+
assertTrue(seen.add(UUIDGenerator.nextString(UUIDGenerator.TYPE1)));
}
@Test
public void testUniqueHex() {
- Set seen = new HashSet();
+ Set<String> seen = new HashSet<>();
for (int i = 0; i < 10000; i++)
- assertTrue(seen.add(
- UUIDGenerator.nextHex(UUIDGenerator.TYPE1)));
+ assertTrue(seen.add(UUIDGenerator.nextHex(UUIDGenerator.TYPE1)));
}
@Test
public void testUniqueType4String() {
- Set seen = new HashSet();
+ Set<String> seen = new HashSet<>();
for (int i = 0; i < 10000; i++)
- assertTrue(seen.add(
- UUIDGenerator.nextString(UUIDGenerator.TYPE4)));
+
assertTrue(seen.add(UUIDGenerator.nextString(UUIDGenerator.TYPE4)));
}
@Test
public void testUniqueType4Hex() {
- Set seen = new HashSet();
+ Set<String> seen = new HashSet<>();
for (int i = 0; i < 10000; i++)
- assertTrue(seen.add(
- UUIDGenerator.nextHex(UUIDGenerator.TYPE4)));
+ assertTrue(seen.add(UUIDGenerator.nextHex(UUIDGenerator.TYPE4)));
}
@Test
public void testUniqueMixedTypesHex() {
- Set seen = new HashSet();
+ Set<String> seen = new HashSet<>();
for (int i = 0; i < 10000; i++) {
int type = (i % 2 == 0) ?
UUIDGenerator.TYPE4 : UUIDGenerator.TYPE1;
- assertTrue(seen.add(
- UUIDGenerator.nextHex(type)));
+ assertTrue(seen.add(UUIDGenerator.nextHex(type)));
}
}
@@ -92,33 +85,27 @@ public class TestUUIDGenerator {
public void testInitType1MultiThreaded() throws Exception {
// This test method depends IP and RANDOM in UUIDGenerator to be null
// and type1Initialized to be false. Using reflection to ensure that
- // those fields are null. Wrap this method in doPrivledgedAction so it
- // doesn't fail when running with security.
- AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
+ // those fields are null.
+ Class<UUIDGenerator> uuid = UUIDGenerator.class;
+ Field[] fields = uuid.getDeclaredFields();
+ for (Field f : fields) {
+ if (f.getName().equals("type1Initialized")) {
+ f.setAccessible(true);
+ f.set(null, false);
+ } else if (f.getName().equals("IP") ||
f.getName().equals("RANDOM")) {
+ f.setAccessible(true);
+ f.set(null, null);
+ }
+ }
+ Thread t = new Thread() {
@Override
- public Object run() throws Exception {
- Class uuid = UUIDGenerator.class;
- Field[] fields = uuid.getDeclaredFields();
- for (Field f : fields) {
- if (f.getName().equals("type1Initialized")) {
- f.setAccessible(true);
- f.set(null, false);
- } else if (f.getName().equals("IP") ||
f.getName().equals("RANDOM")) {
- f.setAccessible(true);
- f.set(null, null);
- }
- }
- Thread t = new Thread() {
- @Override
- public void run() {
- UUIDGenerator.createType1();
- }
- };
-
- t.start();
+ public void run() {
UUIDGenerator.createType1();
- return null;
}
- });
- }// end testInitType1MultiThreaded
+ };
+
+ t.start();
+ UUIDGenerator.createType1();
+ }
+
}
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java
index 158b5283f..88c55a8a5 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/conf/TestQueryProperties.java
@@ -259,8 +259,7 @@ public class TestQueryProperties extends SingleEMFTestCase {
qTime = 1000;
// verify getHints values were updated
hints = q.getHints();
- timeout = new Integer((String)hints.get(
- "jakarta.persistence.query.timeout"));
+ timeout = Integer.valueOf((String)
hints.get("jakarta.persistence.query.timeout"));
assertEquals("Expected QueryHints updated query timeout",
qTime.intValue(), timeout.intValue());
// verify internal config value was updated
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java
index 48b5d1136..27d985848 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/AbstractBrokerSerializationTest.java
@@ -309,7 +309,7 @@ public abstract class AbstractBrokerSerializationTest<T>
TxListener txListener = new TxListener();
emf.addTransactionListener(txListener);
LifeListener lifeListener = new LifeListener();
- emf.addLifecycleListener(lifeListener, null);
+ emf.addLifecycleListener(lifeListener);
OpenJPAEntityManager em = emf.createEntityManager();
T t = em.find(getManagedType(), id);
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryListenerRegistry.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryListenerRegistry.java
index a803f7dc0..7e688922d 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryListenerRegistry.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/kernel/TestBrokerFactoryListenerRegistry.java
@@ -47,7 +47,7 @@ public class TestBrokerFactoryListenerRegistry
public void beforePersist(LifecycleEvent event) {
persistCount++;
}
- }, null);
+ });
emf.addTransactionListener(new AbstractTransactionListener() {
@Override
public void afterBegin(TransactionEvent event) {
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToOne.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToOne.java
index f1045b61d..7522aaaee 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToOne.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/annotations/TestOneToOne.java
@@ -76,7 +76,7 @@ public class TestOneToOne extends AnnotationTestCase
pc = em.find(AnnoTest1.class, em.getObjectId(pc));
pc2 = pc.getSelfOneOne();
assertNotNull(pc2);
- assertEquals(new Long(15), pc2.getPk());
+ assertEquals(Long.valueOf(15), pc2.getPk());
endEm(em);
}
@@ -95,7 +95,7 @@ public class TestOneToOne extends AnnotationTestCase
pc = em.find(AnnoTest1.class, em.getObjectId(pc));
pc2 = pc.getSelfOneOne();
assertNotNull(pc2);
- assertEquals(new Long(15), pc2.getPk());
+ assertEquals(Long.valueOf(15), pc2.getPk());
endEm(em);
}
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java
index 4baa3d951..8d8c4a523 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestMutableParameters.java
@@ -105,7 +105,7 @@ public class TestMutableParameters
new Object[]{ d });
c = (Collection) q.execute(new Object[]{ d });
- assertFalse(new Integer(initialSize).equals(c.size()));
+ assertFalse(Integer.valueOf(initialSize).equals(c.size()));
}
//FIXME Seetha Nov 10,2006
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java
index c5796a918..c82bda13c 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestStatistics.java
@@ -172,9 +172,8 @@ public class TestStatistics extends SingleEMFTestCase {
}
public void testMultipleUnits() {
- String[] props = { "openjpa.DataCache", "true",
"openjpa.RemoteCommitProvider", "sjvm" };
- OpenJPAEntityManagerFactory emf1 = createNamedEMF("test", props);
- OpenJPAEntityManagerFactory emf2 = createNamedEMF("empty-pu", props);
+ OpenJPAEntityManagerFactory emf1 = createNamedEMF("test",
"openjpa.DataCache", "true", "openjpa.RemoteCommitProvider", "sjvm");
+ OpenJPAEntityManagerFactory emf2 = createNamedEMF("empty-pu",
"openjpa.DataCache", "true", "openjpa.RemoteCommitProvider", "sjvm");
assertNotSame(emf1, emf2);
assertNotSame(emf1.getStoreCache(), emf2.getStoreCache());
assertNotSame(emf1.getStoreCache().getStatistics(),
emf2.getStoreCache().getStatistics());
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddedWithQuery.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddedWithQuery.java
index 69dfb6fe5..ed8d6fcb5 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddedWithQuery.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/TestEmbeddedWithQuery.java
@@ -58,9 +58,9 @@ public class TestEmbeddedWithQuery extends SingleEMFTestCase {
EParent pFind = pList.get(0);
assertNotNull(pFind);
- assertEquals(pFind.getIdParent(), new Integer(1));
+ assertEquals(pFind.getIdParent(), Integer.valueOf(1));
assertNotNull(pFind.getChildTo());
- assertEquals(pFind.getChildTo().getIdChild(), new Long(10));
+ assertEquals(pFind.getChildTo().getIdChild(), Long.valueOf(10));
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
@@ -87,9 +87,9 @@ public class TestEmbeddedWithQuery extends SingleEMFTestCase {
EParent pFind = pList.get(0);
assertNotNull(pFind);
- assertEquals(pFind.getIdParent(), new Integer(1));
+ assertEquals(pFind.getIdParent(), Integer.valueOf(1));
assertNotNull(pFind.getChildTo());
- assertEquals(pFind.getChildTo().getIdChild(), new Long(10));
+ assertEquals(pFind.getChildTo().getIdChild(), Long.valueOf(10));
} finally {
if (em.getTransaction().isActive()) {
em.getTransaction().rollback();
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java
index 0afe4e00b..7f1c80bac 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverrides.java
@@ -101,7 +101,7 @@ public class TestAttrOverrides extends SQLListenerTestCase
{
public void findObj1() {
EntityManager em = emf.createEntityManager();
Customer p = em.find(Customer.class, 1);
- assertEquals(p.getId(), new Integer(1));
+ assertEquals(p.getId(), Integer.valueOf(1));
assertEquals(p.getAddress().getCity(), "city_1");
assertEquals(p.getAddress().getStreet(), "street_1");
assertEquals(p.getAddress().getState(), "state_1");
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java
index f53932563..27f3393af 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/attrOverrides/TestAttrOverridesXml.java
@@ -146,7 +146,7 @@ public class TestAttrOverridesXml extends
SQLListenerTestCase {
public void findObj1() {
EntityManager em = emf.createEntityManager();
CustomerXml p = em.find(CustomerXml.class, 1);
- Assert.assertEquals(p.getId(), new Integer(1));
+ Assert.assertEquals(p.getId(), Integer.valueOf(1));
Assert.assertEquals(p.getAddress().getCity(), "city_1");
Assert.assertEquals(p.getAddress().getStreet(), "street_1");
Assert.assertEquals(p.getAddress().getState(), "state_1");
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java
index 467f4ef32..9794b54b3 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/embed/compositepk/TestCompositePrimaryKeys.java
@@ -533,7 +533,7 @@ public class TestCompositePrimaryKeys extends
SingleEMFTestCase {
public void verifyResults(Topic topic, Subject s) {
Assert.assertNotNull(topic);
- Assert.assertEquals(new Integer(5), topic.getId());
+ Assert.assertEquals(Integer.valueOf(5), topic.getId());
Subject s2 = topic.getSubject();
verifySubject(s, s2);
}
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java
index 43db475cd..45befe8a5 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/abstractjoinedappid/TestAbstractJoinedAppId.java
@@ -78,7 +78,7 @@ public class TestAbstractJoinedAppId
assertEquals(1, supers.size());
Superclass s = (Superclass) supers.iterator().next();
assertTrue(s instanceof Subclass);
- assertEquals(new Integer(99), s.getId());
+ assertEquals(Integer.valueOf(99), s.getId());
assertEquals("supattr", s.getAttr1());
assertEquals("subattr", ((Subclass) s).getAttr2());
em.close();
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest1.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest1.java
index da958e0bd..67a9cd6ff 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest1.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/AnnoTest1.java
@@ -164,7 +164,7 @@ public class AnnoTest1 {
}
public AnnoTest1(long pk) {
- this(new Long(pk));
+ this(Long.valueOf(pk));
}
public AnnoTest1(Long pk) {
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToOne.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToOne.java
index 7745832f3..2a5ca73aa 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToOne.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/annotations/TestOneToOne.java
@@ -70,7 +70,7 @@ public class TestOneToOne
pc = em.find(AnnoTest1.class, 5L);
pc2 = pc.getSelfOneOne();
assertNotNull(pc2);
- assertEquals(new Long(15), pc2.getPk());
+ assertEquals(Long.valueOf(15), pc2.getPk());
em.close();
}
@@ -89,7 +89,7 @@ public class TestOneToOne
pc = em.find(AnnoTest1.class, 5L);
pc2 = pc.getSelfOneOne();
assertNotNull(pc2);
- assertEquals(new Long(15), pc2.getPk());
+ assertEquals(Long.valueOf(15), pc2.getPk());
em.close();
}
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestAggregateQueryWithNoResult.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestAggregateQueryWithNoResult.java
index fc74930ac..6c39fee88 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestAggregateQueryWithNoResult.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestAggregateQueryWithNoResult.java
@@ -54,7 +54,7 @@ public class TestAggregateQueryWithNoResult extends
SingleEMFTestCase {
Long result = (Long)em.createQuery(jpql).getSingleResult();
assertNotNull(result);
- assertEquals(result, new Long(0));
+ assertEquals(result, Long.valueOf(0));
}
public void testAvgWithNoResult() {
@@ -63,7 +63,7 @@ public class TestAggregateQueryWithNoResult extends
SingleEMFTestCase {
Integer result = (Integer)em.createQuery(jpql).getSingleResult();
assertNotNull(result);
- assertEquals(result, new Integer(0));
+ assertEquals(result, Integer.valueOf(0));
}
public void testCountWithNoResult() {
@@ -72,7 +72,7 @@ public class TestAggregateQueryWithNoResult extends
SingleEMFTestCase {
Long result = (Long)em.createQuery(jpql).getSingleResult();
assertNotNull(result);
- assertEquals(result, new Long(0));
+ assertEquals(result, Long.valueOf(0));
}
public void testMaxWithNoResult() {
@@ -81,7 +81,7 @@ public class TestAggregateQueryWithNoResult extends
SingleEMFTestCase {
Integer result = (Integer)em.createQuery(jpql).getSingleResult();
assertNotNull(result);
- assertEquals(result, new Integer(0));
+ assertEquals(result, Integer.valueOf(0));
}
public void testMinWithNoResult() {
@@ -90,6 +90,6 @@ public class TestAggregateQueryWithNoResult extends
SingleEMFTestCase {
Integer result = (Integer)em.createQuery(jpql).getSingleResult();
assertNotNull(result);
- assertEquals(result, new Integer(0));
+ assertEquals(result, Integer.valueOf(0));
}
}
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubA.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubA.java
index 7639db5a6..9bb819e9b 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubA.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AppIdSubA.java
@@ -83,7 +83,7 @@ public abstract class AppIdSubA
@Override
StringTokenizer fromString(String idString) {
StringTokenizer tok = super.fromString(idString);
- pka = new Integer(tok.nextToken());
+ pka = Integer.valueOf(tok.nextToken());
return tok; // return the tokenizer for subclasses to use
}
}
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeNew.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeNew.java
index 8438cb20e..8fd3b6922 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeNew.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/merge/TestMergeNew.java
@@ -60,7 +60,7 @@ public class TestMergeNew extends SQLListenerTestCase {
// verify key fields
assertEquals(newParent.getKey1(), "K1");
- assertEquals(newParent.getKey2(), new Integer(1));
+ assertEquals(newParent.getKey2(), Integer.valueOf(1));
// verify Child field
ArrayList<Child> childs = (ArrayList<Child>)newParent.getChilds();
@@ -70,7 +70,7 @@ public class TestMergeNew extends SQLListenerTestCase {
assertNotSame(child, newChild);
Parent childParent = newChild.getParent();
assertEquals(childParent, newParent);
- assertEquals(newChild.getChildKey(), new Integer(1));
+ assertEquals(newChild.getChildKey(), Integer.valueOf(1));
// verify GrandChild field
ArrayList<GrandChild> grandChilds =
(ArrayList<GrandChild>)newChild.getGrandChilds();
@@ -118,7 +118,7 @@ public class TestMergeNew extends SQLListenerTestCase {
// verify key fields
assertEquals(newParent.getKey1(), "K1");
- assertEquals(newParent.getKey2(), new Integer(1));
+ assertEquals(newParent.getKey2(), Integer.valueOf(1));
// verify Child field
ArrayList<Child> childs =
(ArrayList<Child>)newParent.getChilds();
@@ -128,7 +128,7 @@ public class TestMergeNew extends SQLListenerTestCase {
assertNotSame(child, newChild);
Parent childParent = newChild.getParent();
assertNotNull(childParent);
- assertEquals(newChild.getChildKey(), new Integer(1));
+ assertEquals(newChild.getChildKey(), Integer.valueOf(1));
// verify GrandChild field
ArrayList<GrandChild> grandChilds =
(ArrayList<GrandChild>)newChild.getGrandChilds();
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestSequenceAssigned.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestSequenceAssigned.java
index cd7ad690c..30396500e 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestSequenceAssigned.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestSequenceAssigned.java
@@ -100,7 +100,7 @@ public class TestSequenceAssigned
pc = (SequenceAssigned) pm.find(SequenceAssigned.class, oid);
pc2 = (SequenceAssigned3) pm.find(SequenceAssigned3.class, oid2);
assertEquals(-100, pc.getPK());
- assertEquals(new Long(-100), pc2.getPK());
+ assertEquals(Long.valueOf(-100), pc2.getPK());
endEm(pm);
}
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Location.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Location.java
index 1b8b2bc5a..2c52797a8 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Location.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/Location.java
@@ -78,6 +78,6 @@ public class Location implements Serializable,
Comparable<Location> {
@Override
public int compareTo(Location l) {
- return new Integer(getId()).compareTo(l.getId());
+ return Integer.valueOf(getId()).compareTo(l.getId());
}
}
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Account.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Account.java
index 14972a6d5..b652f0c5b 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Account.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/pqueue/Account.java
@@ -85,7 +85,7 @@ public class Account implements IAccount, Comparable<Account>
{
@Override
public int compareTo(Account o) {
- return new Integer(getId()).compareTo(o.getId());
+ return Integer.valueOf(getId()).compareTo(o.getId());
}
}
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Account.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Account.java
index fa16fe3f0..d40554839 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Account.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/delayed/tset/Account.java
@@ -85,6 +85,6 @@ public class Account implements IAccount, Comparable<Account>
{
@Override
public int compareTo(Account o) {
- return new Integer(getId()).compareTo(o.getId());
+ return Integer.valueOf(getId()).compareTo(o.getId());
}
}
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Annuity.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Annuity.java
index 66972752e..9fa8c5275 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Annuity.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/Annuity.java
@@ -74,7 +74,7 @@ public class Annuity extends AnnuityPersistebleObject
implements IAnnuity {
this.lastPaidAmt = lastPaidAmt;
if (this.lastPaidAmt != null) {
DecimalFormat df = new DecimalFormat("#.##");
- this.lastPaidAmt= new Double(df.format(lastPaidAmt));
+ this.lastPaidAmt= Double.valueOf(df.format(lastPaidAmt));
}
}
@@ -98,7 +98,7 @@ public class Annuity extends AnnuityPersistebleObject
implements IAnnuity {
this.amount = amount;
if (this.amount != null) {
DecimalFormat df = new DecimalFormat("#.##");
- this.amount = new Double(df.format(amount));
+ this.amount = Double.valueOf(df.format(amount));
}
}
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/FixedAnnuity.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/FixedAnnuity.java
index efeae5d11..16b0ef053 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/FixedAnnuity.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/entities/FixedAnnuity.java
@@ -43,7 +43,7 @@ public class FixedAnnuity extends Annuity implements
IFixedAnnuity {
this.rate = rate;
if (this.rate != null) {
DecimalFormat df = new DecimalFormat("#.##");
- this.rate= new Double(df.format(rate));
+ this.rate= Double.valueOf(df.format(rate));
}
}
}
diff --git
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java
index 39d191801..45116bd83 100644
---
a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java
+++
b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestQueryTimeout.java
@@ -314,11 +314,10 @@ public class TestQueryTimeout extends SQLListenerTestCase
{
// verify jakarta.persistence.query.timeout is supplied
Map<String, Object> hints = q.getHints();
assertTrue(hints.containsKey("jakarta.persistence.query.timeout"));
- Integer timeout = new Integer(
- (String) hints.get("jakarta.persistence.query.timeout"));
+ Integer timeout = Integer.valueOf((String)
hints.get("jakarta.persistence.query.timeout"));
getLog().trace("testQueryTimeout22a() - Retrieved hint " +
"jakarta.persistence.query.timeout=" + timeout);
- assertEquals(timeout, new Integer(0));
+ assertEquals(timeout, Integer.valueOf(0));
try {
long startTime = System.currentTimeMillis();
@@ -519,8 +518,7 @@ public class TestQueryTimeout extends SQLListenerTestCase {
// verify jakarta.persistence.query.timeout hint via annotation set
Map<String, Object> hints = q.getHints();
assertTrue(hints.containsKey("jakarta.persistence.query.timeout"));
- Integer timeout = new Integer((String) hints.get(
- "jakarta.persistence.query.timeout"));
+ Integer timeout = Integer.valueOf((String)
hints.get("jakarta.persistence.query.timeout"));
getLog().trace(
"testQueryTimeout32a() - Found
jakarta.persistence.query.timeout="
+ timeout);
diff --git
a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
index 0f09d18ac..2b057c3ec 100644
---
a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
+++
b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
@@ -39,7 +39,7 @@ import org.apache.openjpa.meta.XMLMetaData;
* @author Catalina Wei
* @since 1.0.0
*/
-public class AnnotationPersistenceXMLMetaDataParser {
+public class AnnotationPersistenceXMLMetaDataParser <T extends Annotation> {
private static final Localizer _loc = Localizer.forPackage
(AnnotationPersistenceXMLMetaDataParser.class);
@@ -50,11 +50,11 @@ public class AnnotationPersistenceXMLMetaDataParser {
// cache the JAXB Xml... classes if they are present so we do not
// have a hard-wired dependency on JAXB here
- private Class xmlTypeClass = null;
- private Class xmlRootElementClass = null;
- private Class xmlAccessorTypeClass = null;
- private Class xmlAttributeClass = null;
- private Class xmlElementClass = null;
+ private Class<T> xmlTypeClass = null;
+ private Class<T> xmlRootElementClass = null;
+ private Class<T> xmlAccessorTypeClass = null;
+ private Class<T> xmlAttributeClass = null;
+ private Class<T> xmlElementClass = null;
private Method xmlTypeName = null;
private Method xmlTypeNamespace = null;
private Method xmlRootName = null;
@@ -68,24 +68,25 @@ public class AnnotationPersistenceXMLMetaDataParser {
/**
* Constructor; supply configuration.
*/
- public AnnotationPersistenceXMLMetaDataParser(OpenJPAConfiguration conf) {
+ @SuppressWarnings("unchecked")
+ public AnnotationPersistenceXMLMetaDataParser(OpenJPAConfiguration
conf) {
_conf = conf;
_log = conf.getLog(OpenJPAConfiguration.LOG_METADATA);
try {
- xmlTypeClass =
Class.forName("jakarta.xml.bind.annotation.XmlType");
- xmlTypeName = xmlTypeClass.getMethod("name", null);
- xmlTypeNamespace = xmlTypeClass.getMethod("namespace", null);
- xmlRootElementClass =
Class.forName("jakarta.xml.bind.annotation.XmlRootElement");
- xmlRootName = xmlRootElementClass.getMethod("name", null);
- xmlRootNamespace = xmlRootElementClass.getMethod("namespace",
null);
- xmlAccessorTypeClass =
Class.forName("jakarta.xml.bind.annotation.XmlAccessorType");
- xmlAccessorValue = xmlAccessorTypeClass.getMethod("value", null);
- xmlAttributeClass =
Class.forName("jakarta.xml.bind.annotation.XmlAttribute");
- xmlAttributeName = xmlAttributeClass.getMethod("name", null);
- xmlAttributeNamespace = xmlAttributeClass.getMethod("namespace",
null);
- xmlElementClass =
Class.forName("jakarta.xml.bind.annotation.XmlElement");
- xmlElementName = xmlElementClass.getMethod("name", null);
- xmlElementNamespace = xmlElementClass.getMethod("namespace", null);
+ xmlTypeClass = (Class<T>)
Class.forName("jakarta.xml.bind.annotation.XmlType");
+ xmlTypeName = xmlTypeClass.getMethod("name");
+ xmlTypeNamespace = xmlTypeClass.getMethod("namespace");
+ xmlRootElementClass = (Class<T>)
Class.forName("jakarta.xml.bind.annotation.XmlRootElement");
+ xmlRootName = xmlRootElementClass.getMethod("name");
+ xmlRootNamespace = xmlRootElementClass.getMethod("namespace");
+ xmlAccessorTypeClass = (Class<T>)
Class.forName("jakarta.xml.bind.annotation.XmlAccessorType");
+ xmlAccessorValue = xmlAccessorTypeClass.getMethod("value");
+ xmlAttributeClass = (Class<T>)
Class.forName("jakarta.xml.bind.annotation.XmlAttribute");
+ xmlAttributeName = xmlAttributeClass.getMethod("name");
+ xmlAttributeNamespace = xmlAttributeClass.getMethod("namespace");
+ xmlElementClass = (Class<T>)
Class.forName("jakarta.xml.bind.annotation.XmlElement");
+ xmlElementName = xmlElementClass.getMethod("name");
+ xmlElementNamespace = xmlElementClass.getMethod("namespace");
} catch (Exception e) {
}
}
@@ -174,37 +175,32 @@ public class AnnotationPersistenceXMLMetaDataParser {
return meta;
}
- private void parseXmlRootElement(Class type, XMLMetaData meta) {
+ private void parseXmlRootElement(Class<?> type, XMLMetaData meta) {
try {
if (type.getAnnotation(xmlRootElementClass) != null) {
meta.setXmlRootElement(true);
- meta.setXmlname((String) xmlRootName.invoke(type.getAnnotation
- (xmlRootElementClass), new Object[]{}));
- meta.setXmlnamespace((String) xmlRootNamespace.invoke(type
- .getAnnotation(xmlRootElementClass), new Object[]{}));
+ meta.setXmlname((String)
xmlRootName.invoke(type.getAnnotation(xmlRootElementClass), new Object[]{}));
+ meta.setXmlnamespace((String)
xmlRootNamespace.invoke(type.getAnnotation(xmlRootElementClass), new
Object[]{}));
}
else {
- meta.setXmlname((String) xmlTypeName.invoke(type.getAnnotation
- (xmlTypeClass), new Object[]{}));
- meta.setXmlnamespace((String) xmlTypeNamespace.invoke(type
- .getAnnotation(xmlTypeClass), new Object[]{}));
+ meta.setXmlname((String)
xmlTypeName.invoke(type.getAnnotation(xmlTypeClass), new Object[]{}));
+ meta.setXmlnamespace((String)
xmlTypeNamespace.invoke(type.getAnnotation(xmlTypeClass), new Object[]{}));
}
} catch (Exception e) {
}
}
- private void populateFromReflection(Class cls, XMLMetaData meta) {
+ private void populateFromReflection(Class<?> cls, XMLMetaData meta) {
Member[] members;
- Class superclass = cls.getSuperclass();
+ Class<?> superclass = cls.getSuperclass();
// handle inheritance at sub-element level
- if (superclass.isAnnotationPresent((Class<? extends Annotation>)
xmlTypeClass))
+ if (superclass.isAnnotationPresent(xmlTypeClass))
populateFromReflection(superclass, meta);
try {
- if (Objects.equals(xmlAccessorValue.invoke(cls.getAnnotation(
- xmlAccessorTypeClass), new Object[]{}).toString(), "FIELD"))
+ if
(Objects.equals(xmlAccessorValue.invoke(cls.getAnnotation(xmlAccessorTypeClass),
new Object[]{}).toString(), "FIELD"))
members = cls.getDeclaredFields();
else
members = cls.getDeclaredMethods();
@@ -213,8 +209,7 @@ public class AnnotationPersistenceXMLMetaDataParser {
AnnotatedElement el = (AnnotatedElement) member;
XMLMetaData field = null;
if (el.getAnnotation(xmlElementClass) != null) {
- String xmlname = (String) xmlElementName.invoke(el
- .getAnnotation(xmlElementClass), new Object[]{});
+ String xmlname = (String)
xmlElementName.invoke(el.getAnnotation(xmlElementClass), new Object[]{});
// avoid JAXB XML bind default name
if (Objects.equals(XMLMetaData.defaultName, xmlname))
xmlname = member.getName();
@@ -231,8 +226,7 @@ public class AnnotationPersistenceXMLMetaDataParser {
.getType(), member.getName());
field.setXmltype(XMLMetaData.ELEMENT);
field.setXmlname(xmlname);
- field.setXmlnamespace((String) xmlElementNamespace
- .invoke(el.getAnnotation(xmlElementClass)
+ field.setXmlnamespace((String)
xmlElementNamespace.invoke(el.getAnnotation(xmlElementClass)
, new Object[]{}));
}
}
diff --git
a/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatsCollector.java
b/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatsCollector.java
index 0b552c2d6..8b3e08f2d 100644
---
a/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatsCollector.java
+++
b/openjpa-tools/openjpa-fetch-statistics/src/main/java/org/apache/openjpa/enhance/stats/FetchStatsCollector.java
@@ -18,8 +18,6 @@
*/
package org.apache.openjpa.enhance.stats;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import java.util.Map;
import java.util.Set;
import java.util.Timer;
@@ -55,20 +53,14 @@ public final class FetchStatsCollector {
static {
Runtime.getRuntime().addShutdownHook(new Shutdown());
- AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ TimerTask statsOutputTask = new TimerTask() {
@Override
- public Object run() {
- TimerTask statsOutputTask = new TimerTask() {
- @Override
- public void run() {
- dump();
- }
- };
- timer = new Timer();
- timer.schedule(statsOutputTask, DEFAULT_INTERVAL,
DEFAULT_INTERVAL);
- return null;
+ public void run() {
+ dump();
}
- });
+ };
+ timer = new Timer();
+ timer.schedule(statsOutputTask, DEFAULT_INTERVAL, DEFAULT_INTERVAL);
}
public static void registerEntity(ClassMetaData cmd) {
diff --git
a/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java
b/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java
index 529d0cc8c..9ade7fde8 100644
---
a/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java
+++
b/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java
@@ -366,7 +366,7 @@ public class XMLFileHandler {
// create an ObjectData that will contain the information
// for this instance, and set the version
_object = new ObjectData(oid, meta);
- _object.setVersion(new Long(attrs.getValue("version")));
+ _object.setVersion(Long.valueOf(attrs.getValue("version")));
}
else if ("field".equals(qName)) { // field
// start parsing a field element: for container types,
@@ -476,7 +476,7 @@ public class XMLFileHandler {
case JavaTypes.BYTE:
case JavaTypes.BYTE_OBJ:
- return new Byte(str);
+ return Byte.parseByte(str);
case JavaTypes.CHAR:
case JavaTypes.CHAR_OBJ:
@@ -488,23 +488,23 @@ public class XMLFileHandler {
case JavaTypes.DOUBLE:
case JavaTypes.DOUBLE_OBJ:
- return new Double(str);
+ return Double.valueOf(str);
case JavaTypes.FLOAT:
case JavaTypes.FLOAT_OBJ:
- return new Float(str);
+ return Float.valueOf(str);
case JavaTypes.INT:
case JavaTypes.INT_OBJ:
- return new Integer(str);
+ return Integer.valueOf(str);
case JavaTypes.LONG:
case JavaTypes.LONG_OBJ:
- return new Long(str);
+ return Long.valueOf(str);
case JavaTypes.SHORT:
case JavaTypes.SHORT_OBJ:
- return new Short(str);
+ return Short.valueOf(str);
case JavaTypes.NUMBER:
case JavaTypes.BIGDECIMAL:
