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:20 UTC

[db-jdo] 04/07: JDO-817 removing compiler warnings: raw use of parameterized class

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 64b19a1fb6ad78eb26248fe31ca5c33e8b6a4f4f
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sun Jul 17 00:17:58 2022 +0200

    JDO-817 removing compiler warnings: raw use of parameterized class
---
 .../tck/api/instancecallbacks/InstanceLifecycleListenerCreate.java  | 1 +
 .../jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java       | 2 +-
 .../jdo/tck/api/persistencemanagerfactory/GetManagedClasses.java    | 1 +
 tck/src/main/java/org/apache/jdo/tck/extents/ExtentTest.java        | 2 +-
 .../tck/models/fieldtypes/TestHashMapStringValueCollections.java    | 2 +-
 .../tck/models/fieldtypes/TestHashtableStringValueCollections.java  | 1 +
 .../org/apache/jdo/tck/models/fieldtypes/TestListCollections.java   | 1 +
 .../jdo/tck/models/fieldtypes/TestMapStringValueCollections.java    | 1 +
 .../tck/models/fieldtypes/TestTreeMapStringValueCollections.java    | 1 +
 .../main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java    | 1 +
 .../tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java   | 3 ++-
 .../java/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.java     | 2 +-
 .../apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.java   | 2 +-
 .../apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.java | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.java   | 2 +-
 .../apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.java | 2 +-
 .../jdo/tck/pc/fieldtypes/HashtableStringValueCollections.java      | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.java     | 2 +-
 .../main/java/org/apache/jdo/tck/pc/fieldtypes/ListCollections.java | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.java   | 2 +-
 .../org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.java | 2 +-
 .../main/java/org/apache/jdo/tck/pc/fieldtypes/SetCollections.java  | 2 +-
 .../apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.java   | 2 +-
 .../apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.java | 2 +-
 .../java/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.java   | 4 +++-
 .../java/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.java    | 2 +-
 tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java      | 1 +
 tck/src/main/java/org/apache/jdo/tck/query/api/ChangeQuery.java     | 1 +
 .../main/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java   | 2 +-
 tck/src/main/java/org/apache/jdo/tck/util/EqualityHelper.java       | 6 +++---
 31 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerCreate.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerCreate.java
index f6ccda6f..bc4b7b58 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerCreate.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerCreate.java
@@ -55,6 +55,7 @@ public class InstanceLifecycleListenerCreate
     /**
      * The persistent classes used for this test.
      */
