You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2022/07/10 12:57:54 UTC

[db-jdo] branch tck-compiler-warnings updated (5e2aefd7 -> 87263fb4)

This is an automated email from the ASF dual-hosted git repository.

mbo pushed a change to branch tck-compiler-warnings
in repository https://gitbox.apache.org/repos/asf/db-jdo.git


    from 5e2aefd7 JDO-817 removing compiler warnings: field may be final
     new 1a69e4d7 JDO-817 removing compiler warnings: call toString on an array
     new f415f9ed JDO-817 removing compiler warnings: Duplicate branch in switch
     new 4eb8d628 JDO-817 removing compiler warnings: Redundant String operation
     new 66e28450 JDO-817 removing compiler warnings: redundant type cast
     new 87263fb4 JDO-817 removing compiler warnings: unnecessary interface modifier, unnecessary semicoln

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 tck/src/main/java/org/apache/jdo/tck/JDO_Test.java |   2 +-
 .../persistencemanager/DataStoreConnection.java    |   4 +-
 .../tck/api/persistencemanager/GetProperties.java  |   8 +-
 .../cache/EvictAllWithNoParameters.java            |   4 +-
 .../EvictingCollectionOfInstancesSideEffects.java  |   8 +-
 .../detach/CopyOnAttachFalse.java                  |   6 +-
 .../detach/DetachAccessUnloadedField.java          |   8 +-
 .../persistencemanager/detach/DetachAttach.java    |   2 +-
 .../detach/DetachAttachDirty.java                  |   2 +-
 ...etObjectByIdNoValidationInstanceNotInCache.java |   2 +-
 .../lifecycle/MakeNontransactionalIsImmediate.java |   2 +-
 ...MakeNontransactionalTransientCleanInstance.java |   2 +-
 ...ctionalANontransactionalPersistentInstance.java |   6 +-
 .../nullargs/DeletePersistentNullArgs.java         |   2 +-
 .../nullargs/DetachCopyNullArgs.java               |   2 +-
 .../persistencemanager/nullargs/EvictNullArgs.java |   2 +-
 .../nullargs/MakeNontransactionalNullArgs.java     |   2 +-
 .../nullargs/MakePersistentNullArgs.java           |   2 +-
 .../nullargs/MakeTransactionalNullArgs.java        |   2 +-
 .../nullargs/MakeTransientNullArgs.java            |   2 +-
 .../nullargs/RefreshNullArgs.java                  |   2 +-
 .../nullargs/RetrieveNullArgs.java                 |   2 +-
 .../nullargs/RetrieveWithFetchPlanNullArgs.java    |   2 +-
 .../apache/jdo/tck/lifecycle/StateTransitions.java | 253 +++++++--------------
 .../lifecycle/StateTransitionsReturnedObjects.java |   6 +-
 .../models/fieldtypes/TestArrayCollections.java    |   4 +-
 .../fieldtypes/TestCollectionCollections.java      |   2 +-
 .../tck/models/fieldtypes/TestFieldsOfByte.java    |   4 +-
 .../models/fieldtypes/TestFieldsOfCharacter.java   |   4 +-
 .../tck/models/fieldtypes/TestFieldsOfFloat.java   |   4 +-
 .../fieldtypes/TestFieldsOfPrimitivedouble.java    |   8 +-
 .../tck/models/fieldtypes/TestFieldsOfString.java  |   6 +-
 .../TestHashMapStringKeyCollections.java           |   2 +-
 .../TestHashtableStringKeyCollections.java         |   2 +-
 .../fieldtypes/TestMapStringKeyCollections.java    |   2 +-
 .../TestTreeMapStringKeyCollections.java           |   2 +-
 .../apache/jdo/tck/models/fieldtypes/TestUtil.java |  68 +++---
 .../tck/pc/company/CompanyFactoryNewInstance.java  |  16 +-
 .../companyAnnotatedFC/FCAppFullTimeEmployee.java  |   2 +-
 .../jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java  |   6 +-
 .../CompanyFactoryPMClass.java                     |   2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/AllTypes.java |  12 +-
 .../jdo/tck/pc/fieldtypes/ArrayCollections.java    |   6 +-
 .../tck/pc/fieldtypes/CollectionCollections.java   |   2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java  |   2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java  |   2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfBoolean.java     |   2 +-
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java |   2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfCharacter.java   |   2 +-
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java |   2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfDouble.java      |  34 +--
 .../jdo/tck/pc/fieldtypes/FieldsOfFloat.java       |   2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfInteger.java     |  34 +--
 .../jdo/tck/pc/fieldtypes/FieldsOfLocale.java      |   2 +-
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java |  34 +--
 .../jdo/tck/pc/fieldtypes/FieldsOfObject.java      |   2 +-
 .../pc/fieldtypes/FieldsOfPrimitiveboolean.java    |   2 +-
 .../tck/pc/fieldtypes/FieldsOfPrimitivebyte.java   |   2 +-
 .../tck/pc/fieldtypes/FieldsOfPrimitivechar.java   |   2 +-
 .../tck/pc/fieldtypes/FieldsOfPrimitivedouble.java |   2 +-
 .../tck/pc/fieldtypes/FieldsOfPrimitivefloat.java  |   2 +-
 .../tck/pc/fieldtypes/FieldsOfPrimitiveint.java    |   2 +-
 .../tck/pc/fieldtypes/FieldsOfPrimitivelong.java   |   2 +-
 .../tck/pc/fieldtypes/FieldsOfPrimitiveshort.java  |   2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfShort.java       |   2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java |   2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java  |   2 +-
 .../tck/pc/fieldtypes/FieldsOfSimpleInterface.java |   2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfString.java      |  34 +--
 .../pc/fieldtypes/HashMapStringKeyCollections.java |   2 +-
 .../fieldtypes/HashMapStringValueCollections.java  |   2 +-
 .../jdo/tck/pc/fieldtypes/HashSetCollections.java  |   2 +-
 .../fieldtypes/HashtableStringKeyCollections.java  |   2 +-
 .../HashtableStringValueCollections.java           |   2 +-
 .../tck/pc/fieldtypes/LinkedListCollections.java   |   2 +-
 .../jdo/tck/pc/fieldtypes/ListCollections.java     |   2 +-
 .../tck/pc/fieldtypes/MapStringKeyCollections.java |   2 +-
 .../pc/fieldtypes/MapStringValueCollections.java   |   2 +-
 .../jdo/tck/pc/fieldtypes/SetCollections.java      |   2 +-
 .../apache/jdo/tck/pc/fieldtypes/SimpleClass.java  |   7 +-
 .../apache/jdo/tck/pc/fieldtypes/SimpleEnum.java   |   2 +-
 .../jdo/tck/pc/fieldtypes/SimpleInterface.java     |   8 +-
 .../pc/fieldtypes/TreeMapStringKeyCollections.java |   2 +-
 .../fieldtypes/TreeMapStringValueCollections.java  |   2 +-
 .../jdo/tck/pc/fieldtypes/TreeSetCollections.java  |   2 +-
 .../jdo/tck/pc/fieldtypes/VectorCollections.java   |   2 +-
 .../instancecallbacks/InstanceCallbackClass.java   |   4 +-
 .../java/org/apache/jdo/tck/query/QueryTest.java   |   6 +-
 .../jdo/tck/query/delete/DeleteCallback.java       |   4 +-
 .../jdoql/methods/SupportedOptionalMethods.java    |   3 +-
 .../jdo/tck/query/jdoql/operators/Equality.java    |  24 +-
 .../jdo/tck/query/jdoql/operators/GreaterThan.java |  36 +--
 .../query/jdoql/operators/GreaterThanOrEqual.java  |  40 ++--
 .../jdo/tck/query/jdoql/operators/LessThan.java    |  36 +--
 .../tck/query/jdoql/operators/LessThanOrEqual.java |  36 +--
 .../jdo/tck/query/jdoql/operators/NotEquals.java   |  24 +-
 .../apache/jdo/tck/query/sql/ExecuteWithMap.java   |  11 +-
 .../java/org/apache/jdo/tck/util/DeepEquality.java |   2 +-
 .../apache/jdo/tck/util/GetSupportedOptions.java   |   2 +-
 .../jdo/tck/util/ThreadExceptionHandler.java       |   2 +-
 .../jdo/tck/util/signature/SignatureVerifier.java  |   2 +-
 101 files changed, 433 insertions(+), 511 deletions(-)


[db-jdo] 04/05: JDO-817 removing compiler warnings: redundant type cast

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mbo pushed a commit to branch tck-compiler-warnings
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit 66e284502100f93fafee11fc1064566bd62d03be
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sun Jul 10 14:42:38 2022 +0200

    JDO-817 removing compiler warnings: redundant type cast
---
 tck/src/main/java/org/apache/jdo/tck/JDO_Test.java |  2 +-
 .../persistencemanager/DataStoreConnection.java    |  2 +-
 .../detach/CopyOnAttachFalse.java                  |  6 ++--
 .../detach/DetachAccessUnloadedField.java          |  8 ++---
 .../persistencemanager/detach/DetachAttach.java    |  2 +-
 .../detach/DetachAttachDirty.java                  |  2 +-
 .../lifecycle/MakeNontransactionalIsImmediate.java |  2 +-
 ...MakeNontransactionalTransientCleanInstance.java |  2 +-
 .../apache/jdo/tck/lifecycle/StateTransitions.java |  2 +-
 .../lifecycle/StateTransitionsReturnedObjects.java |  6 ++--
 .../fieldtypes/TestCollectionCollections.java      |  2 +-
 .../tck/models/fieldtypes/TestFieldsOfByte.java    |  4 +--
 .../models/fieldtypes/TestFieldsOfCharacter.java   |  4 +--
 .../tck/models/fieldtypes/TestFieldsOfFloat.java   |  4 +--
 .../fieldtypes/TestFieldsOfPrimitivedouble.java    |  8 ++---
 .../TestHashMapStringKeyCollections.java           |  2 +-
 .../TestHashtableStringKeyCollections.java         |  2 +-
 .../fieldtypes/TestMapStringKeyCollections.java    |  2 +-
 .../TestTreeMapStringKeyCollections.java           |  2 +-
 .../apache/jdo/tck/models/fieldtypes/TestUtil.java | 42 +++++++++++-----------
 .../companyAnnotatedFC/FCAppFullTimeEmployee.java  |  2 +-
 .../jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java  |  6 ++--
 .../CompanyFactoryPMClass.java                     |  2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/AllTypes.java |  2 +-
 .../jdo/tck/pc/fieldtypes/ArrayCollections.java    |  6 ++--
 .../tck/pc/fieldtypes/CollectionCollections.java   |  2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java  |  2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java  |  2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfBoolean.java     |  2 +-
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java |  2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfCharacter.java   |  2 +-
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java |  2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfDouble.java      | 34 +++++++++---------
 .../jdo/tck/pc/fieldtypes/FieldsOfFloat.java       |  2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfInteger.java     | 34 +++++++++---------
 .../jdo/tck/pc/fieldtypes/FieldsOfLocale.java      |  2 +-
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java | 34 +++++++++---------
 .../jdo/tck/pc/fieldtypes/FieldsOfObject.java      |  2 +-
 .../pc/fieldtypes/FieldsOfPrimitiveboolean.java    |  2 +-
 .../tck/pc/fieldtypes/FieldsOfPrimitivebyte.java   |  2 +-
 .../tck/pc/fieldtypes/FieldsOfPrimitivechar.java   |  2 +-
 .../tck/pc/fieldtypes/FieldsOfPrimitivedouble.java |  2 +-
 .../tck/pc/fieldtypes/FieldsOfPrimitivefloat.java  |  2 +-
 .../tck/pc/fieldtypes/FieldsOfPrimitiveint.java    |  2 +-
 .../tck/pc/fieldtypes/FieldsOfPrimitivelong.java   |  2 +-
 .../tck/pc/fieldtypes/FieldsOfPrimitiveshort.java  |  2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfShort.java       |  2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java |  2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java  |  2 +-
 .../tck/pc/fieldtypes/FieldsOfSimpleInterface.java |  2 +-
 .../jdo/tck/pc/fieldtypes/FieldsOfString.java      |  2 +-
 .../pc/fieldtypes/HashMapStringKeyCollections.java |  2 +-
 .../fieldtypes/HashMapStringValueCollections.java  |  2 +-
 .../jdo/tck/pc/fieldtypes/HashSetCollections.java  |  2 +-
 .../fieldtypes/HashtableStringKeyCollections.java  |  2 +-
 .../HashtableStringValueCollections.java           |  2 +-
 .../tck/pc/fieldtypes/LinkedListCollections.java   |  2 +-
 .../jdo/tck/pc/fieldtypes/ListCollections.java     |  2 +-
 .../tck/pc/fieldtypes/MapStringKeyCollections.java |  2 +-
 .../pc/fieldtypes/MapStringValueCollections.java   |  2 +-
 .../jdo/tck/pc/fieldtypes/SetCollections.java      |  2 +-
 .../pc/fieldtypes/TreeMapStringKeyCollections.java |  2 +-
 .../fieldtypes/TreeMapStringValueCollections.java  |  2 +-
 .../jdo/tck/pc/fieldtypes/TreeSetCollections.java  |  2 +-
 .../jdo/tck/pc/fieldtypes/VectorCollections.java   |  2 +-
 .../instancecallbacks/InstanceCallbackClass.java   |  4 +--
 .../java/org/apache/jdo/tck/query/QueryTest.java   |  6 ++--
 .../jdo/tck/query/delete/DeleteCallback.java       |  4 +--
 .../jdo/tck/query/jdoql/operators/Equality.java    | 12 +++----
 .../jdo/tck/query/jdoql/operators/GreaterThan.java | 24 ++++++-------
 .../query/jdoql/operators/GreaterThanOrEqual.java  | 28 +++++++--------
 .../jdo/tck/query/jdoql/operators/LessThan.java    | 24 ++++++-------
 .../tck/query/jdoql/operators/LessThanOrEqual.java | 24 ++++++-------
 .../jdo/tck/query/jdoql/operators/NotEquals.java   | 12 +++----
 .../apache/jdo/tck/util/GetSupportedOptions.java   |  2 +-
 .../jdo/tck/util/ThreadExceptionHandler.java       |  2 +-
 .../jdo/tck/util/signature/SignatureVerifier.java  |  2 +-
 77 files changed, 222 insertions(+), 222 deletions(-)

diff --git a/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java b/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
index e3f362f8..6953b1db 100644
--- a/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
+++ b/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
@@ -1160,7 +1160,7 @@ public abstract class JDO_Test extends TestCase {
             } else if (fieldType == char.class) {
                 field.setChar(oid, (char)(10 + field.getChar(oid)));
             } else if (fieldType == String.class) {
-                field.set(oid, "This is certainly a challenge" + (String)field.get(oid));
+                field.set(oid, "This is certainly a challenge" + field.get(oid));
             } else if (fieldType == Integer.class) {
                 field.set(oid, Integer.valueOf(10000 + ((Integer)field.get(oid)).intValue()));
             } else if (fieldType == Long.class) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java
