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/16 22:47:19 UTC

[db-jdo] 03/07: JDO-817 removing compiler warnings: unchecked assignment / cast

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 8e8be2a18babcc900c94af03d6b80685545b11a4
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sat Jul 16 23:41:39 2022 +0200

    JDO-817 removing compiler warnings: unchecked assignment / cast
---
 .../org/apache/jdo/tck/AbstractReaderTest.java     |  1 +
 .../jdo/tck/api/fetchgroup/FetchGroupTest.java     |  8 +++++
 .../cache/RefreshAllSideEffects.java               |  1 +
 .../fetchplan/AbstractFetchPlanTest.java           |  1 +
 .../fetchplan/FetchPlanInterface.java              |  9 ++++++
 .../getobject/GetObjectsById.java                  |  3 ++
 .../AfterCloseSetMethodsThrowException.java        |  1 +
 .../TestHashMapStringValueCollections.java         |  4 +--
 .../TestHashtableStringValueCollections.java       |  4 +--
 .../fieldtypes/TestMapStringValueCollections.java  |  4 +--
 .../TestTreeMapStringValueCollections.java         |  4 +--
 .../jdo/tck/pc/company/CompanyModelReader.java     |  1 +
 .../companyListWithoutJoin/CompanyModelReader.java |  1 +
 .../companyMapWithoutJoin/CompanyModelReader.java  |  1 +
 .../org/apache/jdo/tck/pc/mylib/MylibReader.java   |  1 +
 .../apache/jdo/tck/pc/order/OrderModelReader.java  |  1 +
 .../apache/jdo/tck/query/QueryElementHolder.java   |  1 +
 .../java/org/apache/jdo/tck/query/QueryTest.java   |  3 ++
 .../apache/jdo/tck/query/api/AutoCloseable.java    |  8 ++---
 .../org/apache/jdo/tck/query/api/ChangeQuery.java  |  1 +
 .../org/apache/jdo/tck/query/api/GetFetchPlan.java |  2 ++
 ...sistenceManagerFromRestoredSerializedQuery.java |  1 +
 ...ryFromExistingQueryBoundToPMFromSameVendor.java |  2 ++
 .../api/NewQueryFromRestoredSerializedQuery.java   |  1 +
 .../api/NewQueryWithSpecifiedLanguageAndQuery.java |  1 +
 .../org/apache/jdo/tck/query/api/QueryCancel.java  |  2 ++
 .../apache/jdo/tck/query/api/QueryExtentions.java  |  1 +
 .../apache/jdo/tck/query/api/SampleQueries.java    | 37 ++++++++++++++++++++++
 .../apache/jdo/tck/query/api/SaveAsNamedQuery.java |  1 +
 .../jdo/tck/query/api/SingleStringQuery.java       |  1 +
 .../jdo/tck/query/api/UnmodifiableQuery.java       |  5 ++-
 .../jdo/tck/query/delete/DeletePersistentAll.java  |  3 ++
 .../java/org/apache/jdo/tck/query/jdoql/Cast.java  |  1 +
 .../tck/query/jdoql/DenoteUniquenessInFilter.java  |  3 ++
 .../query/jdoql/IdentifiersEqualFieldNames.java    |  3 ++
 .../jdoql/NavigationThroughACollectionField.java   |  1 +
 .../jdoql/NavigationThroughANullValuedField.java   |  2 ++
 .../jdoql/NullCollectionsAndContainsMethod.java    |  2 ++
 .../jdo/tck/query/jdoql/QueryIsSerializable.java   |  1 +
 ...ializedQueryInstanceLosesAssociationWithPM.java |  1 +
 .../query/jdoql/SeparateNamespaceForTypeNames.java |  1 +
 .../jdoql/methods/SupportedCollectionMethods.java  |  2 ++
 .../jdoql/methods/SupportedJDOHelperMethods.java   |  1 +
 .../query/jdoql/methods/SupportedListMethods.java  |  1 +
 .../query/jdoql/methods/SupportedMapMethods.java   |  4 +++
 .../parameters/DomainObjectsAsParameters.java      |  9 ++++++
 .../query/jdoql/parameters/OrderOfParameters.java  |  1 +
 ...eclaredWithSameNameAsFieldOfCandidateClass.java |  3 +-
 .../jdoql/subqueries/CorrelatedSubqueries.java     |  1 +
 .../query/jdoql/variables/VariablesAndFields.java  |  7 ++++
 .../apache/jdo/tck/query/result/IfElseResult.java  |  2 ++
 .../jdo/tck/query/result/MethodsInResult.java      |  1 +
 .../jdo/tck/query/result/NPEInResultExpr.java      |  1 +
 .../jdo/tck/query/result/ResultExpressions.java    |  4 +++
 .../org/apache/jdo/tck/query/result/Unique.java    |  1 +
 .../jdo/tck/query/result/VariableInResult.java     |  5 +++
 .../result/VariableInResultMultipleNavigation.java |  3 ++
 .../query/result/VariableInResultNavigation.java   |  5 +++
 .../apache/jdo/tck/query/sql/ExecuteWithMap.java   |  4 +++
 .../apache/jdo/tck/query/sql/ShapeOfResult.java    |  1 +
 .../org/apache/jdo/tck/util/BatchTestRunner.java   |  1 +
 .../org/apache/jdo/tck/util/ConversionHelper.java  |  2 ++
 .../org/apache/jdo/tck/util/EqualityHelper.java    |  9 ++++++
 63 files changed, 183 insertions(+), 15 deletions(-)

