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

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

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

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

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

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

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