index 1af772ac..61d8583f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java
@@ -123,7 +123,7 @@ public class DataStoreConnection extends PersistenceManagerTest {
                 appendMessage(ASSERTION_FAILED + "Wrong size of result of " +
                         sql + NL + "expected: 1, actual: " + actuals.size());
             } else {
-                PCPoint actual = (PCPoint)actuals.iterator().next();
+                PCPoint actual = actuals.iterator().next();
                 if (goldenPoint.getX() != actual.getX() ||
                         !goldenPoint.getY().equals(actual.getY())) {
                     appendMessage(ASSERTION_FAILED + 
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/CopyOnAttachFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/CopyOnAttachFalse.java
index 641a24af..3fb099b3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/CopyOnAttachFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/CopyOnAttachFalse.java
@@ -57,7 +57,7 @@ public class CopyOnAttachFalse extends DetachTest {
         Cart detachedCart = createDetachedInstance(ASSERTION_FAILED);
         pm.setCopyOnAttach(false);
         pm.currentTransaction().begin();
-        Cart attachedCart = (Cart)pm.makePersistent(detachedCart);
+        Cart attachedCart = pm.makePersistent(detachedCart);
         assertTrue("Expected attached object to == detached object.", 
                 attachedCart == detachedCart);
         pm.currentTransaction().commit();
@@ -70,7 +70,7 @@ public class CopyOnAttachFalse extends DetachTest {
         pm.currentTransaction().begin();
         cartEntry1.setQuantity(500);
         goldenCartEntry.setQuantity(500);
-        Cart attachedCart = (Cart)pm.makePersistent(detachedCart);
+        Cart attachedCart = pm.makePersistent(detachedCart);
         assertTrue("Expected attached object to == detached object.", 
                 attachedCart == detachedCart);
         pm.currentTransaction().commit();
@@ -85,7 +85,7 @@ public class CopyOnAttachFalse extends DetachTest {
         // Obtain new instance of cart1
         pm.getObjectById(cart1oid, false);
         try {
-            Cart attachedCart = (Cart)pm.makePersistent(detachedCart);
+            Cart attachedCart = pm.makePersistent(detachedCart);
             fail("Expected JDOUserException. Object with same identity as "
                     + "attached object is already in the cache.");
         } catch (JDOUserException jdoe) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAccessUnloadedField.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAccessUnloadedField.java
index 9bafbf26..1b417805 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAccessUnloadedField.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAccessUnloadedField.java
@@ -59,7 +59,7 @@ public class DetachAccessUnloadedField extends DetachTest {
         // sets fetch group cart, entries, product
         setCartFetchGroups();
         // DETACH_LOAD_FIELDS true by default
-        CartEntry cartEntryDetached = (CartEntry)pm.detachCopy(cartEntry1);
+        CartEntry cartEntryDetached = pm.detachCopy(cartEntry1);
         try {
             Product prod = cartEntryDetached.getProduct();
         } catch (JDODetachedFieldAccessException jdoex) {
@@ -82,7 +82,7 @@ public class DetachAccessUnloadedField extends DetachTest {
         int quantity =  cartEntry1.getQuantity();
 
         pm.getFetchPlan().setDetachmentOptions(0);
-        CartEntry cartEntryDetached = (CartEntry)pm.detachCopy(cartEntry1);
+        CartEntry cartEntryDetached = pm.detachCopy(cartEntry1);
         try {
             Product prodDetached =  cartEntryDetached.getProduct();
         } catch (JDODetachedFieldAccessException jdoex) {
@@ -104,7 +104,7 @@ public class DetachAccessUnloadedField extends DetachTest {
         Product prod =  cartEntry1.getProduct();
         pm.getFetchPlan().removeGroup(CARTENTRY_PRODUCT);
         pm.getFetchPlan().setDetachmentOptions(FetchPlan.DETACH_UNLOAD_FIELDS);
-        CartEntry cartEntryDetached = (CartEntry)pm.detachCopy(cartEntry1);
+        CartEntry cartEntryDetached = pm.detachCopy(cartEntry1);
         try {
             Product prodDetached =  cartEntryDetached.getProduct();
             fail("Expected exception on access of unloaded field, " +
@@ -128,7 +128,7 @@ public class DetachAccessUnloadedField extends DetachTest {
         fp.addGroup(CART_ENTRIES);
         fp.addGroup(CARTENTRY_CART);
 
-        CartEntry cartEntryDetached = (CartEntry)pm.detachCopy(cartEntry1);
+        CartEntry cartEntryDetached = pm.detachCopy(cartEntry1);
         try {
             Product prod = cartEntryDetached.getProduct();
             fail("Expected exception on access of field not in fetch plan" +
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttach.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttach.java
index 8eb46a2a..00e6f36e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttach.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttach.java
@@ -49,7 +49,7 @@ public class DetachAttach extends DetachTest {
     public void testAttachClean() {
         Cart detachedCart = createDetachedInstance(ASSERTION_FAILED);
         pm.currentTransaction().begin();
-        Cart attachedCart = (Cart)pm.makePersistent(detachedCart);
+        Cart attachedCart = pm.makePersistent(detachedCart);
         checkCartValues(ASSERTION_FAILED +
                 "after attach," + NL, attachedCart, true);
         pm.currentTransaction().commit();
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttachDirty.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttachDirty.java
index 786b7715..01e32bdb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttachDirty.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttachDirty.java
@@ -53,7 +53,7 @@ public class DetachAttachDirty extends DetachTest {
         pm.currentTransaction().begin();
         cartEntry1.setQuantity(500);
         goldenCartEntry.setQuantity(500);
-        Cart attachedCart = (Cart)pm.makePersistent(detachedCart);
+        Cart attachedCart = pm.makePersistent(detachedCart);
         checkCartValues(ASSERTION_FAILED +
                 "after attach," + NL, attachedCart, true);
         pm.currentTransaction().commit();
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalIsImmediate.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalIsImmediate.java
index a85558ef..904f42b0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalIsImmediate.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalIsImmediate.java
@@ -223,7 +223,7 @@ public class MakeNontransactionalIsImmediate extends PersistenceManagerTest {
         boolean noError = true;
         Iterator<PCPoint> iter = col1.iterator();
         while (iter.hasNext() ) {
-            PCPoint p = (PCPoint) iter.next();
+            PCPoint p = iter.next();
             if (! testState(p, TRANSIENT, "transient")) {
                 noError = false;
             }
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalTransientCleanInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalTransientCleanInstance.java
index f025bfa7..78bdc61b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalTransientCleanInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalTransientCleanInstance.java
@@ -161,7 +161,7 @@ public class MakeNontransactionalTransientCleanInstance extends PersistenceManag
                 pm.makeNontransactionalAll(col1);
                 Iterator<PCPoint> iter = col1.iterator();
                 while (iter.hasNext() ) {
-                    PCPoint p = (PCPoint) iter.next();
+                    PCPoint p = iter.next();
                     if (testState(p, TRANSIENT, "transient")) {
                         // expected result
                     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
index 6506bf8a..2aec08e9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
@@ -1034,7 +1034,7 @@ public class StateTransitions extends JDO_Test {
     {
         StateTransitionObj obj = getHollowInstance();
         if( obj == null ) return null;
-        obj = (StateTransitionObj) pm.detachCopy(obj);
+        obj = pm.detachCopy(obj);
         obj.writeField(1000);
         int curr = currentState(obj);
         if( curr != DETACHED_DIRTY ) { 
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java
index 62f5f30f..732c3084 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java
@@ -395,7 +395,7 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
     Object applyOperation(int operation, StateTransitionObj stobj)
     {
         Object result = null;
-        StateTransitionObj obj = (StateTransitionObj) stobj;
+        StateTransitionObj obj = stobj;
         switch( operation ){
             case MAKEPERSISTENTOPTIMISTIC:
             case MAKEPERSISTENTDATASTORE:
@@ -534,7 +534,7 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
     {
         StateTransitionObj obj = getHollowInstance();
         if( obj == null ) return null;
-        StateTransitionObj sto = (StateTransitionObj) obj;
+        StateTransitionObj sto = obj;
         sto.readField();
         int curr = currentState(sto);
         if( curr != PERSISTENT_CLEAN ) {
@@ -637,7 +637,7 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
     {
         StateTransitionObj obj = getTransientCleanInstance();
         if( obj == null ) return null;
-        StateTransitionObj pcobj = (StateTransitionObj) obj;
+        StateTransitionObj pcobj = obj;
         pcobj.writeField(23);
         int curr = currentState(obj);
         if( curr != TRANSIENT_DIRTY ) { 
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java
index 7ae62342..c560b61e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java
@@ -156,7 +156,7 @@ public class TestCollectionCollections extends JDO_Test {
                 	logger.debug("Field is " + i + " Class name is "
                           +  actual.getClass().getName()
 			              + "   isInstance of Vector is "
-			              + actual.getClass().isInstance((Object)new Vector<>()));
+			              + actual.getClass().isInstance(new Vector<>()));
 		            }
                     List<?> expectedL = (List<?>)expected;
                     List<?> actualL = (List<?>)actual;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java
index e9b8cd99..7d78f9de 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java
@@ -76,8 +76,8 @@ public class TestFieldsOfByte extends JDO_Test {
     {
         Transaction tx = pm.currentTransaction();
         int i, n;
-        Byte firstValue = Byte.valueOf((byte)Byte.MIN_VALUE);
-        Byte secondValue = Byte.valueOf((byte)Byte.MAX_VALUE);
+        Byte firstValue = Byte.valueOf(Byte.MIN_VALUE);
+        Byte secondValue = Byte.valueOf(Byte.MAX_VALUE);
         tx.begin();
         FieldsOfByte pi = new FieldsOfByte();
         pi.identifier = 1;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java
index ec763d3b..fb3b62a9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java
@@ -76,8 +76,8 @@ public class TestFieldsOfCharacter extends JDO_Test {
     {
         Transaction tx = pm.currentTransaction();
         int i, n;
-        Character firstValue = Character.valueOf((char)Character.MIN_VALUE);
-        Character secondValue = Character.valueOf((char)Character.MAX_VALUE);
+        Character firstValue = Character.valueOf(Character.MIN_VALUE);
+        Character secondValue = Character.valueOf(Character.MAX_VALUE);
         tx.begin();
         FieldsOfCharacter pi = new FieldsOfCharacter();
         pi.identifier = 1;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java
index 0c0a91d6..b212fec4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java
@@ -77,8 +77,8 @@ public class TestFieldsOfFloat extends JDO_Test {
     {
         Transaction tx = pm.currentTransaction();
         int i, n;
-        Float firstValue = Float.valueOf((float)AllTypes.FLOAT_SMALLEST);
-        Float secondValue = Float.valueOf((float)AllTypes.FLOAT_LARGEST);
+        Float firstValue = Float.valueOf(AllTypes.FLOAT_SMALLEST);
+        Float secondValue = Float.valueOf(AllTypes.FLOAT_LARGEST);
         tx.begin();
         FieldsOfFloat pi = new FieldsOfFloat();
         pi.identifier = 1;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java
index 02f434e4..cfd671f5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java
@@ -82,7 +82,7 @@ public class TestFieldsOfPrimitivedouble extends JDO_Test {
         Object oid = pm.getObjectId(pi);
         n = pi.getLength();
         // Provide initial set of values
-        for( i = 0, value = (double)10.15; i < n; ++i){
+        for(i = 0, value = 10.15; i < n; ++i){
             pi.set( i, value);
         }
         tx.commit();
@@ -93,10 +93,10 @@ public class TestFieldsOfPrimitivedouble extends JDO_Test {
         tx.begin();
 
         pi = (FieldsOfPrimitivedouble) pm.getObjectById(oid, true);
-        checkValues(oid, (double)10.15);
+        checkValues(oid, 10.15);
 
         // Provide new set of values
-        for( i = 0, value = (double)68000.15; i < n; ++i){
+        for(i = 0, value = 68000.15; i < n; ++i){
             pi.set(i, value);
         }
         tx.commit();
@@ -106,7 +106,7 @@ public class TestFieldsOfPrimitivedouble extends JDO_Test {
 
         tx.begin();
         // check new values
-        checkValues(oid, (double)68000.15);
+        checkValues(oid, 68000.15);
         tx.commit();
     }
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java
index 538d5a41..ef82ac8b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java
@@ -181,7 +181,7 @@ public class TestHashMapStringKeyCollections extends JDO_Test {
                                 (BigDecimal)actual.get(nextKey);
                         if ((expectedMapValue.compareTo(actualMapValue) != 0)) {
                             sbuf.append("\nFor element " + i + "(" 
-                                    + (String)nextKey +
+                                    + nextKey +
                                     "), expected = " + expectedMapValue +
                                     ", actual = " + actualMapValue + " . ");
                     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java
index cab8bba3..c5fc7ec8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java
@@ -183,7 +183,7 @@ public class TestHashtableStringKeyCollections extends JDO_Test {
                                 (BigDecimal)actual.get(nextKey);
                         if ((expectedMapValue.compareTo(actualMapValue) != 0)) {
                             sbuf.append("\nFor element " + i + "(" 
-                                    + (String)nextKey +
+                                    + nextKey +
                                     "), expected = " + expectedMapValue +
                                     ", actual = " + actualMapValue + " . ");
                     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java
index 13a516d2..039f1d10 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java
@@ -183,7 +183,7 @@ public class TestMapStringKeyCollections extends JDO_Test {
                                 (BigDecimal)actual.get(nextKey);
                         if ((expectedMapValue.compareTo(actualMapValue) != 0)) {
                             sbuf.append("\nFor element " + i + "(" 
-                                    + (String)nextKey +
+                                    + nextKey +
                                     "), expected = " + expectedMapValue +
                                     ", actual = " + actualMapValue + " . ");
                     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java
index 4be31598..84f48f64 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java
@@ -180,7 +180,7 @@ public class TestTreeMapStringKeyCollections extends JDO_Test {
                                 (BigDecimal)actual.get(nextKey);
                         if ((expectedMapValue.compareTo(actualMapValue) != 0)) {
                             sbuf.append("\nFor element " + i + "(" 
-                                    + (String)nextKey +
+                                    + nextKey +
                                     "), expected = " + expectedMapValue +
                                     ", actual = " + actualMapValue + " . ");
                     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
index ae4bc6a2..a4b5eed6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
@@ -161,8 +161,8 @@ public class TestUtil {
                       vec.add(4, new BigInteger("456445645"));
                       break;
                   case(8):
-                      vec.add(0, Byte.valueOf((byte)Byte.MIN_VALUE));
-                      vec.add(1, Byte.valueOf((byte)Byte.MAX_VALUE));
+                      vec.add(0, Byte.valueOf(Byte.MIN_VALUE));
+                      vec.add(1, Byte.valueOf(Byte.MAX_VALUE));
                       vec.add(2, Byte.valueOf((byte)(Byte.MAX_VALUE- 20)));
                       vec.add(3, Byte.valueOf((byte)(Byte.MAX_VALUE - 50)));
                       vec.add(4, Byte.valueOf((byte)(Byte.MAX_VALUE - 75)));
@@ -177,9 +177,9 @@ public class TestUtil {
                                   - 2323235.76764677));
                       break;
                   case(10):
-                      vec.add(0, Float.valueOf((float)AllTypes.FLOAT_SMALLEST));
-                      vec.add(1, Float.valueOf((float)AllTypes.FLOAT_LARGEST));
-                      vec.add(2, Float.valueOf((float)AllTypes.FLOAT_LARGEST - 20000));
+                      vec.add(0, Float.valueOf(AllTypes.FLOAT_SMALLEST));
+                      vec.add(1, Float.valueOf(AllTypes.FLOAT_LARGEST));
+                      vec.add(2, Float.valueOf(AllTypes.FLOAT_LARGEST - 20000));
                       vec.add(3, Float.valueOf((float)(AllTypes.FLOAT_LARGEST
                                   - 454545.434)));
                       vec.add(4, Float.valueOf((float)(AllTypes.FLOAT_LARGEST
@@ -207,11 +207,11 @@ public class TestUtil {
                       vec.add(4, Short.valueOf((short)(Short.MAX_VALUE - 5656)));
                       break;
                   case(14):
-                      vec.add(0, (SimpleEnum)SimpleEnum.AK);
-                      vec.add(1, (SimpleEnum)SimpleEnum.FM);
-                      vec.add(2, (SimpleEnum)SimpleEnum.KS);
-                      vec.add(3, (SimpleEnum)SimpleEnum.NJ);
-                      vec.add(4, (SimpleEnum)SimpleEnum.WI);
+                      vec.add(0, SimpleEnum.AK);
+                      vec.add(1, SimpleEnum.FM);
+                      vec.add(2, SimpleEnum.KS);
+                      vec.add(3, SimpleEnum.NJ);
+                      vec.add(4, SimpleEnum.WI);
                       break;
                  default:
                       throw new IndexOutOfBoundsException();
@@ -271,9 +271,9 @@ public class TestUtil {
                     break;
                   case(8):
                     vec.add(0, Byte.valueOf((byte)(Byte.MAX_VALUE-34)));
-                    vec.add(1, Byte.valueOf((byte)Byte.MIN_VALUE));
+                    vec.add(1, Byte.valueOf(Byte.MIN_VALUE));
                     vec.add(2, Byte.valueOf((byte)(Byte.MAX_VALUE- 76)));
-                    vec.add(3, Byte.valueOf((byte)Byte.MAX_VALUE));
+                    vec.add(3, Byte.valueOf(Byte.MAX_VALUE));
                     vec.add(4, Byte.valueOf((byte)(Byte.MAX_VALUE - 12)));
                     break;
                   case(9):
@@ -286,10 +286,10 @@ public class TestUtil {
                                 - 7235.236764677));
                     break;
                   case(10):
-                    vec.add(0, Float.valueOf((float)(AllTypes.FLOAT_LARGEST - 5452)));
-                    vec.add(1, Float.valueOf((float)AllTypes.FLOAT_SMALLEST));
+                    vec.add(0, Float.valueOf(AllTypes.FLOAT_LARGEST - 5452));
+                    vec.add(1, Float.valueOf(AllTypes.FLOAT_SMALLEST));
                     vec.add(2, Float.valueOf((float)(AllTypes.FLOAT_LARGEST - 6564560.54)));
-                    vec.add(3, Float.valueOf((float)AllTypes.FLOAT_LARGEST));
+                    vec.add(3, Float.valueOf(AllTypes.FLOAT_LARGEST));
                     vec.add(4, Float.valueOf((float)(AllTypes.FLOAT_LARGEST - 9756.634)));
                     break;
                   case(11):
@@ -309,16 +309,16 @@ public class TestUtil {
                   case(13):
                     vec.add(0, Short.valueOf((short)(Short.MAX_VALUE - 3434)));
                     vec.add(1, Short.valueOf(Short.MIN_VALUE));
-                    vec.add(2, Short.valueOf((short)(Short.MAX_VALUE)));
+                    vec.add(2, Short.valueOf(Short.MAX_VALUE));
                     vec.add(3, Short.valueOf((short)(Short.MAX_VALUE - 23344)));
                     vec.add(4, Short.valueOf((short)(Short.MAX_VALUE - 723)));
                     break;
                   case(14):
-                      vec.add(0, (SimpleEnum)SimpleEnum.AZ);
-                      vec.add(1, (SimpleEnum)SimpleEnum.SD);
-                      vec.add(2, (SimpleEnum)SimpleEnum.NV);
-                      vec.add(3, (SimpleEnum)SimpleEnum.WV);
-                      vec.add(4, (SimpleEnum)SimpleEnum.PA);
+                      vec.add(0, SimpleEnum.AZ);
+                      vec.add(1, SimpleEnum.SD);
+                      vec.add(2, SimpleEnum.NV);
+                      vec.add(3, SimpleEnum.WV);
+                      vec.add(4, SimpleEnum.PA);
                       break;
                  default:
                     throw new IndexOutOfBoundsException();
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppFullTimeEmployee.java
index 957ed008..afa34408 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppFullTimeEmployee.java
@@ -72,7 +72,7 @@ public class FCAppFullTimeEmployee extends FCAppEmployee
     public FCAppFullTimeEmployee(long personid, String first, String last,
                             String middle, Date born, IAddress addr, 
                             Date hired, double sal) {
-        super(personid, first, last, middle, born, (FCAppAddress)addr, hired);
+        super(personid, first, last, middle, born, addr, hired);
         salary = sal;
     }
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
index 59082505..21f707f5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
@@ -237,7 +237,7 @@ public class PCDSPerson
      * <code>null</code> if there was no phone number for the type. 
      */
     public String getPhoneNumber(String type) {
-        return (String)_phoneNumbers.get(type);
+        return _phoneNumbers.get(type);
     }
     
     /**
@@ -249,7 +249,7 @@ public class PCDSPerson
      * <code>null</code> if there was no phone number for the type. 
      */
     public String putPhoneNumber(String type, String phoneNumber) {
-        return (String)_phoneNumbers.put(type, phoneNumber);
+        return _phoneNumbers.put(type, phoneNumber);
     }
 
     /**
@@ -259,7 +259,7 @@ public class PCDSPerson
      * <code>null</code> if there was no phone number for the type. 
      */
     public String removePhoneNumber(String type) {
-        return (String)_phoneNumbers.remove(type);
+        return _phoneNumbers.remove(type);
     }
 
     /**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMClass.java
index d24e34b7..d946f4fa 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMClass.java
@@ -43,7 +43,7 @@ public class CompanyFactoryPMClass
     }
     
     ICompany newCompany() {
-        return (ICompany)pm.newInstance(Company.class);
+        return pm.newInstance(Company.class);
     }
     
     IDepartment newDepartment() {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
index 6c35c0ef..881210e4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
@@ -299,7 +299,7 @@ public static void load(PersistenceManager pm)
 
         public String toString() { return this.getClass().getName() + ": "  + id;}
 
-        public int hashCode() { return (int)id ; }
+        public int hashCode() { return id; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java
index 284ae503..99a3bca1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java
@@ -169,10 +169,10 @@ public class ArrayCollections {
     switch (index)
     {
       case(0):
-        ArrayOfObject0= (Object []) value ;
+        ArrayOfObject0= value;
          break;
       case(1):
-        ArrayOfObject1= (Object []) value ;
+        ArrayOfObject1= value;
          break;
       case(2):
         ArrayOfSimpleClass2= (SimpleClass []) value ;
@@ -277,7 +277,7 @@ public class ArrayCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java
index 58c69aca..05011e03 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java
@@ -364,7 +364,7 @@ public class CollectionCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java
index 781e8a89..5830ccf4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java
@@ -1073,7 +1073,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java
index 4d4133aa..a6cbe400 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java
@@ -1073,7 +1073,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java
index 7e8f7e3d..36b884fe 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java
index 1ce9d9cc..8a8643f1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java
index e15e1a4a..f98f1d92 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java
index 99adbee0..c3c12139 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java
@@ -1073,7 +1073,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java
index ed04df3e..b63db62a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.java
@@ -36,7 +36,7 @@ public class FieldsOfDouble {
   private transient Double Double12;
   private transient Double Double13;
   private transient Double Double14;
-  private final Double Double15 = Double.valueOf((double)5);
+  private final Double Double15 = Double.valueOf(5);
   private volatile Double Double16;
   private volatile Double Double17;
   private volatile Double Double18;
@@ -46,16 +46,16 @@ public class FieldsOfDouble {
   private volatile Double Double22;
   private volatile Double Double23;
   private static transient Double Double24;
-  private static final Double Double25 = Double.valueOf((double)5);
+  private static final Double Double25 = Double.valueOf(5);
   private static volatile Double Double26;
-  private transient final Double Double27 = Double.valueOf((double)5);
+  private transient final Double Double27 = Double.valueOf(5);
   private transient volatile Double Double28;
   private transient volatile Double Double29;
   private transient volatile Double Double30;
   private transient volatile Double Double31;
   private transient volatile Double Double32;
   private transient volatile Double Double33;
-  private static transient final Double Double34 = Double.valueOf((double)5);
+  private static transient final Double Double34 = Double.valueOf(5);
   private static transient volatile Double Double35;
   public Double Double36;
   public Double Double37;
@@ -72,7 +72,7 @@ public class FieldsOfDouble {
   public transient Double Double48;
   public transient Double Double49;
   public transient Double Double50;
-  public final Double Double51 = Double.valueOf((double)5);
+  public final Double Double51 = Double.valueOf(5);
   public volatile Double Double52;
   public volatile Double Double53;
   public volatile Double Double54;
@@ -82,16 +82,16 @@ public class FieldsOfDouble {
   public volatile Double Double58;
   public volatile Double Double59;
   public static transient Double Double60;
-  public static final Double Double61 = Double.valueOf((double)5);
+  public static final Double Double61 = Double.valueOf(5);
   public static volatile Double Double62;
-  public transient final Double Double63 = Double.valueOf((double)5);
+  public transient final Double Double63 = Double.valueOf(5);
   public transient volatile Double Double64;
   public transient volatile Double Double65;
   public transient volatile Double Double66;
   public transient volatile Double Double67;
   public transient volatile Double Double68;
   public transient volatile Double Double69;
-  public static transient final Double Double70 = Double.valueOf((double)5);
+  public static transient final Double Double70 = Double.valueOf(5);
   public static transient volatile Double Double71;
   protected Double Double72;
   protected Double Double73;
@@ -108,7 +108,7 @@ public class FieldsOfDouble {
   protected transient Double Double84;
   protected transient Double Double85;
   protected transient Double Double86;
-  protected final Double Double87 = Double.valueOf((double)5);
+  protected final Double Double87 = Double.valueOf(5);
   protected volatile Double Double88;
   protected volatile Double Double89;
   protected volatile Double Double90;
@@ -118,16 +118,16 @@ public class FieldsOfDouble {
   protected volatile Double Double94;
   protected volatile Double Double95;
   protected static transient Double Double96;
-  protected static final Double Double97 = Double.valueOf((double)5);
+  protected static final Double Double97 = Double.valueOf(5);
   protected static volatile Double Double98;
-  protected transient final Double Double99 = Double.valueOf((double)5);
+  protected transient final Double Double99 = Double.valueOf(5);
   protected transient volatile Double Double100;
   protected transient volatile Double Double101;
   protected transient volatile Double Double102;
   protected transient volatile Double Double103;
   protected transient volatile Double Double104;
   protected transient volatile Double Double105;
-  protected static transient final Double Double106 = Double.valueOf((double)5);
+  protected static transient final Double Double106 = Double.valueOf(5);
   protected static transient volatile Double Double107;
   Double Double108;
   Double Double109;
@@ -144,7 +144,7 @@ public class FieldsOfDouble {
   transient Double Double120;
   transient Double Double121;
   transient Double Double122;
-  final Double Double123 = Double.valueOf((double)5);
+  final Double Double123 = Double.valueOf(5);
   volatile Double Double124;
   volatile Double Double125;
   volatile Double Double126;
@@ -154,16 +154,16 @@ public class FieldsOfDouble {
   volatile Double Double130;
   volatile Double Double131;
   static transient Double Double132;
-  static final Double Double133 = Double.valueOf((double)5);
+  static final Double Double133 = Double.valueOf(5);
   static volatile Double Double134;
-  transient final Double Double135 = Double.valueOf((double)5);
+  transient final Double Double135 = Double.valueOf(5);
   transient volatile Double Double136;
   transient volatile Double Double137;
   transient volatile Double Double138;
   transient volatile Double Double139;
   transient volatile Double Double140;
   transient volatile Double Double141;
-  static transient final Double Double142 = Double.valueOf((double)5);
+  static transient final Double Double142 = Double.valueOf(5);
   static transient volatile Double Double143;
 
 public static final boolean [] isPersistent = { 
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java
index 21a34fec..bce11b7e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java
index a78a5870..a4af11ea 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.java
@@ -36,7 +36,7 @@ public class FieldsOfInteger {
   private transient Integer Integer12;
   private transient Integer Integer13;
   private transient Integer Integer14;
-  private final Integer Integer15 = Integer.valueOf((int)5);
+  private final Integer Integer15 = Integer.valueOf(5);
   private volatile Integer Integer16;
   private volatile Integer Integer17;
   private volatile Integer Integer18;
@@ -46,16 +46,16 @@ public class FieldsOfInteger {
   private volatile Integer Integer22;
   private volatile Integer Integer23;
   private static transient Integer Integer24;
-  private static final Integer Integer25 = Integer.valueOf((int)5);
+  private static final Integer Integer25 = Integer.valueOf(5);
   private static volatile Integer Integer26;
-  private transient final Integer Integer27 = Integer.valueOf((int)5);
+  private transient final Integer Integer27 = Integer.valueOf(5);
   private transient volatile Integer Integer28;
   private transient volatile Integer Integer29;
   private transient volatile Integer Integer30;
   private transient volatile Integer Integer31;
   private transient volatile Integer Integer32;
   private transient volatile Integer Integer33;
-  private static transient final Integer Integer34 = Integer.valueOf((int)5);
+  private static transient final Integer Integer34 = Integer.valueOf(5);
   private static transient volatile Integer Integer35;
   public Integer Integer36;
   public Integer Integer37;
@@ -72,7 +72,7 @@ public class FieldsOfInteger {
   public transient Integer Integer48;
   public transient Integer Integer49;
   public transient Integer Integer50;
-  public final Integer Integer51 = Integer.valueOf((int)5);
+  public final Integer Integer51 = Integer.valueOf(5);
   public volatile Integer Integer52;
   public volatile Integer Integer53;
   public volatile Integer Integer54;
@@ -82,16 +82,16 @@ public class FieldsOfInteger {
   public volatile Integer Integer58;
   public volatile Integer Integer59;
   public static transient Integer Integer60;
-  public static final Integer Integer61 = Integer.valueOf((int)5);
+  public static final Integer Integer61 = Integer.valueOf(5);
   public static volatile Integer Integer62;
-  public transient final Integer Integer63 = Integer.valueOf((int)5);
+  public transient final Integer Integer63 = Integer.valueOf(5);
   public transient volatile Integer Integer64;
   public transient volatile Integer Integer65;
   public transient volatile Integer Integer66;
   public transient volatile Integer Integer67;
   public transient volatile Integer Integer68;
   public transient volatile Integer Integer69;
-  public static transient final Integer Integer70 = Integer.valueOf((int)5);
+  public static transient final Integer Integer70 = Integer.valueOf(5);
   public static transient volatile Integer Integer71;
   protected Integer Integer72;
   protected Integer Integer73;
@@ -108,7 +108,7 @@ public class FieldsOfInteger {
   protected transient Integer Integer84;
   protected transient Integer Integer85;
   protected transient Integer Integer86;
-  protected final Integer Integer87 = Integer.valueOf((int)5);
+  protected final Integer Integer87 = Integer.valueOf(5);
   protected volatile Integer Integer88;
   protected volatile Integer Integer89;
   protected volatile Integer Integer90;
@@ -118,16 +118,16 @@ public class FieldsOfInteger {
   protected volatile Integer Integer94;
   protected volatile Integer Integer95;
   protected static transient Integer Integer96;
-  protected static final Integer Integer97 = Integer.valueOf((int)5);
+  protected static final Integer Integer97 = Integer.valueOf(5);
   protected static volatile Integer Integer98;
-  protected transient final Integer Integer99 = Integer.valueOf((int)5);
+  protected transient final Integer Integer99 = Integer.valueOf(5);
   protected transient volatile Integer Integer100;
   protected transient volatile Integer Integer101;
   protected transient volatile Integer Integer102;
   protected transient volatile Integer Integer103;
   protected transient volatile Integer Integer104;
   protected transient volatile Integer Integer105;
-  protected static transient final Integer Integer106 = Integer.valueOf((int)5);
+  protected static transient final Integer Integer106 = Integer.valueOf(5);
   protected static transient volatile Integer Integer107;
   Integer Integer108;
   Integer Integer109;
@@ -144,7 +144,7 @@ public class FieldsOfInteger {
   transient Integer Integer120;
   transient Integer Integer121;
   transient Integer Integer122;
-  final Integer Integer123 = Integer.valueOf((int)5);
+  final Integer Integer123 = Integer.valueOf(5);
   volatile Integer Integer124;
   volatile Integer Integer125;
   volatile Integer Integer126;
@@ -154,16 +154,16 @@ public class FieldsOfInteger {
   volatile Integer Integer130;
   volatile Integer Integer131;
   static transient Integer Integer132;
-  static final Integer Integer133 = Integer.valueOf((int)5);
+  static final Integer Integer133 = Integer.valueOf(5);
   static volatile Integer Integer134;
-  transient final Integer Integer135 = Integer.valueOf((int)5);
+  transient final Integer Integer135 = Integer.valueOf(5);
   transient volatile Integer Integer136;
   transient volatile Integer Integer137;
   transient volatile Integer Integer138;
   transient volatile Integer Integer139;
   transient volatile Integer Integer140;
   transient volatile Integer Integer141;
-  static transient final Integer Integer142 = Integer.valueOf((int)5);
+  static transient final Integer Integer142 = Integer.valueOf(5);
   static transient volatile Integer Integer143;
 
 public static final boolean [] isPersistent = { 
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java
index 40908bdc..96228dcf 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.java
@@ -1073,7 +1073,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java
index 4e313733..62434303 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java
@@ -36,7 +36,7 @@ public class FieldsOfLong {
   private transient Long Long12;
   private transient Long Long13;
   private transient Long Long14;
-  private final Long Long15 = Long.valueOf((long)5);
+  private final Long Long15 = Long.valueOf(5);
   private volatile Long Long16;
   private volatile Long Long17;
   private volatile Long Long18;
@@ -46,16 +46,16 @@ public class FieldsOfLong {
   private volatile Long Long22;
   private volatile Long Long23;
   private static transient Long Long24;
-  private static final Long Long25 = Long.valueOf((long)5);
+  private static final Long Long25 = Long.valueOf(5);
   private static volatile Long Long26;
-  private transient final Long Long27 = Long.valueOf((long)5);
+  private transient final Long Long27 = Long.valueOf(5);
   private transient volatile Long Long28;
   private transient volatile Long Long29;
   private transient volatile Long Long30;
   private transient volatile Long Long31;
   private transient volatile Long Long32;
   private transient volatile Long Long33;
-  private static transient final Long Long34 = Long.valueOf((long)5);
+  private static transient final Long Long34 = Long.valueOf(5);
   private static transient volatile Long Long35;
   public Long Long36;
   public Long Long37;
@@ -72,7 +72,7 @@ public class FieldsOfLong {
   public transient Long Long48;
   public transient Long Long49;
   public transient Long Long50;
-  public final Long Long51 = Long.valueOf((long)5);
+  public final Long Long51 = Long.valueOf(5);
   public volatile Long Long52;
   public volatile Long Long53;
   public volatile Long Long54;
@@ -82,16 +82,16 @@ public class FieldsOfLong {
   public volatile Long Long58;
   public volatile Long Long59;
   public static transient Long Long60;
-  public static final Long Long61 = Long.valueOf((long)5);
+  public static final Long Long61 = Long.valueOf(5);
   public static volatile Long Long62;
-  public transient final Long Long63 = Long.valueOf((long)5);
+  public transient final Long Long63 = Long.valueOf(5);
   public transient volatile Long Long64;
   public transient volatile Long Long65;
   public transient volatile Long Long66;
   public transient volatile Long Long67;
   public transient volatile Long Long68;
   public transient volatile Long Long69;
-  public static transient final Long Long70 = Long.valueOf((long)5);
+  public static transient final Long Long70 = Long.valueOf(5);
   public static transient volatile Long Long71;
   protected Long Long72;
   protected Long Long73;
@@ -108,7 +108,7 @@ public class FieldsOfLong {
   protected transient Long Long84;
   protected transient Long Long85;
   protected transient Long Long86;
-  protected final Long Long87 = Long.valueOf((long)5);
+  protected final Long Long87 = Long.valueOf(5);
   protected volatile Long Long88;
   protected volatile Long Long89;
   protected volatile Long Long90;
@@ -118,16 +118,16 @@ public class FieldsOfLong {
   protected volatile Long Long94;
   protected volatile Long Long95;
   protected static transient Long Long96;
-  protected static final Long Long97 = Long.valueOf((long)5);
+  protected static final Long Long97 = Long.valueOf(5);
   protected static volatile Long Long98;
-  protected transient final Long Long99 = Long.valueOf((long)5);
+  protected transient final Long Long99 = Long.valueOf(5);
   protected transient volatile Long Long100;
   protected transient volatile Long Long101;
   protected transient volatile Long Long102;
   protected transient volatile Long Long103;
   protected transient volatile Long Long104;
   protected transient volatile Long Long105;
-  protected static transient final Long Long106 = Long.valueOf((long)5);
+  protected static transient final Long Long106 = Long.valueOf(5);
   protected static transient volatile Long Long107;
   Long Long108;
   Long Long109;
@@ -144,7 +144,7 @@ public class FieldsOfLong {
   transient Long Long120;
   transient Long Long121;
   transient Long Long122;
-  final Long Long123 = Long.valueOf((long)5);
+  final Long Long123 = Long.valueOf(5);
   volatile Long Long124;
   volatile Long Long125;
   volatile Long Long126;
@@ -154,16 +154,16 @@ public class FieldsOfLong {
   volatile Long Long130;
   volatile Long Long131;
   static transient Long Long132;
-  static final Long Long133 = Long.valueOf((long)5);
+  static final Long Long133 = Long.valueOf(5);
   static volatile Long Long134;
-  transient final Long Long135 = Long.valueOf((long)5);
+  transient final Long Long135 = Long.valueOf(5);
   transient volatile Long Long136;
   transient volatile Long Long137;
   transient volatile Long Long138;
   transient volatile Long Long139;
   transient volatile Long Long140;
   transient volatile Long Long141;
-  static transient final Long Long142 = Long.valueOf((long)5);
+  static transient final Long Long142 = Long.valueOf(5);
   static transient volatile Long Long143;
 
 public static final boolean [] isPersistent = { 
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java
index 63887f18..e914b7a2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java
index c5572439..dc0ec095 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java
index 99fcf641..f9510947 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java
index dd8903ef..fdc2a8f2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java
index 2cda1a30..8a6d36cf 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java
index f136a81e..8d86ffcc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java
index a02585c2..7274c533 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java
index e4d5c854..664acd8c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java
index 11a2caea..14fa2da1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java
index 3a37351f..b5a82d7e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java
index 415b4b98..13a95009 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java
@@ -1246,7 +1246,7 @@ false,false,false,false,false,false,false,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java
index 70e98545..bab916ca 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java
index 6b1edc5d..491418e4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
index 0d136f93..a2ac1006 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
@@ -1072,7 +1072,7 @@ false,false,true,false
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java
index 4ede374a..73e0fd0a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java
@@ -749,7 +749,7 @@ public class HashMapStringKeyCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java
index a6bd0b26..3c4c7f98 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java
@@ -699,7 +699,7 @@ public class HashMapStringValueCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java
index 04ab3792..46ef77cb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java
@@ -364,7 +364,7 @@ public class HashSetCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java
index d69a59c8..4dc42e2d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java
@@ -749,7 +749,7 @@ public class HashtableStringKeyCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java
index 58c1ae3d..1f3c43e7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java
@@ -699,7 +699,7 @@ public class HashtableStringValueCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java
index ab6016ef..43150752 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java
@@ -364,7 +364,7 @@ public class LinkedListCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java
index 04fcf026..cd58bc2e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java
@@ -364,7 +364,7 @@ public class ListCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java
index f2e1784c..8ed987e6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java
@@ -840,7 +840,7 @@ public class MapStringKeyCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java
index fa1cb0b7..23cb2ddd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java
@@ -790,7 +790,7 @@ public class MapStringValueCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java
index 79a074d7..cd00488a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java
@@ -364,7 +364,7 @@ public class SetCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java
index 74cb91a0..1a2bbd4e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java
@@ -749,7 +749,7 @@ public class TreeMapStringKeyCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java
index bb1f4e81..74b2faf9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java
@@ -699,7 +699,7 @@ public class TreeMapStringValueCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java
index b436cff8..b75bbf5e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java
@@ -335,7 +335,7 @@ public class TreeSetCollections {
 
         public String toString() { return this.getClass().getName() + ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java
index 90405442..2644fe54 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java
@@ -365,7 +365,7 @@ public class VectorCollections {
         public String toString() { return this.getClass().getName() +
                 ": "  + identifier;}
 
-        public int hashCode() { return (int)identifier ; }
+        public int hashCode() { return identifier; }
 
         public boolean equals(Object other) {
             if (other != null && (other instanceof Oid)) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackClass.java
index 8b714fd8..ad81279f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/instancecallbacks/InstanceCallbackClass.java
@@ -131,7 +131,7 @@ public class InstanceCallbackClass implements InstanceCallbacks {
 
                 // delete designated child
                 for(Iterator<InstanceCallbackClass> i = children.iterator(); i.hasNext();) {
-                     InstanceCallbackClass obj =  (InstanceCallbackClass)i.next();
+                     InstanceCallbackClass obj = i.next();
                      if( obj.intValue == childToDelete) {
                         pm.deletePersistent(obj);
                         break;
@@ -159,7 +159,7 @@ public class InstanceCallbackClass implements InstanceCallbacks {
             numberOfChildren[intValue] = children.size();
             sumOfChildrenIntValue[intValue] = 0;
             for(Iterator<InstanceCallbackClass> i = children.iterator(); i.hasNext();) {
-                InstanceCallbackClass o = (InstanceCallbackClass)i.next();
+                InstanceCallbackClass o = i.next();
                 sumOfChildrenIntValue[intValue] += o.intValue;   
             }
             capturedChildToDelete[intValue] = childToDelete;
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java b/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java
index 0eed40c8..54744d85 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java
@@ -136,10 +136,10 @@ public abstract class QueryTest extends AbstractReaderTest {
         
         List<PCPoint> result = new ArrayList<>();
         for (Iterator<PCPoint> iter = list.iterator(); iter.hasNext();) {
-            Object pc = iter.next();
+            PCPoint pc = iter.next();
             for (Iterator<PCPoint> iteri = inserted.iterator(); iteri.hasNext();) {
                 PCPoint pci = iteri.next();
-                if (((PCPoint)pc).getX() == pci.getX()) {
+                if (pc.getX() == pci.getX()) {
                     result.add(pci);
                     break;
                 }
@@ -919,7 +919,7 @@ public abstract class QueryTest extends AbstractReaderTest {
         }
             
         logger.debug("Expected Objects are:");
-        iter = ((Collection<?>)expected).iterator();
+        iter = expected.iterator();
         while (iter.hasNext()) {
             pcp = (PCPoint)iter.next();
             logger.debug("X = " + pcp.getX() + "\tY = " + pcp.getY());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteCallback.java b/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteCallback.java
index fd2784bf..5718db5c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteCallback.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteCallback.java
@@ -410,8 +410,8 @@ public class DeleteCallback extends QueryTest {
             boolean hasDeleteEventBeenPassed = false;
             int size = events.size();
             for (int i = 0; i < size; i++) {
-                InstanceLifecycleEvent event = 
-                    (InstanceLifecycleEvent) this.events.get(i);
+                InstanceLifecycleEvent event =
+                        this.events.get(i);
                 Object source = event.getSource();
                 int eventType = event.getEventType();
                 if (eventType == InstanceLifecycleEvent.DELETE) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java
index 012a4656..af61f968 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java
@@ -287,7 +287,7 @@ public class Equality extends ComparisonTests {
         run_charQuery(char_filterR, charParameter, Character.valueOf('z'), 'z', 2);
         run_charQuery(char_filterL, CharacterParameter, Character.valueOf(' '), ' ', 1);
         run_charQuery(char_filterR, CharacterParameter, Character.valueOf('f'), 'f', 0);
-        run_charQuery(char_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), (char)Character.MIN_VALUE, 1);
+        run_charQuery(char_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.MIN_VALUE, 1);
         run_charQuery(char_filterR, byteParameter, Byte.valueOf((byte)122), 'z', 2);
         run_charQuery(char_filterL, ByteParameter, Byte.valueOf((byte)'a'), 'a', 0);
         run_charQuery(char_filterR, ByteParameter, Byte.valueOf((byte)'a'), 'a', 0);
@@ -305,8 +305,8 @@ public class Equality extends ComparisonTests {
         run_charQuery(char_filterR, LongParameter, Long.valueOf('B'), 'B', 1);
         run_charQuery(char_filterL, floatParameter, Float.valueOf((float)123.222), 'x', 0);
         run_charQuery(char_filterR, floatParameter, Float.valueOf((float)123.222), 'x', 0);
-        run_charQuery(char_filterL, FloatParameter, Float.valueOf((float)'z'), 'z', 2);
-        run_charQuery(char_filterR, FloatParameter, Float.valueOf((float)'z'), 'z', 2);
+        run_charQuery(char_filterL, FloatParameter, Float.valueOf('z'), 'z', 2);
+        run_charQuery(char_filterR, FloatParameter, Float.valueOf('z'), 'z', 2);
         run_charQuery(char_filterL, doubleParameter, Double.valueOf('B'), 'B', 1);
         run_charQuery(char_filterR, doubleParameter, Double.valueOf('B'), 'B', 1);
         run_charQuery(char_filterL, DoubleParameter, Double.valueOf('A'), 'A', 1);
@@ -564,7 +564,7 @@ public class Equality extends ComparisonTests {
         run_CharacterQuery(Character_filterR, charParameter, Character.valueOf('z'), Character.valueOf('z'), 2);
         run_CharacterQuery(Character_filterL, CharacterParameter, Character.valueOf(' '), Character.valueOf(' '), 1);
         run_CharacterQuery(Character_filterR, CharacterParameter, Character.valueOf('f'), Character.valueOf('f'), 0);
-        run_CharacterQuery(Character_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.valueOf((char)Character.MIN_VALUE), 1);
+        run_CharacterQuery(Character_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.valueOf(Character.MIN_VALUE), 1);
         run_CharacterQuery(Character_filterR, ByteParameter, Byte.valueOf((byte)'a'), Character.valueOf('a'), 0);
         run_CharacterQuery(Character_filterL, shortParameter, Short.valueOf((short)'M'), Character.valueOf('M'), 2);
         run_CharacterQuery(Character_filterR, shortParameter, Short.valueOf((short)'F'), Character.valueOf('F'), 1);
@@ -580,8 +580,8 @@ public class Equality extends ComparisonTests {
         run_CharacterQuery(Character_filterR, LongParameter, Long.valueOf('B'), Character.valueOf('B'), 1);
         run_CharacterQuery(Character_filterL, floatParameter, Float.valueOf((float)123.222), Character.valueOf('x'), 0);
         run_CharacterQuery(Character_filterR, floatParameter, Float.valueOf((float)123.222), Character.valueOf('x'), 0);
-        run_CharacterQuery(Character_filterL, FloatParameter, Float.valueOf((float)'z'), Character.valueOf('z'), 2);
-        run_CharacterQuery(Character_filterR, FloatParameter, Float.valueOf((float)'z'), Character.valueOf('z'), 2);
+        run_CharacterQuery(Character_filterL, FloatParameter, Float.valueOf('z'), Character.valueOf('z'), 2);
+        run_CharacterQuery(Character_filterR, FloatParameter, Float.valueOf('z'), Character.valueOf('z'), 2);
         run_CharacterQuery(Character_filterL, doubleParameter, Double.valueOf('B'), Character.valueOf('B'), 1);
         run_CharacterQuery(Character_filterR, doubleParameter, Double.valueOf('B'), Character.valueOf('B'), 1);
         run_CharacterQuery(Character_filterL, DoubleParameter, Double.valueOf('A'), Character.valueOf('A'), 1);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java
index 8c3ea39e..730d185f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java
@@ -262,7 +262,7 @@ public class GreaterThan extends ComparisonTests {
         run_charQuery(char_filterR, charParameter, Character.valueOf('z'), 'z', false, 1);
         run_charQuery(char_filterL, CharacterParameter, Character.valueOf(' '), ' ', true, 1);
         run_charQuery(char_filterR, CharacterParameter, Character.valueOf('f'), 'f', false, 3);
-        run_charQuery(char_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), (char)Character.MIN_VALUE, true, 0);
+        run_charQuery(char_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.MIN_VALUE, true, 0);
         run_charQuery(char_filterR, ByteParameter, Byte.valueOf((byte)'a'), 'a', false, 3);
         run_charQuery(char_filterL, shortParameter, Short.valueOf((short)'M'), 'M', true, 5);
         run_charQuery(char_filterR, shortParameter, Short.valueOf((short)'M'), 'M', false, 3);
@@ -272,10 +272,10 @@ public class GreaterThan extends ComparisonTests {
         run_charQuery(char_filterR, intParameter, Integer.valueOf('z'), 'z', false, 1);
         run_charQuery(char_filterL, IntegerParameter, Integer.valueOf('B'), 'B', true, 3);
         run_charQuery(char_filterR, IntegerParameter, Integer.valueOf('B'), 'B', false, 6);
-        run_charQuery(char_filterL, floatParameter, Float.valueOf((float)'f'), 'f', true, 7);
-        run_charQuery(char_filterR, floatParameter, Float.valueOf((float)' '), ' ', false, 8);
-        run_charQuery(char_filterL, FloatParameter, Float.valueOf((float)'z'), 'z', true, 7);
-        run_charQuery(char_filterR, FloatParameter, Float.valueOf((float)'z'), 'z', false, 1);
+        run_charQuery(char_filterL, floatParameter, Float.valueOf('f'), 'f', true, 7);
+        run_charQuery(char_filterR, floatParameter, Float.valueOf(' '), ' ', false, 8);
+        run_charQuery(char_filterL, FloatParameter, Float.valueOf('z'), 'z', true, 7);
+        run_charQuery(char_filterR, FloatParameter, Float.valueOf('z'), 'z', false, 1);
         run_charQuery(char_filterL, doubleParameter, Double.valueOf('B'), 'B', true, 3);
         run_charQuery(char_filterR, doubleParameter, Double.valueOf('B'), 'B', false, 6);
         run_charQuery(char_filterL, DoubleParameter, Double.valueOf('A'), 'A', true, 2);
@@ -363,8 +363,8 @@ public class GreaterThan extends ComparisonTests {
         run_longQuery(long_filterObj, AllTypesParameter, alltypes, 100, false, 3);
         run_longQuery(long_filterVal, null, null, 1000000, false, 1);
     
-        run_floatQuery(float_filterL, floatParameter, Float.valueOf((float)AllTypes.FLOAT_SMALLEST), AllTypes.FLOAT_SMALLEST, true, 0);
-        run_floatQuery(float_filterR, floatParameter, Float.valueOf((float)AllTypes.FLOAT_LARGEST), AllTypes.FLOAT_LARGEST, false, 0);
+        run_floatQuery(float_filterL, floatParameter, Float.valueOf(AllTypes.FLOAT_SMALLEST), AllTypes.FLOAT_SMALLEST, true, 0);
+        run_floatQuery(float_filterR, floatParameter, Float.valueOf(AllTypes.FLOAT_LARGEST), AllTypes.FLOAT_LARGEST, false, 0);
         run_floatQuery(float_filterL, FloatParameter, Float.valueOf(4.0f), 4.0f, true, 4);
         run_floatQuery(float_filterR, FloatParameter, Float.valueOf(400.0f), 400.0f, false, 3);
         run_floatQuery(float_filterL, byteParameter, Byte.valueOf((byte)4), 4.0f, true, 4);
@@ -522,7 +522,7 @@ public class GreaterThan extends ComparisonTests {
         run_CharacterQuery(Character_filterR, charParameter, Character.valueOf('z'), Character.valueOf('z'), false, 1);
         run_CharacterQuery(Character_filterL, CharacterParameter, Character.valueOf(' '), Character.valueOf(' '), true, 1);
         run_CharacterQuery(Character_filterR, CharacterParameter, Character.valueOf('f'), Character.valueOf('f'), false, 3);
-        run_CharacterQuery(Character_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.valueOf((char)Character.MIN_VALUE), true, 0);
+        run_CharacterQuery(Character_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.valueOf(Character.MIN_VALUE), true, 0);
         run_CharacterQuery(Character_filterR, ByteParameter, Byte.valueOf((byte)'a'), Character.valueOf('a'), false, 3);
         run_CharacterQuery(Character_filterL, shortParameter, Short.valueOf((short)'M'), Character.valueOf('M'), true, 5);
         run_CharacterQuery(Character_filterR, shortParameter, Short.valueOf((short)'F'), Character.valueOf('F'), false, 5);
@@ -536,10 +536,10 @@ public class GreaterThan extends ComparisonTests {
         run_CharacterQuery(Character_filterR, longParameter, Long.valueOf('z'), Character.valueOf('z'), false, 1);
         run_CharacterQuery(Character_filterL, LongParameter, Long.valueOf('B'), Character.valueOf('B'), true, 3);
         run_CharacterQuery(Character_filterR, LongParameter, Long.valueOf('B'), Character.valueOf('B'), false, 6);
-        run_CharacterQuery(Character_filterL, floatParameter, Float.valueOf((float)'z'), Character.valueOf('z'), true, 7);
-        run_CharacterQuery(Character_filterR, floatParameter, Float.valueOf((float)'z'), Character.valueOf('z'), false, 1);
-        run_CharacterQuery(Character_filterL, FloatParameter, Float.valueOf((float)'M'), Character.valueOf('M'), true, 5);
-        run_CharacterQuery(Character_filterR, FloatParameter, Float.valueOf((float)'X'), Character.valueOf('X'), false, 3);
+        run_CharacterQuery(Character_filterL, floatParameter, Float.valueOf('z'), Character.valueOf('z'), true, 7);
+        run_CharacterQuery(Character_filterR, floatParameter, Float.valueOf('z'), Character.valueOf('z'), false, 1);
+        run_CharacterQuery(Character_filterL, FloatParameter, Float.valueOf('M'), Character.valueOf('M'), true, 5);
+        run_CharacterQuery(Character_filterR, FloatParameter, Float.valueOf('X'), Character.valueOf('X'), false, 3);
         run_CharacterQuery(Character_filterL, doubleParameter, Double.valueOf('B'), Character.valueOf('B'), true, 3);
         run_CharacterQuery(Character_filterR, doubleParameter, Double.valueOf('B'), Character.valueOf('B'), false, 6);
         run_CharacterQuery(Character_filterL, DoubleParameter, Double.valueOf('A'), Character.valueOf('A'), true, 2);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java
index 3f8b7549..58a32dd0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java
@@ -261,7 +261,7 @@ public class GreaterThanOrEqual extends ComparisonTests {
         run_charQuery(char_filterR, charParameter, Character.valueOf('z'), 'z', false, 3);
         run_charQuery(char_filterL, CharacterParameter, Character.valueOf(' '), ' ', true, 2);
         run_charQuery(char_filterR, CharacterParameter, Character.valueOf('f'), 'f', false, 3);
-        run_charQuery(char_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), (char)Character.MIN_VALUE, true, 1);
+        run_charQuery(char_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.MIN_VALUE, true, 1);
         run_charQuery(char_filterR, ByteParameter, Byte.valueOf((byte)'a'), 'a', false, 3);
         run_charQuery(char_filterL, shortParameter, Short.valueOf((short)'M'), 'M', true, 7);
         run_charQuery(char_filterR, shortParameter, Short.valueOf((short)'M'), 'M', false, 5);
@@ -271,10 +271,10 @@ public class GreaterThanOrEqual extends ComparisonTests {
         run_charQuery(char_filterR, intParameter, Integer.valueOf('z'), 'z', false, 3);
         run_charQuery(char_filterL, IntegerParameter, Integer.valueOf('B'), 'B', true, 4);
         run_charQuery(char_filterR, IntegerParameter, Integer.valueOf('B'), 'B', false, 7);
-        run_charQuery(char_filterL, floatParameter, Float.valueOf((float)'f'), 'f', true, 7);
-        run_charQuery(char_filterR, floatParameter, Float.valueOf((float)' '), ' ', false, 9);
-        run_charQuery(char_filterL, FloatParameter, Float.valueOf((float)'z'), 'z', true, 9);
-        run_charQuery(char_filterR, FloatParameter, Float.valueOf((float)'z'), 'z', false, 3);
+        run_charQuery(char_filterL, floatParameter, Float.valueOf('f'), 'f', true, 7);
+        run_charQuery(char_filterR, floatParameter, Float.valueOf(' '), ' ', false, 9);
+        run_charQuery(char_filterL, FloatParameter, Float.valueOf('z'), 'z', true, 9);
+        run_charQuery(char_filterR, FloatParameter, Float.valueOf('z'), 'z', false, 3);
         run_charQuery(char_filterL, doubleParameter, Double.valueOf('B'), 'B', true, 4);
         run_charQuery(char_filterR, doubleParameter, Double.valueOf('B'), 'B', false, 7);
         run_charQuery(char_filterL, DoubleParameter, Double.valueOf('A'), 'A', true, 3);
@@ -362,10 +362,10 @@ public class GreaterThanOrEqual extends ComparisonTests {
         run_longQuery(long_filterObj, AllTypesParameter, alltypes, 100, false, 5);
         run_longQuery(long_filterVal, null, null, 1000000, false, 2);
     
-        run_floatQuery(float_filterL, floatParameter, Float.valueOf((float)AllTypes.FLOAT_SMALLEST), AllTypes.FLOAT_SMALLEST, true, 1);
-        run_floatQuery(float_filterR, floatParameter, Float.valueOf((float)AllTypes.FLOAT_LARGEST), AllTypes.FLOAT_LARGEST, false, 1);
-        run_floatQuery(float_filterL, FloatParameter, Float.valueOf((float)4.0f), 4.0f, true, 4);
-        run_floatQuery(float_filterR, FloatParameter, Float.valueOf((float)400.0f), 400.0f, false, 3);
+        run_floatQuery(float_filterL, floatParameter, Float.valueOf(AllTypes.FLOAT_SMALLEST), AllTypes.FLOAT_SMALLEST, true, 1);
+        run_floatQuery(float_filterR, floatParameter, Float.valueOf(AllTypes.FLOAT_LARGEST), AllTypes.FLOAT_LARGEST, false, 1);
+        run_floatQuery(float_filterL, FloatParameter, Float.valueOf(4.0f), 4.0f, true, 4);
+        run_floatQuery(float_filterR, FloatParameter, Float.valueOf(400.0f), 400.0f, false, 3);
         run_floatQuery(float_filterL, byteParameter, Byte.valueOf((byte)4), 4.0f, true, 4);
         run_floatQuery(float_filterR, byteParameter, Byte.valueOf((byte)23), 23.0f, false, 6);
         run_floatQuery(float_filterL, ByteParameter, Byte.valueOf((byte)34), 34.0f, true, 4);
@@ -521,7 +521,7 @@ public class GreaterThanOrEqual extends ComparisonTests {
         run_CharacterQuery(Character_filterR, charParameter, Character.valueOf('z'), Character.valueOf('z'), false, 3);
         run_CharacterQuery(Character_filterL, CharacterParameter, Character.valueOf(' '), Character.valueOf(' '), true, 2);
         run_CharacterQuery(Character_filterR, CharacterParameter, Character.valueOf('f'), Character.valueOf('f'), false, 3);
-        run_CharacterQuery(Character_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.valueOf((char)Character.MIN_VALUE), true, 1);
+        run_CharacterQuery(Character_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.valueOf(Character.MIN_VALUE), true, 1);
         run_CharacterQuery(Character_filterR, ByteParameter, Byte.valueOf((byte)'a'), Character.valueOf('a'), false, 3);
         run_CharacterQuery(Character_filterL, shortParameter, Short.valueOf((short)'M'), Character.valueOf('M'), true, 7);
         run_CharacterQuery(Character_filterR, shortParameter, Short.valueOf((short)'F'), Character.valueOf('F'), false, 6);
@@ -535,10 +535,10 @@ public class GreaterThanOrEqual extends ComparisonTests {
         run_CharacterQuery(Character_filterR, longParameter, Long.valueOf('z'), Character.valueOf('z'), false, 3);
         run_CharacterQuery(Character_filterL, LongParameter, Long.valueOf('B'), Character.valueOf('B'), true, 4);
         run_CharacterQuery(Character_filterR, LongParameter, Long.valueOf('B'), Character.valueOf('B'), false, 7);
-        run_CharacterQuery(Character_filterL, floatParameter, Float.valueOf((float)'z'), Character.valueOf('z'), true, 9);
-        run_CharacterQuery(Character_filterR, floatParameter, Float.valueOf((float)'z'), Character.valueOf('z'), false, 3);
-        run_CharacterQuery(Character_filterL, FloatParameter, Float.valueOf((float)'M'), Character.valueOf('M'), true, 7);
-        run_CharacterQuery(Character_filterR, FloatParameter, Float.valueOf((float)'X'), Character.valueOf('X'), false, 3);
+        run_CharacterQuery(Character_filterL, floatParameter, Float.valueOf('z'), Character.valueOf('z'), true, 9);
+        run_CharacterQuery(Character_filterR, floatParameter, Float.valueOf('z'), Character.valueOf('z'), false, 3);
+        run_CharacterQuery(Character_filterL, FloatParameter, Float.valueOf('M'), Character.valueOf('M'), true, 7);
+        run_CharacterQuery(Character_filterR, FloatParameter, Float.valueOf('X'), Character.valueOf('X'), false, 3);
         run_CharacterQuery(Character_filterL, doubleParameter, Double.valueOf('B'), Character.valueOf('B'), true, 4);
         run_CharacterQuery(Character_filterR, doubleParameter, Double.valueOf('B'), Character.valueOf('B'), false, 7);
         run_CharacterQuery(Character_filterL, DoubleParameter, Double.valueOf('A'), Character.valueOf('A'), true, 3);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java
index 3b1d873b..b8bd1a0e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java
@@ -261,7 +261,7 @@ public class LessThan extends ComparisonTests {
         run_charQuery(char_filterR, charParameter, Character.valueOf('z'), 'z', false, 7);
         run_charQuery(char_filterL, CharacterParameter, Character.valueOf(' '), ' ', true, 8);
         run_charQuery(char_filterR, CharacterParameter, Character.valueOf('f'), 'f', false, 7);
-        run_charQuery(char_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), (char)Character.MIN_VALUE, true, 9);
+        run_charQuery(char_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.MIN_VALUE, true, 9);
         run_charQuery(char_filterR, ByteParameter, Byte.valueOf((byte)'a'), 'a', false, 7);
         run_charQuery(char_filterL, shortParameter, Short.valueOf((short)'M'), 'M', true, 3);
         run_charQuery(char_filterR, shortParameter, Short.valueOf((short)'M'), 'M', false, 5);
@@ -271,10 +271,10 @@ public class LessThan extends ComparisonTests {
         run_charQuery(char_filterR, intParameter, Integer.valueOf('z'), 'z', false, 7);
         run_charQuery(char_filterL, IntegerParameter, Integer.valueOf('B'), 'B', true, 6);
         run_charQuery(char_filterR, IntegerParameter, Integer.valueOf('B'), 'B', false, 3);
-        run_charQuery(char_filterL, floatParameter, Float.valueOf((float)'f'), 'f', true, 3);
-        run_charQuery(char_filterR, floatParameter, Float.valueOf((float)' '), ' ', false, 1);
-        run_charQuery(char_filterL, FloatParameter, Float.valueOf((float)'z'), 'z', true, 1);
-        run_charQuery(char_filterR, FloatParameter, Float.valueOf((float)'z'), 'z', false, 7);
+        run_charQuery(char_filterL, floatParameter, Float.valueOf('f'), 'f', true, 3);
+        run_charQuery(char_filterR, floatParameter, Float.valueOf(' '), ' ', false, 1);
+        run_charQuery(char_filterL, FloatParameter, Float.valueOf('z'), 'z', true, 1);
+        run_charQuery(char_filterR, FloatParameter, Float.valueOf('z'), 'z', false, 7);
         run_charQuery(char_filterL, doubleParameter, Double.valueOf('B'), 'B', true, 6);
         run_charQuery(char_filterR, doubleParameter, Double.valueOf('B'), 'B', false, 3);
         run_charQuery(char_filterL, DoubleParameter, Double.valueOf('A'), 'A', true, 7);
@@ -362,8 +362,8 @@ public class LessThan extends ComparisonTests {
         run_longQuery(long_filterObj, AllTypesParameter, alltypes, 100, false, 5);
         run_longQuery(long_filterVal, null, null, 1000000, false, 8);
     
-        run_floatQuery(float_filterL, floatParameter, Float.valueOf((float)AllTypes.FLOAT_SMALLEST), AllTypes.FLOAT_SMALLEST, true, 9);
-        run_floatQuery(float_filterR, floatParameter, Float.valueOf((float)AllTypes.FLOAT_LARGEST), AllTypes.FLOAT_LARGEST, false, 9);
+        run_floatQuery(float_filterL, floatParameter, Float.valueOf(AllTypes.FLOAT_SMALLEST), AllTypes.FLOAT_SMALLEST, true, 9);
+        run_floatQuery(float_filterR, floatParameter, Float.valueOf(AllTypes.FLOAT_LARGEST), AllTypes.FLOAT_LARGEST, false, 9);
         run_floatQuery(float_filterL, FloatParameter, Float.valueOf(4.0f), 4.0f, true, 6);
         run_floatQuery(float_filterR, FloatParameter, Float.valueOf(400.0f), 400.0f, false, 7);
         run_floatQuery(float_filterL, byteParameter, Byte.valueOf((byte)4), 4.0f, true, 6);
@@ -521,7 +521,7 @@ public class LessThan extends ComparisonTests {
         run_CharacterQuery(Character_filterR, charParameter, Character.valueOf('z'), Character.valueOf('z'), false, 7);
         run_CharacterQuery(Character_filterL, CharacterParameter, Character.valueOf(' '), Character.valueOf(' '), true, 8);
         run_CharacterQuery(Character_filterR, CharacterParameter, Character.valueOf('f'), Character.valueOf('f'), false, 7);
-        run_CharacterQuery(Character_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.valueOf((char)Character.MIN_VALUE), true, 9);
+        run_CharacterQuery(Character_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.valueOf(Character.MIN_VALUE), true, 9);
         run_CharacterQuery(Character_filterR, ByteParameter, Byte.valueOf((byte)'a'), Character.valueOf('a'), false, 7);
         run_CharacterQuery(Character_filterL, shortParameter, Short.valueOf((short)'M'), Character.valueOf('M'), true, 3);
         run_CharacterQuery(Character_filterR, shortParameter, Short.valueOf((short)'F'), Character.valueOf('F'), false, 4);
@@ -535,10 +535,10 @@ public class LessThan extends ComparisonTests {
         run_CharacterQuery(Character_filterR, longParameter, Long.valueOf('z'), Character.valueOf('z'), false, 7);
         run_CharacterQuery(Character_filterL, LongParameter, Long.valueOf('B'), Character.valueOf('B'), true, 6);
         run_CharacterQuery(Character_filterR, LongParameter, Long.valueOf('B'), Character.valueOf('B'), false, 3);
-        run_CharacterQuery(Character_filterL, floatParameter, Float.valueOf((float)'z'), Character.valueOf('z'), true, 1);
-        run_CharacterQuery(Character_filterR, floatParameter, Float.valueOf((float)'z'), Character.valueOf('z'), false, 7);
-        run_CharacterQuery(Character_filterL, FloatParameter, Float.valueOf((float)'M'), Character.valueOf('M'), true, 3);
-        run_CharacterQuery(Character_filterR, FloatParameter, Float.valueOf((float)'X'), Character.valueOf('X'), false, 7);
+        run_CharacterQuery(Character_filterL, floatParameter, Float.valueOf('z'), Character.valueOf('z'), true, 1);
+        run_CharacterQuery(Character_filterR, floatParameter, Float.valueOf('z'), Character.valueOf('z'), false, 7);
+        run_CharacterQuery(Character_filterL, FloatParameter, Float.valueOf('M'), Character.valueOf('M'), true, 3);
+        run_CharacterQuery(Character_filterR, FloatParameter, Float.valueOf('X'), Character.valueOf('X'), false, 7);
         run_CharacterQuery(Character_filterL, doubleParameter, Double.valueOf('B'), Character.valueOf('B'), true, 6);
         run_CharacterQuery(Character_filterR, doubleParameter, Double.valueOf('B'), Character.valueOf('B'), false, 3);
         run_CharacterQuery(Character_filterL, DoubleParameter, Double.valueOf('A'), Character.valueOf('A'), true, 7);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java
index fb22ed5b..01e0fb0d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java
@@ -262,7 +262,7 @@ public class LessThanOrEqual extends ComparisonTests {
         run_charQuery(char_filterR, charParameter, Character.valueOf('z'), 'z', false, 9);
         run_charQuery(char_filterL, CharacterParameter, Character.valueOf(' '), ' ', true, 9);
         run_charQuery(char_filterR, CharacterParameter, Character.valueOf('f'), 'f', false, 7);
-        run_charQuery(char_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), (char)Character.MIN_VALUE, true, 10);
+        run_charQuery(char_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.MIN_VALUE, true, 10);
         run_charQuery(char_filterR, ByteParameter, Byte.valueOf((byte)'a'), 'a', false, 7);
         run_charQuery(char_filterL, shortParameter, Short.valueOf((short)'M'), 'M', true, 5);
         run_charQuery(char_filterR, shortParameter, Short.valueOf((short)'M'), 'M', false, 7);
@@ -276,10 +276,10 @@ public class LessThanOrEqual extends ComparisonTests {
         run_charQuery(char_filterR, longParameter, Long.valueOf('z'), 'z', false, 9);
         run_charQuery(char_filterL, LongParameter, Long.valueOf('B'), 'B', true, 7);
         run_charQuery(char_filterR, LongParameter, Long.valueOf('B'), 'B', false, 4);
-        run_charQuery(char_filterL, floatParameter, Float.valueOf((float)'f'), 'f', true, 3);
-        run_charQuery(char_filterR, floatParameter, Float.valueOf((float)' '), ' ', false, 2);
-        run_charQuery(char_filterL, FloatParameter, Float.valueOf((float)'z'), 'z', true, 3);
-        run_charQuery(char_filterR, FloatParameter, Float.valueOf((float)'z'), 'z', false, 9);
+        run_charQuery(char_filterL, floatParameter, Float.valueOf('f'), 'f', true, 3);
+        run_charQuery(char_filterR, floatParameter, Float.valueOf(' '), ' ', false, 2);
+        run_charQuery(char_filterL, FloatParameter, Float.valueOf('z'), 'z', true, 3);
+        run_charQuery(char_filterR, FloatParameter, Float.valueOf('z'), 'z', false, 9);
         run_charQuery(char_filterL, doubleParameter, Double.valueOf('B'), 'B', true, 7);
         run_charQuery(char_filterR, doubleParameter, Double.valueOf('B'), 'B', false, 4);
         run_charQuery(char_filterL, DoubleParameter, Double.valueOf('A'), 'A', true, 8);
@@ -367,8 +367,8 @@ public class LessThanOrEqual extends ComparisonTests {
         run_longQuery(long_filterObj, AllTypesParameter, alltypes, 100, false, 7);
         run_longQuery(long_filterVal, null, null, 1000000, false, 9);
     
-        run_floatQuery(float_filterL, floatParameter, Float.valueOf((float)AllTypes.FLOAT_SMALLEST), AllTypes.FLOAT_SMALLEST, true, 10);
-        run_floatQuery(float_filterR, floatParameter, Float.valueOf((float)AllTypes.FLOAT_LARGEST), AllTypes.FLOAT_LARGEST, false, 10);
+        run_floatQuery(float_filterL, floatParameter, Float.valueOf(AllTypes.FLOAT_SMALLEST), AllTypes.FLOAT_SMALLEST, true, 10);
+        run_floatQuery(float_filterR, floatParameter, Float.valueOf(AllTypes.FLOAT_LARGEST), AllTypes.FLOAT_LARGEST, false, 10);
         run_floatQuery(float_filterL, FloatParameter, Float.valueOf(4.0f), 4.0f, true, 6);
         run_floatQuery(float_filterR, FloatParameter, Float.valueOf(400.0f), 400.0f, false, 7);
         run_floatQuery(float_filterL, byteParameter, Byte.valueOf((byte)4), 4.0f, true, 6);
@@ -526,7 +526,7 @@ public class LessThanOrEqual extends ComparisonTests {
         run_CharacterQuery(Character_filterR, charParameter, Character.valueOf('z'), Character.valueOf('z'), false, 9);
         run_CharacterQuery(Character_filterL, CharacterParameter, Character.valueOf(' '), Character.valueOf(' '), true, 9);
         run_CharacterQuery(Character_filterR, CharacterParameter, Character.valueOf('f'), Character.valueOf('f'), false, 7);
-        run_CharacterQuery(Character_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.valueOf((char)Character.MIN_VALUE), true, 10);
+        run_CharacterQuery(Character_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.valueOf(Character.MIN_VALUE), true, 10);
         run_CharacterQuery(Character_filterR, ByteParameter, Byte.valueOf((byte)'a'), Character.valueOf('a'), false, 7);
         run_CharacterQuery(Character_filterL, shortParameter, Short.valueOf((short)'M'), Character.valueOf('M'), true, 5);
         run_CharacterQuery(Character_filterR, shortParameter, Short.valueOf((short)'F'), Character.valueOf('F'), false, 5);
@@ -540,10 +540,10 @@ public class LessThanOrEqual extends ComparisonTests {
         run_CharacterQuery(Character_filterR, longParameter, Long.valueOf('z'), Character.valueOf('z'), false, 9);
         run_CharacterQuery(Character_filterL, LongParameter, Long.valueOf('B'), Character.valueOf('B'), true, 7);
         run_CharacterQuery(Character_filterR, LongParameter, Long.valueOf('B'), Character.valueOf('B'), false, 4);
-        run_CharacterQuery(Character_filterL, floatParameter, Float.valueOf((float)'z'), Character.valueOf('z'), true, 3);
-        run_CharacterQuery(Character_filterR, floatParameter, Float.valueOf((float)'z'), Character.valueOf('z'), false, 9);
-        run_CharacterQuery(Character_filterL, FloatParameter, Float.valueOf((float)'M'), Character.valueOf('M'), true, 5);
-        run_CharacterQuery(Character_filterR, FloatParameter, Float.valueOf((float)'X'), Character.valueOf('X'), false, 7);
+        run_CharacterQuery(Character_filterL, floatParameter, Float.valueOf('z'), Character.valueOf('z'), true, 3);
+        run_CharacterQuery(Character_filterR, floatParameter, Float.valueOf('z'), Character.valueOf('z'), false, 9);
+        run_CharacterQuery(Character_filterL, FloatParameter, Float.valueOf('M'), Character.valueOf('M'), true, 5);
+        run_CharacterQuery(Character_filterR, FloatParameter, Float.valueOf('X'), Character.valueOf('X'), false, 7);
         run_CharacterQuery(Character_filterL, doubleParameter, Double.valueOf('B'), Character.valueOf('B'), true, 7);
         run_CharacterQuery(Character_filterR, doubleParameter, Double.valueOf('B'), Character.valueOf('B'), false, 4);
         run_CharacterQuery(Character_filterL, DoubleParameter, Double.valueOf('A'), Character.valueOf('A'), true, 8);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java
index 64025415..93fac691 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java
@@ -289,7 +289,7 @@ public class NotEquals extends ComparisonTests {
         run_charQuery(char_filterR, charParameter, Character.valueOf('z'), 'z', 8);
         run_charQuery(char_filterL, CharacterParameter, Character.valueOf(' '), ' ', 9);
         run_charQuery(char_filterR, CharacterParameter, Character.valueOf('f'), 'f', 10);
-        run_charQuery(char_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), (char)Character.MIN_VALUE, 9);
+        run_charQuery(char_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.MIN_VALUE, 9);
         run_charQuery(char_filterR, byteParameter, Byte.valueOf((byte)122), 'z', 8);
         run_charQuery(char_filterL, ByteParameter, Byte.valueOf((byte)'a'), 'a', 10);
         run_charQuery(char_filterR, ByteParameter, Byte.valueOf((byte)'a'), 'a', 10);
@@ -307,8 +307,8 @@ public class NotEquals extends ComparisonTests {
         run_charQuery(char_filterR, LongParameter, Long.valueOf('B'), 'B', 9);
         run_charQuery(char_filterL, floatParameter, Float.valueOf((float)123.222), 'x', 10);
         run_charQuery(char_filterR, floatParameter, Float.valueOf((float)123.222), 'x', 10);
-        run_charQuery(char_filterL, FloatParameter, Float.valueOf((float)'z'), 'z', 8);
-        run_charQuery(char_filterR, FloatParameter, Float.valueOf((float)'z'), 'z', 8);
+        run_charQuery(char_filterL, FloatParameter, Float.valueOf('z'), 'z', 8);
+        run_charQuery(char_filterR, FloatParameter, Float.valueOf('z'), 'z', 8);
         run_charQuery(char_filterL, doubleParameter, Double.valueOf('B'), 'B', 9);
         run_charQuery(char_filterR, doubleParameter, Double.valueOf('B'), 'B', 9);
         run_charQuery(char_filterL, DoubleParameter, Double.valueOf('A'), 'A', 9);
@@ -566,7 +566,7 @@ public class NotEquals extends ComparisonTests {
         run_CharacterQuery(Character_filterR, charParameter, Character.valueOf('z'), Character.valueOf('z'), 8);
         run_CharacterQuery(Character_filterL, CharacterParameter, Character.valueOf(' '), Character.valueOf(' '), 9);
         run_CharacterQuery(Character_filterR, CharacterParameter, Character.valueOf('f'), Character.valueOf('f'), 10);
-        run_CharacterQuery(Character_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.valueOf((char)Character.MIN_VALUE), 9);
+        run_CharacterQuery(Character_filterL, byteParameter, Byte.valueOf((byte)Character.MIN_VALUE), Character.valueOf(Character.MIN_VALUE), 9);
         run_CharacterQuery(Character_filterR, ByteParameter, Byte.valueOf((byte)'a'), Character.valueOf('a'), 10);
         run_CharacterQuery(Character_filterL, shortParameter, Short.valueOf((short)'M'), Character.valueOf('M'), 8);
         run_CharacterQuery(Character_filterR, shortParameter, Short.valueOf((short)'F'), Character.valueOf('F'), 9);
@@ -582,8 +582,8 @@ public class NotEquals extends ComparisonTests {
         run_CharacterQuery(Character_filterR, LongParameter, Long.valueOf('B'), Character.valueOf('B'), 9);
         run_CharacterQuery(Character_filterL, floatParameter, Float.valueOf((float)123.222), Character.valueOf('x'), 10);
         run_CharacterQuery(Character_filterR, floatParameter, Float.valueOf((float)123.222), Character.valueOf('x'), 10);
-        run_CharacterQuery(Character_filterL, FloatParameter, Float.valueOf((float)'z'), Character.valueOf('z'), 8);
-        run_CharacterQuery(Character_filterR, FloatParameter, Float.valueOf((float)'z'), Character.valueOf('z'), 8);
+        run_CharacterQuery(Character_filterL, FloatParameter, Float.valueOf('z'), Character.valueOf('z'), 8);
+        run_CharacterQuery(Character_filterR, FloatParameter, Float.valueOf('z'), Character.valueOf('z'), 8);
         run_CharacterQuery(Character_filterL, doubleParameter, Double.valueOf('B'), Character.valueOf('B'), 9);
         run_CharacterQuery(Character_filterR, doubleParameter, Double.valueOf('B'), Character.valueOf('B'), 9);
         run_CharacterQuery(Character_filterL, DoubleParameter, Double.valueOf('A'), Character.valueOf('A'), 9);
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/GetSupportedOptions.java b/tck/src/main/java/org/apache/jdo/tck/util/GetSupportedOptions.java
index d7bfaa2f..0d0cdcab 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/GetSupportedOptions.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/GetSupportedOptions.java
@@ -36,7 +36,7 @@ public class GetSupportedOptions {
         System.out.println("Supported options are:");
         Iterator<String> iter = options.iterator();
         while( iter.hasNext() ){
-            String val = (String) iter.next();
+            String val = iter.next();
             System.out.println(val);        
         }
     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/ThreadExceptionHandler.java b/tck/src/main/java/org/apache/jdo/tck/util/ThreadExceptionHandler.java
index f03efe19..62dc4d7b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/ThreadExceptionHandler.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/ThreadExceptionHandler.java
@@ -55,7 +55,7 @@ public class ThreadExceptionHandler extends ThreadGroup
      * @return uncaught exception for the specified thread
      */
     public Throwable getUncaughtException(Thread t) {
-        return (Throwable)uncaughtExceptions.get(t);
+        return uncaughtExceptions.get(t);
     }
 
     /** 
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/signature/SignatureVerifier.java b/tck/src/main/java/org/apache/jdo/tck/util/signature/SignatureVerifier.java
index 855fb3a6..0a44f477 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/signature/SignatureVerifier.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/signature/SignatureVerifier.java
@@ -478,7 +478,7 @@ public class SignatureVerifier {
                     int lastDot = value.lastIndexOf(".");
                     String expectedClassName = value.substring(0, lastDot);
                     String expectedFieldName = 
-                            value.substring(lastDot + 1, value.length());
+                            value.substring(lastDot + 1);
                     // get Class object from class name
                     Class<?> expectedClass = getClass(expectedClassName);
                     if (expectedClass == null) 


[db-jdo] 01/05: JDO-817 removing compiler warnings: call toString on an array

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mbo pushed a commit to branch tck-compiler-warnings
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit 1a69e4d7ae5ba9508db26a3a65dd834cf8097ed3
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sun Jul 10 09:42:50 2022 +0200

    JDO-817 removing compiler warnings: call toString on an array
---
 .../org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
index c2cdc404..6a55da34 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
@@ -149,7 +149,7 @@ public class TestArrayCollections extends JDO_Test {
             collect.set(i, valueArray);
             if (debug)
                 logger.debug("Set " + i + "th value to: "
-                        + valueArray.toString());
+                        + Arrays.toString(valueArray));
         }
     }
 
@@ -192,7 +192,7 @@ public class TestArrayCollections extends JDO_Test {
                 }
                 else {
                     sbuf.append("\nFor element " + i + ", expected = " +
-                        expected + ", actual = " + actual + " . ");
+                        Arrays.toString(expected) + ", actual = " + Arrays.toString(actual) + " . ");
                 }
             }
         }


[db-jdo] 02/05: JDO-817 removing compiler warnings: Duplicate branch in switch

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mbo pushed a commit to branch tck-compiler-warnings
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit f415f9ed5c8693bc89bd37805f59821cfe9365e7
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sun Jul 10 14:10:28 2022 +0200

    JDO-817 removing compiler warnings: Duplicate branch in switch
---
 .../apache/jdo/tck/lifecycle/StateTransitions.java | 251 +++++++--------------
 .../apache/jdo/tck/models/fieldtypes/TestUtil.java |   6 -
 2 files changed, 87 insertions(+), 170 deletions(-)

diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
index 34d80ffc..6506bf8a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
@@ -619,174 +619,97 @@ public class StateTransitions extends JDO_Test {
     /** */
     void applyOperation(int operation, StateTransitionObj stobj)
     {
-        StateTransitionObj obj = (StateTransitionObj) stobj;
-        switch( operation ){
-        case MAKEPERSISTENT:
-        {
-            pm.makePersistent(obj);
-            break;
-        }
-        case DELETEPERSISTENT:
-        {
-            pm.deletePersistent(obj);
-            break;
-        }
-        case MAKETRANSACTIONAL:
-        {
-            pm.makeTransactional(obj);
-            break;
-        }
-        case MAKENONTRANSACTIONAL:
-        {
-            pm.makeNontransactional(obj);
-            break;
-        }
-        case MAKETRANSIENT:
-        {
-            pm.makeTransient(obj);
-            break;
-        }
-        case COMMITNORETAINVALUES:
-        {
-            pm.currentTransaction().commit();
-            break;
-        }
-        case COMMITRETAINVALUES:
-        {
-            pm.currentTransaction().commit();
-            break;
-        }
-        case ROLLBACKNORESTOREVALUES:
-        {
-            pm.currentTransaction().rollback();
-            break;
-        }
-        case ROLLBACKRESTOREVALUES:
-        {
-            pm.currentTransaction().rollback();
-            break;
-        }
-        case REFRESHDATASTORE:
-        {
-            pm.refresh(obj);
-            break;
-        }
-        case REFRESHOPTIMISTIC:
-        {
-            pm.refresh(obj);
-            break;
-        }
-        case EVICT:
-        {
-            pm.evict(obj);
-            break;
-        }
-        case READOUTSIDETX:
-        {
-            obj.readField();
-            break;
-        }
-        case READOPTIMISTIC:
-        {
-            obj.readField();
-            break;
-        }
-        case READDATASTORE:
-        {
-            obj.readField();
-            break;
-        }
-        case WRITEOUTSIDETX:
-        {
-            obj.writeField(42);
-            break;
-        }
-        case WRITEINSIDETX:
-        {
-            obj.writeField(42);
-            break;
-        }
-        case RETRIEVEOUTSIDETX:
-        {
-            pm.retrieve(obj);
-            break;
-        }
-        case RETRIEVEINSIDETX:
-        {
-            pm.retrieve(obj);
-            break;      
-        }
-        case DETACHALLONCOMMIT:
-        {
-            pm.currentTransaction().commit();
-            break;      
-        }
-        case DETACHCOPYOUTSIDETXNTRTRU:
-        {
-            pm.detachCopy(obj);
-            break;      
-        }
-        case DETACHCOPYOUTSIDETXNTRFLS:
-        {
-            pm.detachCopy(obj);
-            break;      
-        }
-        case DETACHCOPYINSIDEDATASTORETX:
-        {
-            pm.detachCopy(obj);
-            break;      
-        }
-        case DETACHCOPYINSIDEOPTIMISTICTX:
-        {
-            pm.detachCopy(obj);
-            break;      
-        }
-        case SERIALIZEOUTSIDETX:
-        {
-            ObjectOutputStream oos = null;
-            try {
-                oos = new ObjectOutputStream(new ByteArrayOutputStream());
-                oos.writeObject(obj);
-            } catch (IOException e) {
-                throw new JDOFatalException(e.getMessage(), e);
-            } finally {
-                if (oos != null) {
-                    try {
-                        oos.close();
-                    } catch (IOException e) {
-                        throw new JDOFatalException(e.getMessage(), e);
-                    }
-                }
+        StateTransitionObj obj = stobj;
+        switch(operation) {
+            case MAKEPERSISTENT: {
+                pm.makePersistent(obj);
+                break;
             }
-            break;      
-        }
-        case SERIALIZEDATASTORE:
-        case SERIALIZEOPTIMISTIC:
-        {
-            ObjectOutputStream oos = null;
-            try {
-                oos = new ObjectOutputStream(new ByteArrayOutputStream());
-                oos.writeObject(obj);
-            } catch (IOException e) {
-                throw new JDOFatalException(e.getMessage(), e);
-            } finally {
-                if (oos != null) {
-                    try {
-                        oos.close();
-                    } catch (IOException e) {
-                        throw new JDOFatalException(e.getMessage(), e);
+            case DELETEPERSISTENT: {
+                pm.deletePersistent(obj);
+                break;
+            }
+            case MAKETRANSACTIONAL: {
+                pm.makeTransactional(obj);
+                break;
+            }
+            case MAKENONTRANSACTIONAL: {
+                pm.makeNontransactional(obj);
+                break;
+            }
+            case MAKETRANSIENT: {
+                pm.makeTransient(obj);
+                break;
+            }
+            case COMMITNORETAINVALUES:
+            case COMMITRETAINVALUES:
+            case DETACHALLONCOMMIT: {
+                pm.currentTransaction().commit();
+                break;
+            }
+            case ROLLBACKNORESTOREVALUES:
+            case ROLLBACKRESTOREVALUES: {
+                pm.currentTransaction().rollback();
+                break;
+            }
+            case REFRESHDATASTORE:
+            case REFRESHOPTIMISTIC: {
+                pm.refresh(obj);
+                break;
+            }
+            case EVICT: {
+                pm.evict(obj);
+                break;
+            }
+            case READOUTSIDETX:
+            case READOPTIMISTIC:
+            case READDATASTORE: {
+                obj.readField();
+                break;
+            }
+            case WRITEOUTSIDETX:
+            case WRITEINSIDETX: {
+                obj.writeField(42);
+                break;
+            }
+            case RETRIEVEOUTSIDETX:
+            case RETRIEVEINSIDETX: {
+                pm.retrieve(obj);
+                break;
+            }
+            case DETACHCOPYOUTSIDETXNTRTRU:
+            case DETACHCOPYOUTSIDETXNTRFLS:
+            case DETACHCOPYINSIDEDATASTORETX:
+            case DETACHCOPYINSIDEOPTIMISTICTX: {
+                pm.detachCopy(obj);
+                break;
+            }
+            case SERIALIZEOUTSIDETX:
+            case SERIALIZEDATASTORE:
+            case SERIALIZEOPTIMISTIC: {
+                ObjectOutputStream oos = null;
+                try {
+                    oos = new ObjectOutputStream(new ByteArrayOutputStream());
+                    oos.writeObject(obj);
+                } catch (IOException e) {
+                    throw new JDOFatalException(e.getMessage(), e);
+                } finally {
+                    if (oos != null) {
+                        try {
+                            oos.close();
+                        } catch (IOException e) {
+                            throw new JDOFatalException(e.getMessage(), e);
+                        }
                     }
                 }
+                break;
+            }
+            default: {
+                appendMessage(ASSERTION_FAILED + NL +
+                        "StateTransitions: " +
+                        scenario_string[scenario] +
+                        "; internal error, illegal operation: " + operation);
             }
-            break;      
-        }
-        default:
-        {
-            appendMessage(ASSERTION_FAILED + NL +
-                          "StateTransitions: " +
-                          scenario_string[scenario] +
-                          "; internal error, illegal operation: " + operation);
-        }
         }
     }
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
index 7e964b4c..52f106ef 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
@@ -227,12 +227,6 @@ public class TestUtil {
                     vec.add(4, new SimpleClass(3, "Hi There"));
                     break;
                   case(1):
-                    vec.add(0, new SimpleClass(1, "Peaches"));
-                    vec.add(1, new SimpleClass(2, "Oranges"));
-                    vec.add(2, new SimpleClass(3, "Blue Berries"));
-                    vec.add(3, new SimpleClass(4, "Apples"));
-                    vec.add(4, new SimpleClass(5, "Strawberries"));
-                    break;
                   case(2):
                     vec.add(0, new SimpleClass(1, "Peaches"));
                     vec.add(1, new SimpleClass(2, "Oranges"));


[db-jdo] 03/05: JDO-817 removing compiler warnings: Redundant String operation

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mbo pushed a commit to branch tck-compiler-warnings
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit 4eb8d628c9721cb4b7b87cd3ab35d1a0d2531963
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sun Jul 10 14:15:57 2022 +0200

    JDO-817 removing compiler warnings: Redundant String operation
---
 .../tck/models/fieldtypes/TestFieldsOfString.java  |  6 ++--
 .../apache/jdo/tck/models/fieldtypes/TestUtil.java | 20 +++++++-------
 .../org/apache/jdo/tck/pc/fieldtypes/AllTypes.java | 10 +++----
 .../jdo/tck/pc/fieldtypes/FieldsOfString.java      | 32 +++++++++++-----------
 .../apache/jdo/tck/pc/fieldtypes/SimpleClass.java  |  2 +-
 .../jdo/tck/query/jdoql/operators/Equality.java    | 12 ++++----
 .../jdo/tck/query/jdoql/operators/GreaterThan.java | 12 ++++----
 .../query/jdoql/operators/GreaterThanOrEqual.java  | 12 ++++----
 .../jdo/tck/query/jdoql/operators/LessThan.java    | 12 ++++----
 .../tck/query/jdoql/operators/LessThanOrEqual.java | 12 ++++----
 .../jdo/tck/query/jdoql/operators/NotEquals.java   | 12 ++++----
 .../apache/jdo/tck/query/sql/ExecuteWithMap.java   |  8 +++---
 12 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java
index 3ac0607a..16ff42ff 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java
@@ -76,8 +76,8 @@ public class TestFieldsOfString extends JDO_Test {
     {
         Transaction tx = pm.currentTransaction();
         int i, n;
-        String firstValue = new String("Hello");
-        String secondValue = new String("Hello World");
+        String firstValue = "Hello";
+        String secondValue = "Hello World";
         tx.begin();
         FieldsOfString pi = new FieldsOfString();
         pi.identifier = 1;
@@ -126,7 +126,7 @@ public class TestFieldsOfString extends JDO_Test {
                 fail(ASSERTION_FAILED,
                         "Incorrect value for " + FieldsOfString.fieldSpecs[i] +
                         ", expected value " + value +
-                        ", value is " + val.toString());
+                        ", value is " + val);
             }
         }
     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
index 52f106ef..ae4bc6a2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
@@ -126,11 +126,11 @@ public class TestUtil {
                       vec.add(4, new SimpleClass(5, "World"));
                       break;
                   case(3):
-                      vec.add(0, new String("Hello"));
-                      vec.add(1, new String("Welcome"));
-                      vec.add(2, new String("To The"));
-                      vec.add(3, new String("Beautiful"));
-                      vec.add(4, new String("World"));
+                      vec.add(0, "Hello");
+                      vec.add(1, "Welcome");
+                      vec.add(2, "To The");
+                      vec.add(3, "Beautiful");
+                      vec.add(4, "World");
                       break;
                   case(4):
                       vec.add(0, new Date(2007908));
@@ -235,11 +235,11 @@ public class TestUtil {
                     vec.add(4, new SimpleClass(5, "Strawberries"));
                     break;
                   case(3):
-                    vec.add(0, new String("Peaches"));
-                    vec.add(1, new String("Oranges"));
-                    vec.add(2, new String("Blue Berries"));
-                    vec.add(3, new String("Apples"));
-                    vec.add(4, new String("Strawberries"));
+                    vec.add(0, "Peaches");
+                    vec.add(1, "Oranges");
+                    vec.add(2, "Blue Berries");
+                    vec.add(3, "Apples");
+                    vec.add(4, "Strawberries");
                     break;
                   case(4):
                     vec.add(0, new Date(54545));
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
index e744d485..6c35c0ef 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
@@ -130,11 +130,11 @@ public class AllTypes {
     };
 
     public static final String[] String_values = {
-        new String(""), new String("hello world"),
-        new String("JDO has a very nice persistence API"), new String("JDO"),
-        new String("Java"), new String("abcde"),
-        new String("abcdef"), new String("JDO is a breeze to use"),
-        new String("Java"), new String("Long-live JDO")
+            "", "hello world",
+            "JDO has a very nice persistence API", "JDO",
+            "Java", "abcde",
+            "abcdef", "JDO is a breeze to use",
+            "Java", "Long-live JDO"
     };
     public static final Locale[] Locale_values = {
         Locale.US, Locale.UK, Locale.FRANCE, Locale.GERMANY, Locale.CANADA,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
index ce40e0c6..0d136f93 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
@@ -36,7 +36,7 @@ public class FieldsOfString {
   private transient String String12;
   private transient String String13;
   private transient String String14;
-  private final String String15 = new String("JDO TCK");
+  private final String String15 = "JDO TCK";
   private volatile String String16;
   private volatile String String17;
   private volatile String String18;
@@ -46,16 +46,16 @@ public class FieldsOfString {
   private volatile String String22;
   private volatile String String23;
   private static transient String String24;
-  private static final String String25 = new String("JDO TCK");
+  private static final String String25 = "JDO TCK";
   private static volatile String String26;
-  private transient final String String27 = new String("JDO TCK");
+  private transient final String String27 = "JDO TCK";
   private transient volatile String String28;
   private transient volatile String String29;
   private transient volatile String String30;
   private transient volatile String String31;
   private transient volatile String String32;
   private transient volatile String String33;
-  private static transient final String String34 = new String("JDO TCK");
+  private static transient final String String34 = "JDO TCK";
   private static transient volatile String String35;
   public String String36;
   public String String37;
@@ -72,7 +72,7 @@ public class FieldsOfString {
   public transient String String48;
   public transient String String49;
   public transient String String50;
-  public final String String51 = new String("JDO TCK");
+  public final String String51 = "JDO TCK";
   public volatile String String52;
   public volatile String String53;
   public volatile String String54;
@@ -82,16 +82,16 @@ public class FieldsOfString {
   public volatile String String58;
   public volatile String String59;
   public static transient String String60;
-  public static final String String61 = new String("JDO TCK");
+  public static final String String61 = "JDO TCK";
   public static volatile String String62;
-  public transient final String String63 = new String("JDO TCK");
+  public transient final String String63 = "JDO TCK";
   public transient volatile String String64;
   public transient volatile String String65;
   public transient volatile String String66;
   public transient volatile String String67;
   public transient volatile String String68;
   public transient volatile String String69;
-  public static transient final String String70 = new String("JDO TCK");
+  public static transient final String String70 = "JDO TCK";
   public static transient volatile String String71;
   protected String String72;
   protected String String73;
@@ -108,7 +108,7 @@ public class FieldsOfString {
   protected transient String String84;
   protected transient String String85;
   protected transient String String86;
-  protected final String String87 = new String("JDO TCK");
+  protected final String String87 = "JDO TCK";
   protected volatile String String88;
   protected volatile String String89;
   protected volatile String String90;
@@ -118,16 +118,16 @@ public class FieldsOfString {
   protected volatile String String94;
   protected volatile String String95;
   protected static transient String String96;
-  protected static final String String97 = new String("JDO TCK");
+  protected static final String String97 = "JDO TCK";
   protected static volatile String String98;
-  protected transient final String String99 = new String("JDO TCK");
+  protected transient final String String99 = "JDO TCK";
   protected transient volatile String String100;
   protected transient volatile String String101;
   protected transient volatile String String102;
   protected transient volatile String String103;
   protected transient volatile String String104;
   protected transient volatile String String105;
-  protected static transient final String String106 = new String("JDO TCK");
+  protected static transient final String String106 = "JDO TCK";
   protected static transient volatile String String107;
   String String108;
   String String109;
@@ -144,7 +144,7 @@ public class FieldsOfString {
   transient String String120;
   transient String String121;
   transient String String122;
-  final String String123 = new String("JDO TCK");
+  final String String123 = "JDO TCK";
   volatile String String124;
   volatile String String125;
   volatile String String126;
@@ -154,16 +154,16 @@ public class FieldsOfString {
   volatile String String130;
   volatile String String131;
   static transient String String132;
-  static final String String133 = new String("JDO TCK");
+  static final String String133 = "JDO TCK";
   static volatile String String134;
-  transient final String String135 = new String("JDO TCK");
+  transient final String String135 = "JDO TCK";
   transient volatile String String136;
   transient volatile String String137;
   transient volatile String String138;
   transient volatile String String139;
   transient volatile String String140;
   transient volatile String String141;
-  static transient final String String142 = new String("JDO TCK");
+  static transient final String String142 = "JDO TCK";
   static transient volatile String String143;
 
 public static final boolean [] isPersistent = { 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
index b0e4f104..1f3349d0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
@@ -32,7 +32,7 @@ public class SimpleClass implements Serializable, SimpleInterface, Comparable<Si
     }
     private long id = newId();
   private int intField=0;
-  private String stringField = new String("Test");
+  private String stringField = "Test";
   public SimpleClass(){};
   public SimpleClass(int intField, String stringField)
   {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java
index cf51575d..012a4656 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java
@@ -744,12 +744,12 @@ public class Equality extends ComparisonTests {
         run_DoubleQuery(Double_filterObj, AllTypesParameter, alltypes, Double.valueOf(-25.5), 1);
         run_DoubleQuery(Double_filterVal, null, null, Double.valueOf(-25.5), 1);
 
-        run_StringQuery(String_filterL, StringParameter, new String("JDO"), new String("JDO"), 1);
-        run_StringQuery(String_filterR, StringParameter, new String("JDBC"), new String("JDBC"), 0);
-        alltypes.setString(new String("abcde"));
-        run_StringQuery(String_filterObj, AllTypesParameter, alltypes, new String("abcde"), 1);
-        run_StringQuery(String_filterVal1, null, null, new String("Java"), 2);
-        run_StringQuery(String_filterVal2, null, null, new String(""), 1);
+        run_StringQuery(String_filterL, StringParameter, "JDO", "JDO", 1);
+        run_StringQuery(String_filterR, StringParameter, "JDBC", "JDBC", 0);
+        alltypes.setString("abcde");
+        run_StringQuery(String_filterObj, AllTypesParameter, alltypes, "abcde", 1);
+        run_StringQuery(String_filterVal1, null, null, "Java", 2);
+        run_StringQuery(String_filterVal2, null, null, "", 1);
 
         run_LocaleQuery(Locale_filterL, LocaleParameter, Locale.CANADA_FRENCH, Locale.CANADA_FRENCH, 0);
         run_LocaleQuery(Locale_filterR, LocaleParameter, Locale.US, Locale.US, 1);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java
index e8738a72..8c3ea39e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java
@@ -699,12 +699,12 @@ public class GreaterThan extends ComparisonTests {
         run_DoubleQuery(Double_filterObj, AllTypesParameter, alltypes, Double.valueOf(-999999999999.0), true, 1);
         run_DoubleQuery(Double_filterVal, null, null, Double.valueOf(100.0), false, 4);
 
-        run_StringQuery(String_filterL, StringParameter, new String("JDO"), new String("JDO"), true, 1);
-        run_StringQuery(String_filterR, StringParameter, new String("JDBC"), new String("JDBC"), false, 9);
-        alltypes.setString(new String("abcde"));
-        run_StringQuery(String_filterObj, AllTypesParameter, alltypes, new String("abcde"), true, 7);
-        run_StringQuery(String_filterVal1, null, null, new String("Java"), false, 4);
-        run_StringQuery(String_filterVal2, null, null, new String(""), false, 9);
+        run_StringQuery(String_filterL, StringParameter, "JDO", "JDO", true, 1);
+        run_StringQuery(String_filterR, StringParameter, "JDBC", "JDBC", false, 9);
+        alltypes.setString("abcde");
+        run_StringQuery(String_filterObj, AllTypesParameter, alltypes, "abcde", true, 7);
+        run_StringQuery(String_filterVal1, null, null, "Java", false, 4);
+        run_StringQuery(String_filterVal2, null, null, "", false, 9);
 
         BigDecimal bd = new BigDecimal("100.0");
         run_BigDecimalQuery(BigDecimal_filterL, BigDecimalParameter, bd, bd, true, 4);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java
index e3080b82..3f8b7549 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java
@@ -698,12 +698,12 @@ public class GreaterThanOrEqual extends ComparisonTests {
         run_DoubleQuery(Double_filterObj, AllTypesParameter, alltypes, Double.valueOf(-999999999999.0), true, 1);
         run_DoubleQuery(Double_filterVal, null, null, Double.valueOf(100.0), false, 6);
 
-        run_StringQuery(String_filterL, StringParameter, new String("JDO"), new String("JDO"), true, 2);
-        run_StringQuery(String_filterR, StringParameter, new String("JDBC"), new String("JDBC"), false, 9);
-        alltypes.setString(new String("abcde"));
-        run_StringQuery(String_filterObj, AllTypesParameter, alltypes, new String("abcde"), true, 8);
-        run_StringQuery(String_filterVal1, null, null, new String("Java"), false, 6);
-        run_StringQuery(String_filterVal2, null, null, new String(""), false, 10);
+        run_StringQuery(String_filterL, StringParameter, "JDO", "JDO", true, 2);
+        run_StringQuery(String_filterR, StringParameter, "JDBC", "JDBC", false, 9);
+        alltypes.setString("abcde");
+        run_StringQuery(String_filterObj, AllTypesParameter, alltypes, "abcde", true, 8);
+        run_StringQuery(String_filterVal1, null, null, "Java", false, 6);
+        run_StringQuery(String_filterVal2, null, null, "", false, 10);
 
         BigDecimal bd = new BigDecimal("100.0");
         run_BigDecimalQuery(BigDecimal_filterL, BigDecimalParameter, bd, bd, true, 6);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java
index 0ac16e34..3b1d873b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java
@@ -698,12 +698,12 @@ public class LessThan extends ComparisonTests {
         run_DoubleQuery(Double_filterObj, AllTypesParameter, alltypes, Double.valueOf(-999999999999.0), true, 9);
         run_DoubleQuery(Double_filterVal, null, null, Double.valueOf(100.0), false, 4);
 
-        run_StringQuery(String_filterL, StringParameter, new String("JDO"), new String("JDO"), true, 8);
-        run_StringQuery(String_filterR, StringParameter, new String("JDBC"), new String("JDBC"), false, 1);
-        alltypes.setString(new String("abcde"));
-        run_StringQuery(String_filterObj, AllTypesParameter, alltypes, new String("abcde"), true, 2);
-        run_StringQuery(String_filterVal1, null, null, new String("Java"), false, 4);
-        run_StringQuery(String_filterVal2, null, null, new String(""), false, 0);
+        run_StringQuery(String_filterL, StringParameter, "JDO", "JDO", true, 8);
+        run_StringQuery(String_filterR, StringParameter, "JDBC", "JDBC", false, 1);
+        alltypes.setString("abcde");
+        run_StringQuery(String_filterObj, AllTypesParameter, alltypes, "abcde", true, 2);
+        run_StringQuery(String_filterVal1, null, null, "Java", false, 4);
+        run_StringQuery(String_filterVal2, null, null, "", false, 0);
 
         BigDecimal bd = new BigDecimal("100.0");
         run_BigDecimalQuery(BigDecimal_filterL, BigDecimalParameter, bd, bd, true, 4);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java
index 25cd4c74..fb22ed5b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java
@@ -703,12 +703,12 @@ public class LessThanOrEqual extends ComparisonTests {
         run_DoubleQuery(Double_filterObj, AllTypesParameter, alltypes, Double.valueOf(-999999999999.0), true, 9);
         run_DoubleQuery(Double_filterVal, null, null, Double.valueOf(100.0), false, 6);
 
-        run_StringQuery(String_filterL, StringParameter, new String("JDO"), new String("JDO"), true, 9);
-        run_StringQuery(String_filterR, StringParameter, new String("JDBC"), new String("JDBC"), false, 1);
-        alltypes.setString(new String("abcde"));
-        run_StringQuery(String_filterObj, AllTypesParameter, alltypes, new String("abcde"), true, 3);
-        run_StringQuery(String_filterVal1, null, null, new String("Java"), false, 6);
-        run_StringQuery(String_filterVal2, null, null, new String(""), false, 1);
+        run_StringQuery(String_filterL, StringParameter, "JDO", "JDO", true, 9);
+        run_StringQuery(String_filterR, StringParameter, "JDBC", "JDBC", false, 1);
+        alltypes.setString("abcde");
+        run_StringQuery(String_filterObj, AllTypesParameter, alltypes, "abcde", true, 3);
+        run_StringQuery(String_filterVal1, null, null, "Java", false, 6);
+        run_StringQuery(String_filterVal2, null, null, "", false, 1);
 
         BigDecimal bd = new BigDecimal("100.0");
         run_BigDecimalQuery(BigDecimal_filterL, BigDecimalParameter, bd, bd, true, 6);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java
index 8cfbc134..64025415 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java
@@ -742,12 +742,12 @@ public class NotEquals extends ComparisonTests {
         run_DoubleQuery(Double_filterObj, AllTypesParameter, alltypes, Double.valueOf(0.0), 9);
         run_DoubleQuery(Double_filterVal, null, null, Double.valueOf(100.0), 8);
 
-        run_StringQuery(String_filterL, StringParameter, new String("JDO"), new String("JDO"), 9);
-        run_StringQuery(String_filterR, StringParameter, new String("JDBC"), new String("JDBC"), 10);
-        alltypes.setString(new String("abcde"));
-        run_StringQuery(String_filterObj, AllTypesParameter, alltypes, new String("abcde"), 9);
-        run_StringQuery(String_filterVal1, null, null, new String("Java"), 8);
-        run_StringQuery(String_filterVal2, null, null, new String(""), 9);
+        run_StringQuery(String_filterL, StringParameter, "JDO", "JDO", 9);
+        run_StringQuery(String_filterR, StringParameter, "JDBC", "JDBC", 10);
+        alltypes.setString("abcde");
+        run_StringQuery(String_filterObj, AllTypesParameter, alltypes, "abcde", 9);
+        run_StringQuery(String_filterVal1, null, null, "Java", 8);
+        run_StringQuery(String_filterVal2, null, null, "", 9);
 
         run_LocaleQuery(Locale_filterL, LocaleParameter, Locale.CANADA_FRENCH, Locale.CANADA_FRENCH, 10);
         run_LocaleQuery(Locale_filterR, LocaleParameter, Locale.US, Locale.US, 9);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java b/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java
index 76e0ff8d..20789f0e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java
@@ -118,10 +118,10 @@ public class ExecuteWithMap extends QueryTest {
         illegalMapStartsWithZero.put(Integer.valueOf(2), "emp2Middle");
         illegalMapStartsWithZero.put(Integer.valueOf(3), "New York");
 
-        illegalMapStringKeys.put(new String("1dog"), "emp2First");
-        illegalMapStringKeys.put(new String("2dog"), "emp2Last");
-        illegalMapStringKeys.put(new String("3dog"), "emp2Middle");
-        illegalMapStringKeys.put(new String("4dog"), "New York");
+        illegalMapStringKeys.put("1dog", "emp2First");
+        illegalMapStringKeys.put("2dog", "emp2Last");
+        illegalMapStringKeys.put("3dog", "emp2Middle");
+        illegalMapStringKeys.put("4dog", "New York");
     };
     private static final Map<Object, Object>[] parameterMap = new Map[]{hm1, hm2, hm3, hm4};
             


[db-jdo] 05/05: JDO-817 removing compiler warnings: unnecessary interface modifier, unnecessary semicoln

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mbo pushed a commit to branch tck-compiler-warnings
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit 87263fb4d9288202af449b3ed1a50a6a0071775e
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sun Jul 10 14:57:40 2022 +0200

    JDO-817 removing compiler warnings: unnecessary interface modifier, unnecessary semicoln
---
 .../tck/api/persistencemanager/DataStoreConnection.java  |  2 +-
 .../jdo/tck/api/persistencemanager/GetProperties.java    |  8 +++++---
 .../cache/EvictAllWithNoParameters.java                  |  4 ++--
 .../cache/EvictingCollectionOfInstancesSideEffects.java  |  8 ++++----
 .../GetObjectByIdNoValidationInstanceNotInCache.java     |  2 +-
 ...TransactionalANontransactionalPersistentInstance.java |  6 +++---
 .../nullargs/DeletePersistentNullArgs.java               |  2 +-
 .../persistencemanager/nullargs/DetachCopyNullArgs.java  |  2 +-
 .../api/persistencemanager/nullargs/EvictNullArgs.java   |  2 +-
 .../nullargs/MakeNontransactionalNullArgs.java           |  2 +-
 .../nullargs/MakePersistentNullArgs.java                 |  2 +-
 .../nullargs/MakeTransactionalNullArgs.java              |  2 +-
 .../nullargs/MakeTransientNullArgs.java                  |  2 +-
 .../api/persistencemanager/nullargs/RefreshNullArgs.java |  2 +-
 .../persistencemanager/nullargs/RetrieveNullArgs.java    |  2 +-
 .../nullargs/RetrieveWithFetchPlanNullArgs.java          |  2 +-
 .../jdo/tck/pc/company/CompanyFactoryNewInstance.java    | 16 ++++++++--------
 .../org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java    |  5 +++--
 .../org/apache/jdo/tck/pc/fieldtypes/SimpleEnum.java     |  2 +-
 .../apache/jdo/tck/pc/fieldtypes/SimpleInterface.java    |  8 ++++----
 .../query/jdoql/methods/SupportedOptionalMethods.java    |  3 ++-
 .../org/apache/jdo/tck/query/sql/ExecuteWithMap.java     |  3 ++-
 .../main/java/org/apache/jdo/tck/util/DeepEquality.java  |  2 +-
 23 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java
index 61d8583f..37147979 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java
@@ -111,7 +111,7 @@ public class DataStoreConnection extends PersistenceManagerTest {
             if (conn.getAutoCommit()) {
                 appendMessage(ASSERTION_FAILED + 
                         "Autocommit must not be true in JDO connection.");
-            };
+            }
             PreparedStatement ps = conn.prepareStatement(sql);
             ResultSet rs = ps.executeQuery();
             Collection<PCPoint> actuals = new HashSet<>();
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java
index 60bda7f0..bc92d9c3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java
@@ -132,8 +132,10 @@ public class GetProperties extends JDO_Test implements Constants {
         AbstractNonAPITestProperty(String propertyName, Object testValue1, Object testValue2) {
             super(propertyName, testValue1, testValue2);
         }
-        public Object get(PersistenceManager pm) {throw new RuntimeException("not implemented");};
-        public void set(PersistenceManager pm, Object value) {throw new RuntimeException("not implemented");};
+        public Object get(PersistenceManager pm) {throw new RuntimeException("not implemented");}
+
+        public void set(PersistenceManager pm, Object value) {throw new RuntimeException("not implemented");}
+
         public void test(PersistenceManager pm, Set<String> supportedProperties) {
             Object result0 = pm.getProperties().get(propertyName);
             errorIfEqual(this.messageForNullResult + "getProperties().get(" + propertyName + ")", null, result0);
@@ -173,7 +175,7 @@ public class GetProperties extends JDO_Test implements Constants {
             errorIfNotEqual(this.messageForWrongResultAfterSet + "after pm.setXXX(), getProperties.get(" + propertyName + ")",
                     testValue2, result2);
         }
-    };
+    }
 
     private final TestProperty testCopyOnAttach =
            new AbstractAPITestProperty(PROPERTY_COPY_ON_ATTACH, true, false) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictAllWithNoParameters.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictAllWithNoParameters.java
index c9020ad6..63032c59 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictAllWithNoParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictAllWithNoParameters.java
@@ -119,7 +119,7 @@ public class EvictAllWithNoParameters extends PersistenceManagerTest {
 
             if ( testState(p1, HOLLOW, "hollow") ||
                  testState(p1, PERSISTENT_NONTRANSACTIONAL, "persistent_nontransaction")) {
-                ;  // expected result
+                // expected result
             } 
             else {
                 fail(ASSERTION_FAILED,
@@ -128,7 +128,7 @@ public class EvictAllWithNoParameters extends PersistenceManagerTest {
 
             if ( testState(pnt1, HOLLOW, "hollow") ||
                  testState(pnt1, PERSISTENT_NONTRANSACTIONAL, "persistent_nontransaction")) {
-                ;  // expected result
+                // expected result
             } 
             else {
                 fail(ASSERTION_FAILED,
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java
index 24d5dbdd..7aa4f568 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java
@@ -145,7 +145,7 @@ public class EvictingCollectionOfInstancesSideEffects extends PersistenceManager
 
             if ( testState(p1, HOLLOW, "hollow")  ||
                  testState(p1, PERSISTENT_NONTRANSACTIONAL, "persistent_nontransactional"))  {
-                ; // expected result
+                // expected result
             } 
             else { 
                 fail(ASSERTION_FAILED,
@@ -154,7 +154,7 @@ public class EvictingCollectionOfInstancesSideEffects extends PersistenceManager
 
             if ( testState(pnt1, HOLLOW, "hollow")  ||
                  testState(pnt1, PERSISTENT_NONTRANSACTIONAL, "persistent_nontransactional"))  {
-                ; // expected result
+                // expected result
             } else {
                 fail(ASSERTION_FAILED,
                      "pnt1 should be HOLLOW or P-NONTX after pm.evictAll(Collection).");
@@ -191,7 +191,7 @@ public class EvictingCollectionOfInstancesSideEffects extends PersistenceManager
 
             if ( testState(p2, HOLLOW, "hollow")  ||
                  testState(p2, PERSISTENT_NONTRANSACTIONAL, "persistent_nontransactional"))  {
-                ; // expected result
+                // expected result
             } else {
                 fail(ASSERTION_FAILED,
                      "p2 should be HOLLOW or P-NONTX after pm.evictAll(Object[]).");
@@ -199,7 +199,7 @@ public class EvictingCollectionOfInstancesSideEffects extends PersistenceManager
 
             if ( testState(pnt2, HOLLOW, "hollow")  ||
                  testState(pnt2, PERSISTENT_NONTRANSACTIONAL, "persistent_nontransactional"))  {
-                ; // expected result
+                // expected result
             } else {
                 fail(ASSERTION_FAILED,
                      "pnt2 should be HOLLOW or P-NONTX after pm.evictAll(Object[]).");
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInCache.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInCache.java
index abac27e3..06295610 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInCache.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInCache.java
@@ -69,7 +69,7 @@ public class GetObjectByIdNoValidationInstanceNotInCache extends PersistenceMana
             if ( curr == HOLLOW ||
                  curr == PERSISTENT_NONTRANSACTIONAL ||
                  curr == PERSISTENT_CLEAN ) {
-                ; // expected result
+                // expected result
             } 
             else {
                 fail(ASSERTION_FAILED,
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalANontransactionalPersistentInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalANontransactionalPersistentInstance.java
index f7fa4220..5f1ef056 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalANontransactionalPersistentInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalANontransactionalPersistentInstance.java
@@ -159,7 +159,7 @@ public class MakeTransactionalANontransactionalPersistentInstance extends Persis
             tx.begin();
 
             if (makePersistentNonTranInstance(p1)) {
-                ; // expected result
+                // expected result
             }
             tx.commit();
             tx = null;
@@ -218,7 +218,7 @@ public class MakeTransactionalANontransactionalPersistentInstance extends Persis
             if ( makePersistentNonTranInstance(p2) &&
                  makePersistentNonTranInstance(p3) &&
                  makePersistentNonTranInstance(p4)) {
-                ;  // expected result
+                // expected result
             }
             tx.commit();
 
@@ -278,7 +278,7 @@ public class MakeTransactionalANontransactionalPersistentInstance extends Persis
             if ( makePersistentNonTranInstance(p5) &&
                  makePersistentNonTranInstance(p6) &&
                  makePersistentNonTranInstance(p7)) {
-                ;  // expected result
+                // expected result
             }
             tx.commit();
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DeletePersistentNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DeletePersistentNullArgs.java
index 3f9b9a0e..21beefc3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DeletePersistentNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DeletePersistentNullArgs.java
@@ -61,7 +61,7 @@ public class DeletePersistentNullArgs extends PersistenceManagerNullsTest {
         public void pmApi(PersistenceManager pm, Object[] pcs) {
             pm.deletePersistentAll(pcs);
         }
-    };
+    }
 
     /** 
      * Test that deletePersistent() with null valued argument does nothing.
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DetachCopyNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DetachCopyNullArgs.java
index 525d7a22..013b7ddd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DetachCopyNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DetachCopyNullArgs.java
@@ -60,7 +60,7 @@ public class DetachCopyNullArgs extends PersistenceManagerNullsTest {
         public Object[] pmApiReturn(PersistenceManager pm, Object[] pcs) {
             return pm.detachCopyAll(pcs);
         }
-    };
+    }
 
     /** 
      * Test that detachCopy() with null valued argument does nothing.
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/EvictNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/EvictNullArgs.java
index aa095ab5..8b23a499 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/EvictNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/EvictNullArgs.java
@@ -61,7 +61,7 @@ public class EvictNullArgs extends PersistenceManagerNullsTest {
         public void pmApi(PersistenceManager pm, Object[] pcs) {
             pm.evictAll(pcs);
         }
-    };
+    }
 
     /** 
      * Test that evict() with null valued argument does nothing.
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeNontransactionalNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeNontransactionalNullArgs.java
index 4e9b5569..27e9ddb8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeNontransactionalNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeNontransactionalNullArgs.java
@@ -61,7 +61,7 @@ public class MakeNontransactionalNullArgs extends PersistenceManagerNullsTest {
         public void pmApi(PersistenceManager pm, Object[] pcs) {
             pm.makeNontransactionalAll(pcs);
         }
-    };
+    }
 
     /** 
      * Test that makeNontransactional() with null valued argument does nothing.
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakePersistentNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakePersistentNullArgs.java
index bd354f4d..2ca468af 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakePersistentNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakePersistentNullArgs.java
@@ -60,7 +60,7 @@ public class MakePersistentNullArgs extends PersistenceManagerNullsTest {
         public Object[] pmApiReturn(PersistenceManager pm, Object[] pcs) {
             return pm.makePersistentAll(pcs);
         }
-    };
+    }
 
     /** 
      * Test that makePersistent() with null valued argument does nothing.
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransactionalNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransactionalNullArgs.java
index 65da3175..27a59657 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransactionalNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransactionalNullArgs.java
@@ -61,7 +61,7 @@ public class MakeTransactionalNullArgs extends PersistenceManagerNullsTest {
         public void pmApi(PersistenceManager pm, Object[] pcs) {
             pm.makeTransactionalAll(pcs);
         }
-    };
+    }
 
     /** 
      * Test that makeTransactional() with null valued argument does nothing.
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransientNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransientNullArgs.java
index 016d0449..005caa79 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransientNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransientNullArgs.java
@@ -61,7 +61,7 @@ public class MakeTransientNullArgs extends PersistenceManagerNullsTest {
         public void pmApi(PersistenceManager pm, Object[] pcs) {
             pm.makeTransientAll(pcs);
         }
-    };
+    }
 
     /** 
      * Test that makeTransient() with null valued argument does nothing.
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RefreshNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RefreshNullArgs.java
index d8d5a678..e0b419da 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RefreshNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RefreshNullArgs.java
@@ -61,7 +61,7 @@ public class RefreshNullArgs extends PersistenceManagerNullsTest {
         public void pmApi(PersistenceManager pm, Object[] pcs) {
             pm.refreshAll(pcs);
         }
-    };
+    }
 
     /** 
      * Test that refresh() with null valued argument does nothing.
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveNullArgs.java
index bdbd3806..d380d0c3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveNullArgs.java
@@ -61,7 +61,7 @@ public class RetrieveNullArgs extends PersistenceManagerNullsTest {
         public void pmApi(PersistenceManager pm, Object[] pcs) {
             pm.retrieveAll(pcs);
         }
-    };
+    }
 
     /** 
      * Test that retrieve() with null valued argument does nothing.
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveWithFetchPlanNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveWithFetchPlanNullArgs.java
index 7b135d09..cfd63289 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveWithFetchPlanNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveWithFetchPlanNullArgs.java
@@ -60,7 +60,7 @@ public class RetrieveWithFetchPlanNullArgs extends PersistenceManagerNullsTest {
         public void pmApi(PersistenceManager pm, Object[] pcs) {
             pm.retrieveAll(false, pcs);
         }
-    };
+    }
 
     /** 
      * Test that retrieveWithFetchPlan() with null valued argument does nothing.
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java
index 49e6c57c..4d5610c5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java
@@ -23,13 +23,13 @@ package org.apache.jdo.tck.pc.company;
 public interface CompanyFactoryNewInstance {
 
     abstract public IAddress newAddress();
-    abstract public IMeetingRoom newMeetingRoom();
-    abstract public ICompany newCompany();
-    abstract public IDentalInsurance newDentalInsurance();
-    abstract public IDepartment newDepartment();
-    abstract public IFullTimeEmployee newFullTimeEmployee();
-    abstract public IMedicalInsurance newMedicalInsurance();
-    abstract public IPartTimeEmployee newPartTimeEmployee();
-    abstract public IProject newProject();
+    IMeetingRoom newMeetingRoom();
+    ICompany newCompany();
+    IDentalInsurance newDentalInsurance();
+    IDepartment newDepartment();
+    IFullTimeEmployee newFullTimeEmployee();
+    IMedicalInsurance newMedicalInsurance();
+    IPartTimeEmployee newPartTimeEmployee();
+    IProject newProject();
     Class<?>[] getTearDownClasses();
 }
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
index 1f3349d0..0f77f559 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
@@ -33,8 +33,9 @@ public class SimpleClass implements Serializable, SimpleInterface, Comparable<Si
     private long id = newId();
   private int intField=0;
   private String stringField = "Test";
-  public SimpleClass(){};
-  public SimpleClass(int intField, String stringField)
+  public SimpleClass(){}
+
+    public SimpleClass(int intField, String stringField)
   {
     this.intField = intField;
     this.stringField = stringField;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleEnum.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleEnum.java
index eeb1e641..c2ec4618 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleEnum.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleEnum.java
@@ -89,7 +89,7 @@ WY("WYOMING");
     
     public String toString() {
         return sname;
-    };
+    }
 
     public static class Oid implements Serializable, Comparable<Oid> {
         public long id;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleInterface.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleInterface.java
index eba2028a..a12fc050 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleInterface.java
@@ -21,12 +21,12 @@ package org.apache.jdo.tck.pc.fieldtypes;
 
 public interface SimpleInterface
 {
-  public void setIntValue(int intField);
+  void setIntValue(int intField);
 
-  public int getIntValue();
+  int getIntValue();
 
-  public void setStringValue(String stringField);
+  void setStringValue(String stringField);
 
-  public String getStringValue();
+  String getStringValue();
 
 }
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedOptionalMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedOptionalMethods.java
index 24d4976a..05d69130 100755
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedOptionalMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedOptionalMethods.java
@@ -420,7 +420,8 @@ public class SupportedOptionalMethods extends QueryTest {
     public static class ResultInfo {
         public long id;
         public String optionalString;
-        public ResultInfo() {};
+        public ResultInfo() {}
+
         public ResultInfo(long id, String optionalString) {
             this.id = id;
             this.optionalString = optionalString;
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java b/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java
index 20789f0e..c18cc246 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java
@@ -122,7 +122,8 @@ public class ExecuteWithMap extends QueryTest {
         illegalMapStringKeys.put("2dog", "emp2Last");
         illegalMapStringKeys.put("3dog", "emp2Middle");
         illegalMapStringKeys.put("4dog", "New York");
-    };
+    }
+
     private static final Map<Object, Object>[] parameterMap = new Map[]{hm1, hm2, hm3, hm4};
             
     /** */
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/DeepEquality.java b/tck/src/main/java/org/apache/jdo/tck/util/DeepEquality.java
index 33cf8c44..5c617266 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/DeepEquality.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/DeepEquality.java
@@ -68,6 +68,6 @@ public interface DeepEquality {
      * @throws ClassCastException if the specified instances' type prevents
      * it from being compared to this instance. 
      */
-    public boolean deepCompareFields(Object other, EqualityHelper helper);
+    boolean deepCompareFields(Object other, EqualityHelper helper);
     
 }