diff --git a/tck/src/main/java/org/apache/jdo/tck/AbstractReaderTest.java b/tck/src/main/java/org/apache/jdo/tck/AbstractReaderTest.java
index 1b1714a7..4c64bbc3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/AbstractReaderTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/AbstractReaderTest.java
@@ -78,6 +78,7 @@ public class AbstractReaderTest extends JDO_Test {
      * @param factory the bean factory
      * @return the List of objects
      */
+    @SuppressWarnings("unchecked")
     protected List<Object> getRootList(DefaultListableBeanFactory factory) {
         return (List<Object>) getBean(factory, ROOT_NAME);
     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/fetchgroup/FetchGroupTest.java b/tck/src/main/java/org/apache/jdo/tck/api/fetchgroup/FetchGroupTest.java
index 5a1c43ec..e16498b3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/fetchgroup/FetchGroupTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/fetchgroup/FetchGroupTest.java
@@ -123,6 +123,7 @@ public class FetchGroupTest extends JDO_Test {
         getPM(); // initialize pmf and pm fields
     }
 
+    @SuppressWarnings("unchecked")
     public void testPMFGetFetchGroup() {
         allPMFFetchGroups = pmf.getFetchGroups();
         Map<String , FetchGroup> unscopedFetchGroupMap = new HashMap<>();
@@ -234,6 +235,7 @@ public class FetchGroupTest extends JDO_Test {
         failOnError();
     }
 
+    @SuppressWarnings("unchecked")
     public void testRemoveCategory() {
         FetchGroup fg = pm.getFetchGroup(Employee.class, "testRemoveCategory");
         Set<String> expectedSet = new HashSet<>();
@@ -247,6 +249,7 @@ public class FetchGroupTest extends JDO_Test {
                 expectedSet, members);        
     }
 
+    @SuppressWarnings("unchecked")
     public void testAddMember() {
         FetchGroup fg = pm.getFetchGroup(Employee.class, "testAddMember");
         for (int i = 0; i < allMembers.length; ++i) {
@@ -262,6 +265,7 @@ public class FetchGroupTest extends JDO_Test {
         }
     }
 
+    @SuppressWarnings("unchecked")
     public void testAddMembers() {
         FetchGroup fg = pm.getFetchGroup(Employee.class, "testAddMembers");
         fg.addMembers(multivaluedMembers);
@@ -273,6 +277,7 @@ public class FetchGroupTest extends JDO_Test {
                 expectedSet, members);
     }
 
+    @SuppressWarnings("unchecked")
     public void testRemoveMembers() {
         FetchGroup fg = pm.getFetchGroup(Employee.class, "testRemoveMembers");
         fg.addMembers(allMembers);
@@ -292,6 +297,7 @@ public class FetchGroupTest extends JDO_Test {
                 expectedSet, members);
     }
 
+    @SuppressWarnings("unchecked")
     public void testRemoveMember() {
         FetchGroup fg = pm.getFetchGroup(Employee.class, "testRemoveMember");
         fg.addCategory(FetchGroup.ALL);
@@ -521,6 +527,7 @@ public class FetchGroupTest extends JDO_Test {
         }
     }
 
+    @SuppressWarnings("unchecked")
     private void checkAddCategory(Class<?> cls, String category, String[] expected) {
         FetchGroup fg = pm.getFetchGroup(cls, "test" + count() + category);
         Set<String> expectedSet = new HashSet<>();
@@ -538,6 +545,7 @@ public class FetchGroupTest extends JDO_Test {
         }
     }
 
+    @SuppressWarnings("unchecked")
     private String printFetchGroup(FetchGroup fg) {
         StringBuffer sb = new StringBuffer("FetchGroup (");
         sb.append(fg.getType().isInterface()?"interface: ":"class: ");
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java
index 72d6bc8d..6d9dd711 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java
@@ -127,6 +127,7 @@ public class RefreshAllSideEffects extends PersistenceManagerTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     private void runTestRefreshAllSideEffects(boolean doRefresh) {
 
         if (debug) logger.debug ("\nSTART RefreshAllSideEffects");
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/AbstractFetchPlanTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/AbstractFetchPlanTest.java
index a2391875..0fb67b37 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/AbstractFetchPlanTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/AbstractFetchPlanTest.java
@@ -147,6 +147,7 @@ public class AbstractFetchPlanTest extends JDO_Test {
      * @param fetchPlan fetch plan
      * @param groups groups
      */
+    @SuppressWarnings("unchecked")
     protected void checkGroups(String location,
             FetchPlan fetchPlan, String[] groups) {
         Collection<String> expected = new HashSet<>();
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanInterface.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanInterface.java
index 38f57e39..705aefab 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanInterface.java
@@ -228,6 +228,7 @@ public class FetchPlanInterface extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void checkDefaultGroups() {
         Set<String> expectedGroups = new HashSet<>();
         expectedGroups.add("default");
@@ -243,6 +244,7 @@ public class FetchPlanInterface extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void checkClearGroups() {
         Set<String> expectedGroups = new HashSet<>();
         FetchPlan fp = getPM().getFetchPlan();
@@ -258,6 +260,7 @@ public class FetchPlanInterface extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void checkSetGroup() {
         Set<String> expectedGroups = new HashSet<>();
         expectedGroups.add("group1");
@@ -274,6 +277,7 @@ public class FetchPlanInterface extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void checkAddGroup() {
         Set<String> expectedGroups = new HashSet<>();
         expectedGroups.add("default");
@@ -291,6 +295,7 @@ public class FetchPlanInterface extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void checkRemoveGroup() {
         Set<String> expectedGroups = new HashSet<>();
         FetchPlan fp = getPM().getFetchPlan();
@@ -306,6 +311,7 @@ public class FetchPlanInterface extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void checkSetGroupsCollection() {
         Set<String> expectedGroups = new HashSet<>();
         expectedGroups.add("default");
@@ -324,6 +330,7 @@ public class FetchPlanInterface extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void checkSetGroupsArray() {
         Set<String> expectedGroups = new HashSet<>();
         expectedGroups.add("default");
@@ -342,6 +349,7 @@ public class FetchPlanInterface extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     protected void checkGetDetachmentRoots() {
         Set<String> expectedRoots = new HashSet<>();
         FetchPlan fp = getPM().getFetchPlan();
@@ -356,6 +364,7 @@ public class FetchPlanInterface extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     protected void checkSetDetachmentRoots() {
         PCPoint p = new PCPoint(10, 20);
         Set<PCPoint> expectedRoots = new HashSet<>();
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectsById.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectsById.java
index 27d75ff6..9d006047 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectsById.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectsById.java
@@ -113,6 +113,7 @@ public class GetObjectsById extends JDO_Test {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testCollection() {
         getPM().currentTransaction().begin();
         Collection<PCPoint> result = pm.getObjectsById(oidCollection);
@@ -123,6 +124,7 @@ public class GetObjectsById extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testCollectionTrue() {
         getPM().currentTransaction().begin();
         Collection<PCPoint> result = pm.getObjectsById(oidCollection, true);
@@ -134,6 +136,7 @@ public class GetObjectsById extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testCollectionFalse() {
         getPM().currentTransaction().begin();
         Collection<PCPoint> result = pm.getObjectsById(oidCollection, false);
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java
index 74bb0ee5..c2fa2b2a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java
@@ -65,6 +65,7 @@ public class AfterCloseSetMethodsThrowException extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void test() {
         Class<String>[] stringParameters = new Class[]{String.class};
         Class<Boolean>[] booleanParameters = new Class[]{boolean.class};
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java
index 9dde439d..6524b879 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java
@@ -153,6 +153,7 @@ public class TestHashMapStringValueCollections extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     private void checkValues(Object oid,
             HashMapStringValueCollections expectedValue)
     {
@@ -186,8 +187,7 @@ public class TestHashMapStringValueCollections extends JDO_Test {
                         } else {
                             String expectedVal = (String) expected.get(expectedKey);
                             String actualValue = (String)
-                                    actual.get(TestUtil.getBigDecimalKey(expectedKey,
-                                            actualKeySet));
+                                    actual.get(TestUtil.getBigDecimalKey(expectedKey, actualKeySet));
                             if (!expectedVal.equals(actualValue)) {
                                 sbuf.append("\nFor element " + i +
                                         " expected value = " + expectedVal +
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java
index 6f3b0918..f5dca243 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java
@@ -152,6 +152,7 @@ public class TestHashtableStringValueCollections extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     private void checkValues(Object oid,
             HashtableStringValueCollections expectedValue)
     {
@@ -185,8 +186,7 @@ public class TestHashtableStringValueCollections extends JDO_Test {
                         } else {
                             String expectedVal = (String) expected.get(expectedKey);
                             String actualValue = (String)
-                                    actual.get(TestUtil.getBigDecimalKey(expectedKey,
-                                            actualKeySet));
+                                    actual.get(TestUtil.getBigDecimalKey(expectedKey, actualKeySet));
                             if (!expectedVal.equals(actualValue)) {
                                 sbuf.append("\nFor element " + i +
                                         " expected value = " + expectedVal +
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java
index 75b1b7c1..afa0c08e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java
@@ -157,6 +157,7 @@ public class TestMapStringValueCollections extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     private void checkValues(Object oid,
             MapStringValueCollections expectedValue)
     {
@@ -190,8 +191,7 @@ public class TestMapStringValueCollections extends JDO_Test {
                         } else {
                             String expectedVal = (String) expected.get(expectedKey);
                             String actualValue = (String)
-                                    actual.get(TestUtil.getBigDecimalKey(expectedKey,
-                                            actualKeySet));
+                                    actual.get(TestUtil.getBigDecimalKey(expectedKey, actualKeySet));
                             if (!expectedVal.equals(actualValue)) {
                                 sbuf.append("\nFor element " + i +
                                         " expected value = " + expectedVal +
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java
index 54455b2d..5c3ac81f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java
@@ -150,6 +150,7 @@ public class TestTreeMapStringValueCollections extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     private void checkValues(Object oid,
             TreeMapStringValueCollections expectedValue)
     {
@@ -183,8 +184,7 @@ public class TestTreeMapStringValueCollections extends JDO_Test {
                         } else {
                             String expectedVal = (String) expected.get(expectedKey);
                             String actualValue = (String)
-                                    actual.get(TestUtil.getBigDecimalKey(expectedKey,
-                                            actualKeySet));
+                                    actual.get(TestUtil.getBigDecimalKey(expectedKey, actualKeySet));
                             if (!expectedVal.equals(actualValue)) {
                                 sbuf.append("\nFor element " + i +
                                         " expected value = " + expectedVal +
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java
index eaa2f92b..5843ed48 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java
@@ -74,6 +74,7 @@ public class CompanyModelReader extends DefaultListableBeanFactory {
      * called "root" of type list in the xml and returns it.
      * @return a list of root instances
      */
+    @SuppressWarnings("unchecked")
     public List<Object> getRootList() {
         return (List<Object>)getBean(ROOT_LIST_NAME);
     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java
index ff7528b0..06e24c6f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java
@@ -74,6 +74,7 @@ public class CompanyModelReader extends DefaultListableBeanFactory {
      * called "root" of type list in the xml and returns it.
      * @return a list of root instances
      */
+    @SuppressWarnings("unchecked")
     public List<Object> getRootList() {
         return (List<Object>)getBean(ROOT_LIST_NAME);
     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java
index 7e985579..42ae2ead 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java
@@ -74,6 +74,7 @@ public class CompanyModelReader extends DefaultListableBeanFactory {
      * called "root" of type list in the xml and returns it.
      * @return a list of root instances
      */
+    @SuppressWarnings("unchecked")
     public List<Object> getRootList() {
         return (List<Object>)getBean(ROOT_LIST_NAME);
     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java
index a8f21bb5..d55fa1bd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java
@@ -69,6 +69,7 @@ public class MylibReader extends DefaultListableBeanFactory {
      * called "root" of type list in the xml and returns it.
      * @return a list of root instances
      */
+    @SuppressWarnings("unchecked")
     public List<Object> getRootList() {
         return (List<Object>)getBean(ROOT_LIST_NAME);
     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderModelReader.java b/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderModelReader.java
index bcbb9d77..191c774f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderModelReader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderModelReader.java
@@ -73,6 +73,7 @@ public class OrderModelReader extends DefaultListableBeanFactory {
      * called "root" of type list in the xml and returns it.
      * @return a list of root instances
      */
+    @SuppressWarnings("unchecked")
     public List<Object> getRootList() {
         return (List<Object>)getBean(ROOT_LIST_NAME);
     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/QueryElementHolder.java b/tck/src/main/java/org/apache/jdo/tck/query/QueryElementHolder.java
index 8726d040..398ea12a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/QueryElementHolder.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/QueryElementHolder.java
@@ -239,6 +239,7 @@ public class QueryElementHolder<T> {
      * @param pm the persistence manager
      * @return the JDO query instance
      */
+    @SuppressWarnings("unchecked")
     public Query<T> getSingleStringQuery(PersistenceManager pm) {
         return pm.newQuery(toString());
     }
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 a5088217..b2131a32 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
@@ -1261,6 +1261,7 @@ public abstract class QueryTest extends AbstractReaderTest {
      * @param unique indicates, if the query is supposed 
      * to return a single result.
      */
+    @SuppressWarnings("unchecked")
     protected <T> void executeSQLQuery(String assertion, String sql,
             Class<T> candidateClass, Class<?> resultClass, boolean positive,
             Object parameters, Object expectedResult, boolean unique) {
@@ -1321,6 +1322,7 @@ public abstract class QueryTest extends AbstractReaderTest {
      * @param positive indicates if query execution is supposed to fail
      * @return the query result
      */
+    @SuppressWarnings("unchecked")
     private Object execute(String assertion, Query<?> query,
             String singleStringQuery, boolean hasOrdering,
             Object parameters, Object expectedResult, boolean positive) {
@@ -1507,6 +1509,7 @@ public abstract class QueryTest extends AbstractReaderTest {
      * @param parameters the parmaters of the query.
      * @param expectedNrOfDeletedObjects the expected number of deleted objects.
      */
+    @SuppressWarnings("unchecked")
     private void delete(String assertion, Query<?> query,
             String singleStringQuery, Object parameters, 
             long expectedNrOfDeletedObjects) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/AutoCloseable.java b/tck/src/main/java/org/apache/jdo/tck/query/api/AutoCloseable.java
index dd5613a1..f7a3b531 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/AutoCloseable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/AutoCloseable.java
@@ -74,7 +74,7 @@ public class AutoCloseable extends QueryTest {
             Iterator<PCPoint> iterator = null;
             try (Query<PCPoint> query1 = pm.newQuery(PCPoint.class)) {
                 query = query1;
-                queryResult = (List<PCPoint>) query1.execute();
+                queryResult = query1.executeList();
                 iterator = queryResult.iterator();
                 if (!iterator.hasNext()) {
                     fail(ASSERTION_FAILED, "(1) Iterator of open query result should have elements.");
@@ -130,7 +130,7 @@ public class AutoCloseable extends QueryTest {
                 // expected exception when accessing closed query result
             }
             // Check query instance is still usable
-            queryResult = (List<PCPoint>) query.execute();
+            queryResult = query.executeList();
             if (queryResult.isEmpty()) {
                 fail(ASSERTION_FAILED,
                         "(10) query instance should be usable and execution should return a non empty result.");
@@ -162,7 +162,7 @@ public class AutoCloseable extends QueryTest {
             Iterator<PCPoint> iterator = null;
             try (Query<PCPoint> query1 = pm.newQuery(PCPoint.class)) {
                 query = query1;
-                queryResult = (List<PCPoint>) query1.execute();
+                queryResult = query1.executeList();
                 iterator = queryResult.iterator();
                 if (!iterator.hasNext()) {
                     fail(ASSERTION_FAILED, "(1) Iterator of open query result should have elements.");
@@ -222,7 +222,7 @@ public class AutoCloseable extends QueryTest {
             }
 
             // Check query instance is still usable
-            queryResult = (List<PCPoint>) query.execute();
+            queryResult = query.executeList();
             if (queryResult.isEmpty()) {
                 fail(ASSERTION_FAILED,
                         "(10) query instance should be usable and execution should return a non empty result.");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/ChangeQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/ChangeQuery.java
index 46ba9ec0..afd8c416 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/ChangeQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/ChangeQuery.java
@@ -57,6 +57,7 @@ public class ChangeQuery extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive() {
         Query query = getPM().newNamedQuery(Person.class, "changeQuery");
         
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/GetFetchPlan.java b/tck/src/main/java/org/apache/jdo/tck/query/api/GetFetchPlan.java
index 400d4731..d48c41c9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/GetFetchPlan.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/GetFetchPlan.java
@@ -93,6 +93,7 @@ public class GetFetchPlan extends QueryTest {
      * assigned to fetchGroup1
      * @param query the query
      */
+    @SuppressWarnings("unchecked")
     private void checkFetchGroup1(Query<PCClass> query) {
         FetchPlan fetchplan = query.getFetchPlan();
         Collection<String> fetchgroups = fetchplan.getGroups();
@@ -110,6 +111,7 @@ public class GetFetchPlan extends QueryTest {
      * Finally, that fetch group is removed from the fetch plan again.
      * @param query the query
      */
+    @SuppressWarnings("unchecked")
     private void checkFetchGroup2(Query<PCClass> query) {
         FetchPlan fetchplan = query.getFetchPlan();
         fetchplan.addGroup(FETCH_GROUP_2);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManagerFromRestoredSerializedQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManagerFromRestoredSerializedQuery.java
index ae61404d..6702be3b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManagerFromRestoredSerializedQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManagerFromRestoredSerializedQuery.java
@@ -94,6 +94,7 @@ public class GetPersistenceManagerFromRestoredSerializedQuery
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     void runTestGetPersistenceManagerFromRestoredSerializedQuery(
         PersistenceManager pm) throws IOException, ClassNotFoundException {
         if (debug) 
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java
index 38e84bcd..ff0598e4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java
@@ -65,6 +65,7 @@ public class NewQueryFromExistingQueryBoundToPMFromSameVendor extends QueryTest
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     void runTestNewQueryFromExistingQueryBoundToPMFromSameVendor01(
         PersistenceManager pm) {
         if (debug)
@@ -106,6 +107,7 @@ public class NewQueryFromExistingQueryBoundToPMFromSameVendor extends QueryTest
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     void runTestNewQueryFromExistingQueryBoundToPMFromSameVendor02(
         PersistenceManager pm) {
         if (debug) 
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
index 28de226a..70a2bd09 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
@@ -63,6 +63,7 @@ public class NewQueryFromRestoredSerializedQuery extends QueryTest {
      *
      * @throws Exception exception
      */
+    @SuppressWarnings("unchecked")
     public void testPositive() throws IOException, ClassNotFoundException {
         PersistenceManager pm = getPM();
         if (debug)
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java
index aeb0a5f3..76173fc4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java
@@ -55,6 +55,7 @@ public class NewQueryWithSpecifiedLanguageAndQuery extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive() {
         PersistenceManager pm = getPM();
         if (debug)
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/QueryCancel.java b/tck/src/main/java/org/apache/jdo/tck/query/api/QueryCancel.java
index 658575ab..d6500d81 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/QueryCancel.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/QueryCancel.java
@@ -90,6 +90,7 @@ public class QueryCancel extends QueryTest {
      *
      * @throws Exception exception
      */
+    @SuppressWarnings("unchecked")
     public void testCancel() throws InterruptedException {
         PersistenceManager pm = getPM();
         // Test query 
@@ -141,6 +142,7 @@ public class QueryCancel extends QueryTest {
      *
      * @throws Exception exception
      */
+    @SuppressWarnings("unchecked")
     public void testCancelAll() throws Exception {
         PersistenceManager pm = getPM();
         // Test query
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/QueryExtentions.java b/tck/src/main/java/org/apache/jdo/tck/query/api/QueryExtentions.java
index 742cd3a4..eeb728af 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/QueryExtentions.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/QueryExtentions.java
@@ -66,6 +66,7 @@ public class QueryExtentions extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive() {
         int index = 0;
         Query<Person> query = getPM().newQuery(SINGLE_STRING_QUERY);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SampleQueries.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SampleQueries.java
index 2a692437..612ba640 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SampleQueries.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SampleQueries.java
@@ -163,6 +163,7 @@ public class SampleQueries extends QueryTest {
      * If the value for the salary field in a candidate instance isnull, then it cannot
      * be unwrapped for the comparison, and the candidate instance is rejected.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery01a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -223,6 +224,7 @@ public class SampleQueries extends QueryTest {
      * If the value for the salary field in a candidate instance isnull, then it cannot
      * be unwrapped for the comparison, and the candidate instance is rejected.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery01d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -281,6 +283,7 @@ public class SampleQueries extends QueryTest {
      * This query selects all Employee instances from the candidate collection where the salary
      * is greater than the constant 30000, and returns a Collection ordered based on employee salary.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery02a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -335,6 +338,7 @@ public class SampleQueries extends QueryTest {
      * This query selects all Employee instances from the candidate collection where the salary
      * is greater than the constant 30000, and returns a Collection ordered based on employee salary.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery02d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -393,6 +397,7 @@ public class SampleQueries extends QueryTest {
      * If the value for the salary field in a candidate instance is null, then it cannot be
      * unwrapped for the comparison, and the candidate instance is rejected.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery03a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -488,6 +493,7 @@ public class SampleQueries extends QueryTest {
      * If the value for the salary field in a candidate instance is null, then it cannot be
      * unwrapped for the comparison, and the candidate instance is rejected.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery03d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -552,6 +558,7 @@ public class SampleQueries extends QueryTest {
      * If the value for the dept field in a candidate instance is null, then it cannot be
      * navigated for the comparison, and the candidate instance is rejected.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery04a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -643,6 +650,7 @@ public class SampleQueries extends QueryTest {
      * If the value for the dept field in a candidate instance is null, then it cannot be
      * navigated for the comparison, and the candidate instance is rejected.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery04d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -706,6 +714,7 @@ public class SampleQueries extends QueryTest {
      * the collection of Employee instances contains at least one Employee instance
      * having a salary greater than the value passed as a parameter.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery05a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -797,6 +806,7 @@ public class SampleQueries extends QueryTest {
      * the collection of Employee instances contains at least one Employee instance
      * having a salary greater than the value passed as a parameter.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery05d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -823,6 +833,7 @@ public class SampleQueries extends QueryTest {
      * the collection of Employee instances contains at least one Employee instance
      * having a salary greater than the value passed as a parameter.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery05f() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -855,6 +866,7 @@ public class SampleQueries extends QueryTest {
      * This query selects all Department instances where the name field is contained in
      * a parameter collection, which in this example consists of three department names.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery06a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -941,6 +953,7 @@ public class SampleQueries extends QueryTest {
      * This query selects all Department instances where the name field is contained in
      * a parameter collection, which in this example consists of three department names.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery06d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -1002,6 +1015,7 @@ public class SampleQueries extends QueryTest {
      *
      * This query selects names of all Employees who work in the parameter department.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery07a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -1084,6 +1098,7 @@ public class SampleQueries extends QueryTest {
      *
      * This query selects names of all Employees who work in the parameter department.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery07d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -1144,6 +1159,7 @@ public class SampleQueries extends QueryTest {
      *
      * This query selects names, salaries, and bosses of Employees who work in the parameter department.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery08a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -1231,6 +1247,7 @@ public class SampleQueries extends QueryTest {
      *
      * This query selects names, salaries, and bosses of Employees who work in the parameter department.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery08d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -1288,6 +1305,7 @@ public class SampleQueries extends QueryTest {
      * This query selects names, salaries, and bosses of Employees who work in the parameter department,
      * and uses the constructor for the result class.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery09a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -1385,6 +1403,7 @@ public class SampleQueries extends QueryTest {
      * This query selects names, salaries, and bosses of Employees who work in the parameter department,
      * and uses the constructor for the result class.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery09d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -1566,6 +1585,7 @@ public class SampleQueries extends QueryTest {
      * This query averages the salaries of Employees who work in the parameter department
      * and returns a single value.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery10d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -1708,6 +1728,7 @@ public class SampleQueries extends QueryTest {
      *
      * This query averages and sums the salaries of Employees who work in the parameter department.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery11d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -1765,6 +1786,7 @@ public class SampleQueries extends QueryTest {
      * This query averages and sums the salaries of Employees who work in all departments having
      * more than one employee and aggregates by department name.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery12a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -1829,6 +1851,7 @@ public class SampleQueries extends QueryTest {
      * This query averages and sums the salaries of Employees who work in all departments having
      * more than one employee and aggregates by department name.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery12d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -2004,6 +2027,7 @@ public class SampleQueries extends QueryTest {
      *
      * This query returns a single instance of Employee.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery13d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -2145,6 +2169,7 @@ public class SampleQueries extends QueryTest {
      *
      * This query returns a single field of a single Employee.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery14d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -2203,6 +2228,7 @@ public class SampleQueries extends QueryTest {
      * stores the result in a user-defined class. Since the default is "distinct this as FullTimeEmployee",
      * the field must be named FullTimeEmployee and be of type FullTimeEmployee.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery15a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -2291,6 +2317,7 @@ public class SampleQueries extends QueryTest {
      * stores the result in a user-defined class. Since the default is "distinct this as FullTimeEmployee",
      * the field must be named FullTimeEmployee and be of type FullTimeEmployee.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery15d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -2350,6 +2377,7 @@ public class SampleQueries extends QueryTest {
      * This query selects instances of FullTimeEmployee who make more than the parameter salary and
      * stores the result in a user-defined class.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery16a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -2435,6 +2463,7 @@ public class SampleQueries extends QueryTest {
      * This query selects instances of FullTimeEmployee who make more than the parameter salary and
      * stores the result in a user-defined class.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery16d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -2492,6 +2521,7 @@ public class SampleQueries extends QueryTest {
      *
      * This query returns the names of all Employees of all "Research" departments.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery17a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -2546,6 +2576,7 @@ public class SampleQueries extends QueryTest {
      *
      * This query returns the names of all Employees of all "Research" departments.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery17d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -2594,6 +2625,7 @@ public class SampleQueries extends QueryTest {
      *
      * This query returns the names of all Employees of all "Research" departments.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery17f() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -2622,6 +2654,7 @@ public class SampleQueries extends QueryTest {
      * 
      * This query returns names of employees who work more than the average of all employees.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery18a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -2680,6 +2713,7 @@ public class SampleQueries extends QueryTest {
      *
      * This query returns names of employees who work more than the average of all employees.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery18d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -2736,6 +2770,7 @@ public class SampleQueries extends QueryTest {
      * subquery is the collection of employees in the department of the candidate employee
      * and the parameter passed to the subquery is the manager of the candidate employee.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery19a() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -2804,6 +2839,7 @@ public class SampleQueries extends QueryTest {
      * subquery is the collection of employees in the department of the candidate employee
      * and the parameter passed to the subquery is the manager of the candidate employee.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery19d() {
         Transaction tx = pm.currentTransaction();
         try {
@@ -2831,6 +2867,7 @@ public class SampleQueries extends QueryTest {
      * subquery is the collection of employees in the department of the candidate employee
      * and the parameter passed to the subquery is the manager of the candidate employee.
      */
+    @SuppressWarnings("unchecked")
     public void testQuery19f() {
         Transaction tx = pm.currentTransaction();
         try {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SaveAsNamedQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SaveAsNamedQuery.java
index 7e7d5a54..640497c4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SaveAsNamedQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SaveAsNamedQuery.java
@@ -67,6 +67,7 @@ public class SaveAsNamedQuery extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testSave() {
         int index = 0;
         Query<Person> query = getPM().newQuery(SINGLE_STRING_QUERY);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SingleStringQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SingleStringQuery.java
index 293838c1..c4859dff 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SingleStringQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SingleStringQuery.java
@@ -90,6 +90,7 @@ public class SingleStringQuery extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive() {
         int index = 0;
         Query<FullTimeEmployee> query = getPM().newQuery(SINGLE_STRING_QUERY);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java
index c3f62ca7..2a2286ea 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java
@@ -72,6 +72,7 @@ public class UnmodifiableQuery extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive() {
         int index = 0;
         Query<Person> query = getPM().newQuery(SINGLE_STRING_QUERY);
@@ -91,6 +92,7 @@ public class UnmodifiableQuery extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testNegative() {
         Query<Person> query = getPM().newQuery(SINGLE_STRING_QUERY);
         query.setUnmodifiable();
@@ -119,7 +121,8 @@ public class UnmodifiableQuery extends QueryTest {
         } catch (JDOUserException ignored) {
         }
     }
-    
+
+    @SuppressWarnings("unchecked")
     private void checkSetClass(Query query) {
         try {
             query.setClass(Employee.class);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java b/tck/src/main/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java
index a739196e..bf46464b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java
@@ -88,6 +88,7 @@ public class DeletePersistentAll extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testNoParametersSingleString() {
         Transaction tx = pm.currentTransaction();
         Query<Insurance> query = null;
@@ -145,6 +146,7 @@ public class DeletePersistentAll extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testObjectArrayParametersSingleString() {
         Transaction tx = pm.currentTransaction();
         Query<Insurance> query = null;
@@ -205,6 +207,7 @@ public class DeletePersistentAll extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testMapParametersSingleString() {
         Transaction tx = pm.currentTransaction();
         Query<Insurance> query = null;
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Cast.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Cast.java
index a3c0bf16..c9aa5b2b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Cast.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Cast.java
@@ -92,6 +92,7 @@ public class Cast extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive1() {
         List<Department> expected = getTransientCompanyModelInstancesAsList(Department.class, "dept1", "dept2");
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java
index a38b88b3..805528da 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java
@@ -65,6 +65,7 @@ public class DenoteUniquenessInFilter extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive0() {
         // Uniqueness not specified.
         // emp1 qualifies for both contains clause => result is dept1
@@ -101,6 +102,7 @@ public class DenoteUniquenessInFilter extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive1() {
         // Uniqueness specified.
         // Only emp3 qualifies for both contains clause.
@@ -139,6 +141,7 @@ public class DenoteUniquenessInFilter extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive2() {
         // Uniqueness specified.
         // Only emp1 matches the first contains clause.
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java
index 2607a817..c296f5df 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java
@@ -120,6 +120,7 @@ public class IdentifiersEqualFieldNames extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive2() {
         List<Department> expected = getTransientCompanyModelInstancesAsList(Department.class, "dept1");
 
@@ -150,6 +151,7 @@ public class IdentifiersEqualFieldNames extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive3() {
         List<Department> expected = getTransientCompanyModelInstancesAsList(Department.class, "dept1");
 
@@ -180,6 +182,7 @@ public class IdentifiersEqualFieldNames extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive4() {
         List<Department> expected = getTransientCompanyModelInstancesAsList(Department.class, "dept1") ;
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java
index 6a0971cb..14cb1d5a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java
@@ -69,6 +69,7 @@ public class NavigationThroughACollectionField extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive() {
         List<Department> expected = getTransientCompanyModelInstancesAsList(Department.class, "dept1");
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java
index bf14ea4c..d31064d6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java
@@ -164,6 +164,8 @@ public class NavigationThroughANullValuedField extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
+
+    @SuppressWarnings("unchecked")
     public void testPositive4() {
         // navigation through collection relationship field
         // employees emp2 and emp3 do not have a medicalInsurance, but emp1
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java
index 7150c551..aec77a5b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java
@@ -62,6 +62,7 @@ public class NullCollectionsAndContainsMethod extends QueryTest {
     /**
      *
      */
+    @SuppressWarnings("unchecked")
     public void testContains1() {
         List<Employee> expected = getTransientCompanyModelInstancesAsList(Employee.class);
 
@@ -99,6 +100,7 @@ public class NullCollectionsAndContainsMethod extends QueryTest {
     /**
      *
      */
+    @SuppressWarnings("unchecked")
     public void testContains2() {
         List<Employee> expected = getTransientCompanyModelInstancesAsList(Employee.class, "emp2", "emp3");
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java
index 1822827b..8757de91 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java
@@ -140,6 +140,7 @@ public class QueryIsSerializable extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     void runTestQueryIsSerializable03(PersistenceManager pm) throws IOException, ClassNotFoundException {
         if (debug) logger.debug("\nExecuting test QueryIsSerializable03() ...");
         Object restoredQuery = null;
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RestoredSerializedQueryInstanceLosesAssociationWithPM.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RestoredSerializedQueryInstanceLosesAssociationWithPM.java
index 6f675f38..7b9b45bb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RestoredSerializedQueryInstanceLosesAssociationWithPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RestoredSerializedQueryInstanceLosesAssociationWithPM.java
@@ -75,6 +75,7 @@ public class RestoredSerializedQueryInstanceLosesAssociationWithPM
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     void checkRestoredQueryInstance(PersistenceManager pm) throws IOException, ClassNotFoundException {
         Transaction tx = pm.currentTransaction();
         try {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java
index 31329bed..55eead65 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java
@@ -99,6 +99,7 @@ public class SeparateNamespaceForTypeNames extends QueryTest {
     /**
      * 
      */
+    @SuppressWarnings("unchecked")
     public void testVaiableName() {
         List<Department> expected = getTransientCompanyModelInstancesAsList(Department.class, "dept1");
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
index 2a1a8f00..aba9c670 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
@@ -64,6 +64,7 @@ public class SupportedCollectionMethods extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testContains() {
         // contains(VARIABLE)
         List<Department> expectedResult = getTransientCompanyModelInstancesAsList(Department.class, "dept1");
@@ -192,6 +193,7 @@ public class SupportedCollectionMethods extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testSize() {
         // size
         List<Department> expectedResult = getTransientCompanyModelInstancesAsList(Department.class, "dept1");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
index 2f955910..02925b37 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
@@ -229,6 +229,7 @@ public class SupportedJDOHelperMethods extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     private <T> List<T> getExpectedResult(boolean oidsWanted,
             Class<T> candidateClass, String filter) {
         List<T> expectedResult;
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
index 9b49bcde..c2a547dd 100755
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
@@ -63,6 +63,7 @@ public class SupportedListMethods extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testGetInFilter() {
         // get(PARAMETER) in filter
         List<Department> expected = getTransientCompanyModelInstancesAsList(Department.class, "dept1");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java
index dac4721e..e7ddf150 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java
@@ -62,6 +62,7 @@ public class SupportedMapMethods extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testGet() {
         List<Person> expected = getTransientCompanyModelInstancesAsList(Person.class, "emp1");
 
@@ -92,6 +93,7 @@ public class SupportedMapMethods extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testContainsKey() {
         List<Person> expected = getTransientCompanyModelInstancesAsList(Person.class,
                 "emp1", "emp2", "emp3", "emp4", "emp5");
@@ -123,6 +125,7 @@ public class SupportedMapMethods extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testContainsValue() {
         List<Person> expected = getTransientCompanyModelInstancesAsList(Person.class, "emp1");
 
@@ -183,6 +186,7 @@ public class SupportedMapMethods extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testSize() {
         List<Person> expected = getTransientCompanyModelInstancesAsList(Person.class,
                 "emp1", "emp2", "emp3", "emp4", "emp5");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/DomainObjectsAsParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/DomainObjectsAsParameters.java
index 3e9fcb12..d99978a6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/DomainObjectsAsParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/DomainObjectsAsParameters.java
@@ -62,6 +62,7 @@ public class DomainObjectsAsParameters extends QueryTest {
      * This methods runs a JDOQL query with an equal operator comparing a field 
      * with a parameter of a domain object type.
      */
+    @SuppressWarnings("unchecked")
     public void testParameterEqual() {
         PersistenceManager pm  = getPM();
         Transaction tx = pm.currentTransaction();
@@ -94,6 +95,7 @@ public class DomainObjectsAsParameters extends QueryTest {
      * with a parameter of a domain object type. The actual parameter is a copy of the
      * domain object referenced by the employees, thus the expected result is empty.
      */
+    @SuppressWarnings("unchecked")
     public void testParameterEqualCopy() {
         PersistenceManager pm  = getPM();
         Transaction tx = pm.currentTransaction();
@@ -121,6 +123,7 @@ public class DomainObjectsAsParameters extends QueryTest {
      * This methods runs a JDOQL query with a not equal operator comparing a field
      * with a parameter of a domain object type.
      */
+    @SuppressWarnings("unchecked")
     public void testParameterNotEqual() {
         PersistenceManager pm  = getPM();
         Transaction tx = pm.currentTransaction();
@@ -151,6 +154,7 @@ public class DomainObjectsAsParameters extends QueryTest {
      * This methods runs a JDOQL query with an equal operator comparing a field 
      * with a domain object navigated from a parameter.
      */
+    @SuppressWarnings("unchecked")
     public void testParameterNavigationToDomainObject() {
         PersistenceManager pm  = getPM();
         Transaction tx = pm.currentTransaction();
@@ -182,6 +186,7 @@ public class DomainObjectsAsParameters extends QueryTest {
      * This methods runs a JDOQL query with an equal operator comparing a field
      * with a domain object navigated from a parameter.
      */
+    @SuppressWarnings("unchecked")
     public void testParameterNavigationToPrimitiveField() {
         PersistenceManager pm  = getPM();
         Transaction tx = pm.currentTransaction();
@@ -211,6 +216,7 @@ public class DomainObjectsAsParameters extends QueryTest {
      * This methods runs a JDOQL query with an equal operator comparing a field
      * with a domain object navigated from a parameter.
      */
+    @SuppressWarnings("unchecked")
     public void testDirtyParameterNavigationToPrimitiveField() {
         PersistenceManager pm  = getPM();
         Transaction tx = pm.currentTransaction();
@@ -242,6 +248,7 @@ public class DomainObjectsAsParameters extends QueryTest {
     /**
      * This methods runs a JDOQL query with a contains clause using a domain object parameter.
      */
+    @SuppressWarnings("unchecked")
     public void testContainsParameter() {
         PersistenceManager pm  = getPM();
         Transaction tx = pm.currentTransaction();
@@ -270,6 +277,7 @@ public class DomainObjectsAsParameters extends QueryTest {
     /**
      * This methods runs a JDOQL query with a contains clause using a navigated domain object parameter.
      */
+    @SuppressWarnings("unchecked")
     public void testContainsParameterNavigation() {
         PersistenceManager pm  = getPM();
         Transaction tx = pm.currentTransaction();
@@ -298,6 +306,7 @@ public class DomainObjectsAsParameters extends QueryTest {
     /**
      * This methods runs a JDOQL query with a contains clause using a collection parameter.
      */
+    @SuppressWarnings("unchecked")
     public void testParameterCollection() {
         PersistenceManager pm  = getPM();
         Transaction tx = pm.currentTransaction();
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/OrderOfParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/OrderOfParameters.java
index b99a9d33..06692446 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/OrderOfParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/OrderOfParameters.java
@@ -78,6 +78,7 @@ public class OrderOfParameters extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testSingleStringAPIQuery() {
         // Do not use QueryElementHolder, because QueryElementHolder always uses a Map for parameter values
         Transaction tx = pm.currentTransaction();
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java
index 63cd6117..c363c3db 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java
@@ -112,8 +112,7 @@ public class ParameterDeclaredWithSameNameAsFieldOfCandidateClass extends QueryT
         try {
             tx.begin();
 
-            Query<PCPoint> query = pm.newQuery();
-            query.setClass(PCPoint.class);
+            Query<PCPoint> query = pm.newQuery(PCPoint.class);
             query.setCandidates(pm.getExtent(PCPoint.class, false));
             query.declareParameters("Integer y");
             query.setFilter("y == y");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java
index 56fca176..b84de8c1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java
@@ -104,6 +104,7 @@ public class CorrelatedSubqueries extends SubqueriesTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testCollectionSingleStringQuery() {
         Transaction tx = pm.currentTransaction();
         try {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java
index 3ef95b05..bae7b2dc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java
@@ -66,6 +66,7 @@ public class VariablesAndFields extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive0() {
         List<Employee> expected = getTransientCompanyModelInstancesAsList(Employee.class, "emp2");
 
@@ -97,6 +98,7 @@ public class VariablesAndFields extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive1() {
         List<Employee> expected = getTransientCompanyModelInstancesAsList(Employee.class, "emp2");
 
@@ -158,6 +160,7 @@ public class VariablesAndFields extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive3() {
         List<Employee> expected = getTransientCompanyModelInstancesAsList(Employee.class, "emp2");
 
@@ -187,7 +190,9 @@ public class VariablesAndFields extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
+
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive4() {
         Object expected = new LinkedList<>();
 
@@ -217,7 +222,9 @@ public class VariablesAndFields extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
+
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive5() {
         List<Employee> expected = getTransientCompanyModelInstancesAsList(Employee.class, "emp2");
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java
index 48de91de..07ef1b31 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java
@@ -142,6 +142,7 @@ public class IfElseResult extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive1() {
         Object expected = Arrays.asList(
                 new BigDecimal("3000001.188"), new BigDecimal("55000"), new BigDecimal("2201.089"));
@@ -176,6 +177,7 @@ public class IfElseResult extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive2() {
         Object expected = Arrays.asList("No reviewer", "Reviewer team", "Single reviewer");
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java
index 330cb861..e9b35f4b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java
@@ -150,6 +150,7 @@ public class MethodsInResult extends QueryTest {
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
 
+    @SuppressWarnings("unchecked")
     public void testMapGetInResult() {
         // map.get()
         Object expected = Arrays.asList("1111", "2222", "3333", "3343", "3363");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java b/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java
index 278dbb71..90c10c24 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java
@@ -89,6 +89,7 @@ public class NPEInResultExpr extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testPositive1() {
         Object expected = Arrays.asList("emp2Last", null, "emp2Last", "emp2Last", "emp2Last");
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java b/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java
index 31afca29..edb587f4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java
@@ -196,6 +196,7 @@ public class ResultExpressions extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testVariableField() {
         Object expectedResult = Arrays.asList(Long.valueOf(1));
 
@@ -228,6 +229,7 @@ public class ResultExpressions extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testVariable() {
         List<Project> expectedResult = getTransientCompanyModelInstancesAsList(Project.class, "proj1");
 
@@ -291,6 +293,7 @@ public class ResultExpressions extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testCountVariable() {
         // COUNT(variable)
         Object expectedResult = Long.valueOf(1);
@@ -512,6 +515,7 @@ public class ResultExpressions extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testNavigationalExpressionVariable() {
         // navigational expression variable
         Object expectedResult =
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/Unique.java b/tck/src/main/java/org/apache/jdo/tck/query/result/Unique.java
index 9a637524..554a5948 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/Unique.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/Unique.java
@@ -149,6 +149,7 @@ public class Unique extends QueryTest {
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
 
+    @SuppressWarnings("unchecked")
     public void testNegative() {
         String singleString = "SELECT UNIQUE FROM " + Person.class.getName();
         
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java
index 5acd2962..938b28b2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java
@@ -71,6 +71,7 @@ public class VariableInResult extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testDistinctNoNavigation() {
         List<Employee> expected = getTransientCompanyModelInstancesAsList(Employee.class, "emp1","emp2","emp3","emp4","emp5");
 
@@ -103,6 +104,7 @@ public class VariableInResult extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testDistinctNavigation() {
         Object elem = new Object[]{Long.valueOf(1), "orange"};
         Object expected = Arrays.asList(elem);
@@ -136,6 +138,7 @@ public class VariableInResult extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testNavigation() {
         Object expected = Arrays.asList(
                 new Object[]{Long.valueOf(1), "orange"},
@@ -171,6 +174,7 @@ public class VariableInResult extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testNoNavigation() {
         List<Employee> expected = getTransientCompanyModelInstancesAsList(Employee.class, "emp1","emp2","emp3","emp4","emp5");
 
@@ -203,6 +207,7 @@ public class VariableInResult extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testMultipleProjectionWithConstraints() {
         List<Employee> expected = getTransientCompanyModelInstancesAsList(Employee.class, "emp4","emp5");
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java
index 34455c9d..7e8be564 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java
@@ -92,6 +92,7 @@ public class VariableInResultMultipleNavigation extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testNavigationWithCompanyAndDepartmentAndEmployeeAndProject() {
         Object expected = Arrays.asList(
                 new Object[] {company1, dept1, emp1, proj1},
@@ -135,6 +136,7 @@ public class VariableInResultMultipleNavigation extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testNavigationWithCompanyAndEmployeeAndProject() {
         Object expected = Arrays.asList(
                 new Object[] {company1, emp1, proj1},
@@ -178,6 +180,7 @@ public class VariableInResultMultipleNavigation extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testNavigationWithDepartmentAndEmployeeAndProject() {
         Object expected = Arrays.asList(
                 new Object[] {dept1, emp1, proj1},
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java
index aed9a6b1..3ff8a152 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java
@@ -89,6 +89,7 @@ public class VariableInResultNavigation extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testNavigationWithConstraint() {
         Object expected = Arrays.asList(
                 new Object[] {emp1, proj1},
@@ -125,6 +126,7 @@ public class VariableInResultNavigation extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testNavigationWithoutConstraint() {
         Object expected = Arrays.asList(
                 new Object[] {emp1, proj1},
@@ -165,6 +167,7 @@ public class VariableInResultNavigation extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testNavigationWithThis() {
         Object expected = Arrays.asList(
                 new Object[] {dept1, emp1, proj1},
@@ -205,6 +208,7 @@ public class VariableInResultNavigation extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testNavigationWithThisConstraint() {
         Object expected = Arrays.asList(
                 new Object[] {emp1, proj1},
@@ -243,6 +247,7 @@ public class VariableInResultNavigation extends QueryTest {
     }
 
     /** */
+    @SuppressWarnings("unchecked")
     public void testNavigationWithCompanyConstraint() {
         Object expected = Arrays.asList(
                 new Object[] {emp1, proj1},
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 ee5de82d..4cec5e22 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
@@ -90,6 +90,7 @@ public class ExecuteWithMap extends QueryTest {
     private static final HashMap<Object, Object> illegalMapMissingKeyTwo = new HashMap<>();
     private static final HashMap<Object, Object> illegalMapStartsWithZero = new HashMap<>();
     private static final HashMap<Object, Object> illegalMapStringKeys = new HashMap<>();
+
     static {
         // valid parameter values
         hm1.put(Integer.valueOf(1), Integer.valueOf(4));
@@ -100,10 +101,12 @@ public class ExecuteWithMap extends QueryTest {
         hm2.put(Integer.valueOf(3), "emp2Middle");
         hm2.put(Integer.valueOf(4), "New York");
 
+        //noinspection unchecked
         hm3 = (HashMap<Object, Object>) hm2.clone();
         // extra entry okay, should be ignored by impl
         hm3.put(Integer.valueOf(0), "emp2First");
 
+        //noinspection unchecked
         hm4 = (HashMap<Object, Object>)hm2.clone();
         // extra entry okay, should be ignored by impl
         hm4.put(Integer.valueOf(5), "New York");
@@ -125,6 +128,7 @@ public class ExecuteWithMap extends QueryTest {
         illegalMapStringKeys.put("4dog", "New York");
     }
 
+    @SuppressWarnings("unchecked")
     private static final Map<Object, Object>[] parameterMap = new Map[]{hm1, hm2, hm3, hm4};
             
     /** */
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java b/tck/src/main/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java
index 7d4618be..f166f60e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java
@@ -160,6 +160,7 @@ public class ShapeOfResult extends QueryTest {
     }
     
     /** */
+    @SuppressWarnings("unchecked")
     public void testNegative() {
         if (isSQLSupported()) {
             String schema = getPMFProperty("javax.jdo.mapping.Schema");
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/BatchTestRunner.java b/tck/src/main/java/org/apache/jdo/tck/util/BatchTestRunner.java
index 693f7de8..275a9e5d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/BatchTestRunner.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/BatchTestRunner.java
@@ -175,6 +175,7 @@ public class BatchTestRunner
      * @param classNames class names
      * @return the test suite
      */
+    @SuppressWarnings("unchecked")
     protected TestSuite getTestSuite(String[] classNames) {
         TestSuite testSuite = new TestSuite();
         for (String className : classNames) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/ConversionHelper.java b/tck/src/main/java/org/apache/jdo/tck/util/ConversionHelper.java
index 472411dc..cffaf61a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/ConversionHelper.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/ConversionHelper.java
@@ -90,6 +90,7 @@ public class ConversionHelper {
      * @param collection the collection
      * @return the converted collection
      */
+    @SuppressWarnings("unchecked")
     public static <T> Collection<T> convertsElementsOfTypeObjectArray(Collection<T> collection) {
         Collection<T>  result = new ArrayList<>();
         for (T t : collection) {
@@ -108,6 +109,7 @@ public class ConversionHelper {
      * @param map the map
      * @return the converted map
      */
+    @SuppressWarnings("unchecked")
     public static <K, V> Map<K, V> convertsElementsOfTypeObjectArray(Map<K, V> map) {
         Map<K, V> result = new HashMap<>();
         for (Map.Entry<K, V> entry : map.entrySet()) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/EqualityHelper.java b/tck/src/main/java/org/apache/jdo/tck/util/EqualityHelper.java
index 59fbb749..aa940bec 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/EqualityHelper.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/EqualityHelper.java
@@ -76,6 +76,7 @@ public class EqualityHelper {
      * is used to order Maps whose keys are Comparable so the entries can be 
      * compared using deepCompareFields.
      */
+    @SuppressWarnings("unchecked")
     private static final Comparator<Map.Entry<?, ?>> entryKeyComparator = (o1, o2) -> {
         Object key1 = o1.getKey();
         Object key2 = o2.getKey();
@@ -191,6 +192,7 @@ public class EqualityHelper {
      * @param other the other object to be tested for deep equality
      * @return <code>true</code> if the objects are deep equal.
      */
+    @SuppressWarnings("unchecked")
     public  boolean deepEquals(Object me, Object other) {
         if (me == other)
             return true;
@@ -217,6 +219,7 @@ public class EqualityHelper {
      * @throws ClassCastException if the collections contain elements that
      * are not mutually comparable.
      */
+    @SuppressWarnings("unchecked")
     public <T extends Comparable<T>> boolean deepEquals(Collection<T> mine, Collection<T> other) {
         if (mine == other)
             return true;
@@ -257,6 +260,7 @@ public class EqualityHelper {
      * @throws ClassCastException if the maps contain keys or values that 
      * are not mutually comparable.
      */
+    @SuppressWarnings("unchecked")
     public <K,V> boolean deepEquals(Map<K,V> mine, Map<K,V> other) {
         if (mine == other)
             return true;
@@ -304,6 +308,7 @@ public class EqualityHelper {
      * @param other the other collection to be tested for shallow equality
      * @return <code>true</code> if the collections are deep equal.
      */
+    @SuppressWarnings("unchecked")
     public <T extends Comparable<T>> boolean shallowEquals(Collection<T> mine, Collection<T> other) {
         if (mine == other)
             return true;
@@ -413,6 +418,7 @@ public class EqualityHelper {
      * @param where the location of the inequality (provided by the caller)
      * @return <code>true</code> if the objects are deep equal.
      */
+    @SuppressWarnings("unchecked")
     public boolean deepEquals(Object me, Object other, String where) {
         if (me == other)
             return true;
@@ -448,6 +454,7 @@ public class EqualityHelper {
      * @throws ClassCastException if the collections contain elements that
      * are not mutually comparable.
      */
+    @SuppressWarnings("unchecked")
     public <S extends Comparable<S>, T> boolean deepEqualsCollection(Collection<S> me, Collection<T> other,
             String where) {
         if (me == other)
@@ -510,6 +517,7 @@ public class EqualityHelper {
      * @throws ClassCastException if the maps contain keys or values that 
      * are not mutually comparable.
      */
+    @SuppressWarnings("unchecked")
     public <K,V> boolean deepEqualsMap(Map<K,V> me, Map<K,V> other, String where) {
         if (me == other)
             return true;
@@ -582,6 +590,7 @@ public class EqualityHelper {
      * @param where the location of the inequality (provided by the caller)
      * @return <code>true</code> if the collections are deep equal.
      */
+    @SuppressWarnings("unchecked")
     public <T extends Comparable<T>> boolean shallowEquals(Collection<T> me, Collection<T> other,
             String where) {
         if (me == other)