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/17 19:10:49 UTC
[db-jdo] 02/08: JDO-817 removing compiler warnings: miscellaneous warnings
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 605e768dd18c77b41a63f57681ce57402a756905
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sun Jul 17 18:45:55 2022 +0200
JDO-817 removing compiler warnings: miscellaneous warnings
---
tck/src/main/java/org/apache/jdo/tck/JDO_Test.java | 8 +++++++-
tck/src/main/java/org/apache/jdo/tck/pc/order/Order.java | 4 +++-
.../jdo/tck/query/jdoql/parameters/DomainObjectsAsParameters.java | 2 +-
.../main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java | 4 +---
.../main/java/org/apache/jdo/tck/util/GetSupportedOptions.java | 2 +-
tck/src/main/java/org/apache/jdo/tck/util/TCKFileHandler.java | 2 +-
6 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java b/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
index fb186640..06da8b44 100644
--- a/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
+++ b/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
@@ -550,10 +550,16 @@ public abstract class JDO_Test extends TestCase {
try {
Class<?> pmfClass = getPMFClass();
name = pmfClass.getName();
- pmf = (PersistenceManagerFactory) pmfClass.newInstance();
+ pmf = (PersistenceManagerFactory) pmfClass.getDeclaredConstructor().newInstance();
if (supportedOptions == null) {
supportedOptions = pmf.supportedOptions();
}
+ } catch (NoSuchMethodException ex) {
+ throw new JDOException("No no-args constructor of PMF class '" +
+ name + "'.", ex);
+ } catch (InvocationTargetException ex) {
+ throw new JDOException("Exception thrown by constructor of PMF class '" +
+ name + "'.", ex);
} catch (InstantiationException ex) {
throw new JDOException("Cannot instantiate PMF class '" +
name + "'.", ex);
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/order/Order.java b/tck/src/main/java/org/apache/jdo/tck/pc/order/Order.java
index 24a3d025..7c250fc5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/order/Order.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/order/Order.java
@@ -131,7 +131,9 @@ public class Order implements Serializable, Comparable<Order>, Comparator<Order>
return false;
}
-
+ public int hashCode() {
+ return (int)orderId;
+ }
/**
* The class to be used as the application identifier
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 d99978a6..cb356b0c 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
@@ -286,7 +286,7 @@ public class DomainObjectsAsParameters extends QueryTest {
String filter = "this.employees.contains(ins.employee)";
Collection<Department> expectedResult = new ArrayList<>();
- expectedResult.add((Department)getPersistentCompanyModelInstance(Department.class, "dept1"));
+ expectedResult.add(getPersistentCompanyModelInstance(Department.class, "dept1"));
Query<Department> q = pm.newQuery(Department.class);
q.declareParameters("org.apache.jdo.tck.pc.company.Insurance ins");
q.setFilter(filter);
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 4cec5e22..2bb2b336 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
@@ -41,6 +41,7 @@ import org.apache.jdo.tck.util.BatchTestRunner;
* The value in the Map corresponding to the key whose intValue is 1
* is bound to the first ? in the SQL statement, and so forth.
*/
+@SuppressWarnings("unchecked")
public class ExecuteWithMap extends QueryTest {
/** */
@@ -101,12 +102,10 @@ 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");
@@ -128,7 +127,6 @@ 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/util/GetSupportedOptions.java b/tck/src/main/java/org/apache/jdo/tck/util/GetSupportedOptions.java
index 2f7d93fc..2f68868d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/GetSupportedOptions.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/GetSupportedOptions.java
@@ -30,7 +30,7 @@ public class GetSupportedOptions {
}
String PMFclassname = args[0];
Class<?> PMFclass = Class.forName(PMFclassname);
- PersistenceManagerFactory pmf = (PersistenceManagerFactory) PMFclass.newInstance();
+ PersistenceManagerFactory pmf = (PersistenceManagerFactory) PMFclass.getDeclaredConstructor().newInstance();
Collection<String> options = pmf.supportedOptions();
System.out.println("Supported options are:");
for (String val : options) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/TCKFileHandler.java b/tck/src/main/java/org/apache/jdo/tck/util/TCKFileHandler.java
index 94a2e75b..bcb21341 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/TCKFileHandler.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/TCKFileHandler.java
@@ -328,7 +328,7 @@ public class TCKFileHandler extends Handler {
try {
Class<?> clazz =
ClassLoader.getSystemClassLoader().loadClass(value);
- result = clazz.newInstance();
+ result = clazz.getDeclaredConstructor().newInstance();
} catch (Exception ignored) {
}
}