+    @SuppressWarnings("rawtypes")
     private final static Class<?>[] persistentClasses = new Class[] {PCPoint.class};
 
     /** Return the persistent classes.
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java
index 96dcf90e..94448d17 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java
@@ -189,7 +189,7 @@ abstract class AbstractGetPMF extends JDO_Test {
      */
     Method getGetMethod(Class<?> cls, String optionName) {
         try {
-            return cls.getMethod("get" + optionName, new Class[]{});
+            return cls.getMethod("get" + optionName);
         } catch (Exception ex) {
             fail("Unexpected exception thrown from getMethod on PMF class with option name" + 
                     optionName);
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetManagedClasses.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetManagedClasses.java
index 4a5e87ca..e5001f07 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetManagedClasses.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetManagedClasses.java
@@ -49,6 +49,7 @@ public class GetManagedClasses extends JDO_Test {
     }
 
     /** */
+    @SuppressWarnings("rawtypes")
     public void test() {
     	try {
         	// Get PMF and a PM, and do an Extent on some classes
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/ExtentTest.java b/tck/src/main/java/org/apache/jdo/tck/extents/ExtentTest.java
index 26d8fb8c..4b1e3934 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/ExtentTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/ExtentTest.java
@@ -253,7 +253,7 @@ abstract class ExtentTest extends JDO_Test {
         }
         try {
             Class<?> companyOIDClass = Class.forName(companyOIDClassName);
-            Constructor<?> companyOIDConstructor = companyOIDClass.getConstructor(new Class[] {String.class});
+            Constructor<?> companyOIDConstructor = companyOIDClass.getConstructor(String.class);
             Object companyOID = companyOIDConstructor.newInstance (companyOIDString);
             return companyOID;
         } 
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 6524b879..5ec77662 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
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.models.fieldtypes;
 import java.math.BigDecimal;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Set;
 import java.util.Vector;
 
@@ -174,6 +173,7 @@ public class TestHashMapStringValueCollections extends JDO_Test {
                             HashMapStringValueCollections.fieldSpecs[i]
                             ).get(0).equals("BigDecimal")) {
                     Set<?> expectedKeySet = expected.keySet();
+                    @SuppressWarnings("rawtypes")
                     Set actualKeySet = actual.keySet();
                     for (Object o : expectedKeySet) {
                         BigDecimal expectedKey = (BigDecimal) o;
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 f5dca243..0c46eb8b 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
@@ -173,6 +173,7 @@ public class TestHashtableStringValueCollections extends JDO_Test {
                             HashtableStringValueCollections.fieldSpecs[i]
                             ).get(0).equals("BigDecimal")) {
                     Set<?> expectedKeySet = expected.keySet();
+                    @SuppressWarnings("rawtypes")
                     Set actualKeySet = actual.keySet();
                     for (Object o : expectedKeySet) {
                         BigDecimal expectedKey = (BigDecimal) o;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java
index fa7a34b6..a4c3ad55 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java
@@ -136,6 +136,7 @@ public class TestListCollections extends JDO_Test {
     /** */
     private void setValues(ListCollections collect, int order)
     {
+        @SuppressWarnings("rawtypes")
         Vector value;
         int n = collect.getLength();
         for (int i = 0; i < n; ++i) {
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 afa0c08e..3b240a87 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
@@ -178,6 +178,7 @@ public class TestMapStringValueCollections extends JDO_Test {
                             MapStringValueCollections.fieldSpecs[i]
                             ).get(0).equals("BigDecimal")) {
                     Set<?> expectedKeySet = expected.keySet();
+                    @SuppressWarnings("rawtypes")
                     Set actualKeySet = actual.keySet();
                     for (Object o : expectedKeySet) {
                         BigDecimal expectedKey = (BigDecimal) o;
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 5c3ac81f..5c6e2f0e 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
@@ -171,6 +171,7 @@ public class TestTreeMapStringValueCollections extends JDO_Test {
                             TreeMapStringValueCollections.fieldSpecs[i]
                             ).get(0).equals("BigDecimal")) {
                     Set<?> expectedKeySet = expected.keySet();
+                    @SuppressWarnings("rawtypes")
                     Set actualKeySet = actual.keySet();
                     for (Object o : expectedKeySet) {
                         BigDecimal expectedKey = (BigDecimal) o;
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 890622ae..926963c3 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
@@ -103,6 +103,7 @@ public class TestUtil {
       return 9999;
   }
 
+  @SuppressWarnings("rawtypes")
   public static Vector makeNewVectorInstance(String type, int order) {
 
       Vector<Object> vec = new Vector<>();
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java
index 3d386f96..6101494e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java
@@ -38,7 +38,8 @@ public class CompanyFactoryAnnotatedPIAppPM
     public CompanyFactoryAnnotatedPIAppPM(PersistenceManager pm) {
         this.pm = pm;        
     }
-    
+
+    @SuppressWarnings("rawtypes")
     public Class<?>[] getTearDownClasses() {
         return new Class[] {
             PIAppDentalInsurance.class,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java
index d0627a53..b462243f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.java
@@ -231,7 +231,7 @@ public class ArrayListCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index, ArrayList value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") ArrayList value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 05a3b44b..e1572a9b 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
@@ -215,7 +215,7 @@ public class CollectionCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index,Collection value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") Collection value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 f19b57a1..6ad744b7 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
@@ -435,7 +435,7 @@ public class HashMapStringKeyCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index, HashMap value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") HashMap value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 cfd1169a..a014ce1d 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
@@ -406,7 +406,7 @@ public class HashMapStringValueCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index,HashMap value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") HashMap value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 b34e8b2d..ed43eaef 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
@@ -215,7 +215,7 @@ public class HashSetCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index,HashSet value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") HashSet value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 cf2ef329..71aa3c61 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
@@ -435,7 +435,7 @@ public class HashtableStringKeyCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index,Hashtable value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") Hashtable value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 7a05194e..e23493e3 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
@@ -406,7 +406,7 @@ public class HashtableStringValueCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index,Hashtable value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") Hashtable value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 f89df56f..0180d262 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
@@ -215,7 +215,7 @@ public class LinkedListCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index,LinkedList value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") LinkedList value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 0386fa47..13848d82 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
@@ -215,7 +215,7 @@ public class ListCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index, List value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") List value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 a36aa89c..0d245729 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
@@ -487,7 +487,7 @@ public class MapStringKeyCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index,Map value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") Map value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 58a66315..add2e50e 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
@@ -458,7 +458,7 @@ public class MapStringValueCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index,Map value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") Map value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 9b176e56..b6c441ae 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
@@ -215,7 +215,7 @@ public class SetCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index,Set value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") Set value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 d5f1366f..37ab95b5 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
@@ -435,7 +435,7 @@ public class TreeMapStringKeyCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index,TreeMap value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") TreeMap value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 3cd1a1f4..0357f9ea 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
@@ -406,7 +406,7 @@ public class TreeMapStringValueCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index,TreeMap value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") TreeMap value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 64da5e41..a44e01e2 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
@@ -110,6 +110,8 @@ public class TreeSetCollections {
   {
     return fieldSpecs.length;
   }
+
+  @SuppressWarnings("rawtypes")
   public TreeSet get(int index)
   {
     switch (index)
@@ -198,7 +200,7 @@ public class TreeSetCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index,TreeSet value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") TreeSet value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 96833480..d62a4641 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
@@ -215,7 +215,7 @@ public class VectorCollections {
   }
 
   @SuppressWarnings("unchecked")
-  public boolean set(int index,Vector value)
+  public boolean set(int index, @SuppressWarnings("rawtypes") Vector value)
   {
     if(fieldSpecs[index].indexOf("final") != -1)
       return false;
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 d55fa1bd..ffeb36d6 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
@@ -36,6 +36,7 @@ public class MylibReader extends DefaultListableBeanFactory {
 
     /** Teardown classes 
      */
+    @SuppressWarnings("rawtypes")
     private static final Class<?>[] tearDownClasses = new Class[] {
         PrimitiveTypes.class, PCClass.class
     };
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 afd8c416..3630d5d3 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
@@ -59,6 +59,7 @@ public class ChangeQuery extends QueryTest {
     /** */
     @SuppressWarnings("unchecked")
     public void testPositive() {
+        @SuppressWarnings("rawtypes")
         Query query = getPM().newNamedQuery(Person.class, "changeQuery");
         
         // change 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 2a2286ea..e5fd0049 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
@@ -123,7 +123,7 @@ public class UnmodifiableQuery extends QueryTest {
     }
 
     @SuppressWarnings("unchecked")
-    private void checkSetClass(Query query) {
+    private void checkSetClass(@SuppressWarnings("rawtypes") Query query) {
         try {
             query.setClass(Employee.class);
             methodFailed("setClass()");
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 aa940bec..4212c2e4 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
@@ -192,7 +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")
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public  boolean deepEquals(Object me, Object other) {
         if (me == other)
             return true;
@@ -418,7 +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")
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public boolean deepEquals(Object me, Object other, String where) {
         if (me == other)
             return true;
@@ -517,7 +517,7 @@ public class EqualityHelper {
      * @throws ClassCastException if the maps contain keys or values that 
      * are not mutually comparable.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({"unchecked", "rawtypes"})
     public <K,V> boolean deepEqualsMap(Map<K,V> me, Map<K,V> other, String where) {
         if (me == other)
             return true;