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/12 20:40:03 UTC
[db-jdo] branch tck-compiler-warnings updated (fd58d502 -> 11ccad21)
This is an automated email from the ASF dual-hosted git repository.
mbo pushed a change to branch tck-compiler-warnings
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
from fd58d502 JDO-817 removing compiler warnings: @SuppressWarnings for set methods in fieldtypes classes
new 3d896c56 JDO-817 removing compiler warnings: using pm.newQuery() with class argument
new 11ccad21 JDO-817 removing compiler warnings: SuppressWarnings when creating a query from singleStringJDOQL
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/jdo/tck/query/api/CompileQuery.java | 3 +-
.../apache/jdo/tck/query/api/DeclareImports.java | 9 +-
.../jdo/tck/query/api/DeclareParameters.java | 9 +-
.../apache/jdo/tck/query/api/DeclareVariables.java | 6 +-
.../org/apache/jdo/tck/query/api/ExecuteQuery.java | 9 +-
.../jdo/tck/query/api/ExecuteQueryWithArray.java | 6 +-
.../jdo/tck/query/api/ExecuteQueryWithMap.java | 6 +-
.../jdo/tck/query/api/GetPersistenceManager.java | 6 +-
...sistenceManagerFromRestoredSerializedQuery.java | 3 +-
...ryFromExistingQueryBoundToPMFromSameVendor.java | 8 +-
.../api/NewQueryFromRestoredSerializedQuery.java | 3 +-
.../api/NewQueryWithCandidateClassAndExtent.java | 3 +-
.../api/NewQueryWithSpecifiedLanguageAndQuery.java | 3 +-
.../jdo/tck/query/api/SetCandidateCollection.java | 3 +-
.../jdo/tck/query/api/SetCandidateExtent.java | 3 +-
.../apache/jdo/tck/query/api/SetIgnoreCache.java | 3 +-
.../org/apache/jdo/tck/query/api/SetOrdering.java | 6 +-
...nmentPrePostIncrementDecrementNotSupported.java | 3 +-
...ExecuteQueryWhenPersistenceManagerIsClosed.java | 3 +-
...eryWhenNoTransactionNoNontransactionalRead.java | 3 +-
...ctiveQueryInstanceInSamePersistenceManager.java | 6 +-
.../jdo/tck/query/jdoql/OrderingSpecification.java | 9 +-
.../jdoql/ParenthesesMarkOperatorPrecedence.java | 27 ++----
.../jdo/tck/query/jdoql/QueryIsSerializable.java | 3 +-
.../jdoql/QueryResultPassedToAnotherQuery.java | 6 +-
.../jdo/tck/query/jdoql/QueryWithNoFilter.java | 3 +-
...ializedQueryInstanceLosesAssociationWithPM.java | 3 +-
.../jdoql/WhiteSpaceIsACharacterAndIgnored.java | 6 +-
.../keywords/UseOfThisToAcessHiddenField.java | 6 +-
.../tck/query/jdoql/methods/EnumMethodOrdinal.java | 3 +-
.../query/jdoql/methods/EnumMethodToString.java | 3 +-
.../MethodsAndObjectConstructionNotSupported.java | 5 +-
.../query/jdoql/methods/SupportedMathMethods.java | 105 +++++++++------------
.../query/jdoql/methods/SupportedTimeMethods.java | 13 +--
.../jdoql/parameters/BoundParameterCheck.java | 3 +-
...eclaredWithSameNameAsFieldOfCandidateClass.java | 3 +-
.../query/jdoql/subqueries/AggregateOnSize.java | 1 +
.../jdoql/subqueries/CorrelatedSubqueries.java | 3 +
.../CorrelatedSubqueriesWithParameters.java | 5 +-
.../jdoql/subqueries/NonCorrelatedSubqueries.java | 2 +
.../jdoql/subqueries/NullSubqueryParameter.java | 1 +
...eclaredWithSameNameAsFieldOfCandidateClass.java | 6 +-
.../query/result/DistinctCandidateInstances.java | 3 +-
43 files changed, 123 insertions(+), 200 deletions(-)
[db-jdo] 02/02: JDO-817 removing compiler warnings: SuppressWarnings when creating a query from singleStringJDOQL
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mbo pushed a commit to branch tck-compiler-warnings
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
commit 11ccad215fd04523fea3f6de507ca4cbd2960835
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Tue Jul 12 22:37:43 2022 +0200
JDO-817 removing compiler warnings: SuppressWarnings when creating a query from singleStringJDOQL
---
.../org/apache/jdo/tck/query/jdoql/subqueries/AggregateOnSize.java | 1 +
.../apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java | 3 +++
.../query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java | 5 ++++-
.../jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java | 2 ++
.../apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java | 1 +
5 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/AggregateOnSize.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/AggregateOnSize.java
index e8380be4..b6b463b3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/AggregateOnSize.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/AggregateOnSize.java
@@ -52,6 +52,7 @@ public class AggregateOnSize extends SubqueriesTest {
}
/** */
+ @SuppressWarnings("unchecked")
public void testMaxAndSizeInSubquery() {
PersistenceManager pm = getPM();
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 86756123..56fca176 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
@@ -126,6 +126,7 @@ public class CorrelatedSubqueries extends SubqueriesTest {
}
/** */
+ @SuppressWarnings("unchecked")
public void testCollectionJDOQLTypedQuery() {
Transaction tx = pm.currentTransaction();
try {
@@ -184,6 +185,7 @@ public class CorrelatedSubqueries extends SubqueriesTest {
}
/** */
+ @SuppressWarnings("unchecked")
public void testListSingleStringQuery() {
Transaction tx = pm.currentTransaction();
try {
@@ -206,6 +208,7 @@ public class CorrelatedSubqueries extends SubqueriesTest {
}
/** */
+ @SuppressWarnings("unchecked")
public void testListJDOQLTypedQuery() {
Transaction tx = pm.currentTransaction();
try {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
index 974c168a..8fbdaf87 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
@@ -67,7 +67,8 @@ public class CorrelatedSubqueriesWithParameters extends SubqueriesTest {
/**
* Test subquery:
*/
- void runTestSubqueries01(PersistenceManager pm) {
+ @SuppressWarnings("unchecked")
+ void runTestSubqueries01(PersistenceManager pm) {
List<Employee> expectedResult = getTransientCompanyModelInstancesAsList(Employee.class,
"emp2", "emp6", "emp9");
@@ -103,6 +104,7 @@ public class CorrelatedSubqueriesWithParameters extends SubqueriesTest {
}
/** */
+ @SuppressWarnings("unchecked")
void runTestSubqueries02(PersistenceManager pm) {
List<Employee> expectedResult = getTransientCompanyModelInstancesAsList(Employee.class, "emp2", "emp10");
@@ -141,6 +143,7 @@ public class CorrelatedSubqueriesWithParameters extends SubqueriesTest {
}
/** */
+ @SuppressWarnings("unchecked")
void runTestSubqueries03(PersistenceManager pm) {
List<Employee> expectedResult = getTransientCompanyModelInstancesAsList(Employee.class,
"emp2", "emp6", "emp9", "emp10");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java
index 42ef43d4..1e88ff91 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java
@@ -64,6 +64,7 @@ public class NonCorrelatedSubqueries extends SubqueriesTest {
}
/** */
+ @SuppressWarnings("unchecked")
void runTestSubqueries01(PersistenceManager pm) {
List<IEmployee> expectedResult = getTransientCompanyModelInstancesAsList(IEmployee.class,
"emp1","emp2","emp4","emp5","emp6","emp7","emp10");
@@ -96,6 +97,7 @@ public class NonCorrelatedSubqueries extends SubqueriesTest {
}
/** */
+ @SuppressWarnings("unchecked")
void runTestSubqueries02(PersistenceManager pm) {
List<IEmployee> expectedResult = getTransientCompanyModelInstancesAsList(IEmployee.class,
"emp2", "emp5", "emp10");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java
index 68bb86d7..626ed425 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java
@@ -54,6 +54,7 @@ public class NullSubqueryParameter extends SubqueriesTest {
}
/** */
+ @SuppressWarnings("unchecked")
public void testPositive() {
PersistenceManager pm = getPM();
[db-jdo] 01/02: JDO-817 removing compiler warnings: using pm.newQuery() with class argument
Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mbo pushed a commit to branch tck-compiler-warnings
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
commit 3d896c5678dd152408d8adebd4352406f06f059f
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Tue Jul 12 22:36:49 2022 +0200
JDO-817 removing compiler warnings: using pm.newQuery() with class argument
---
.../org/apache/jdo/tck/query/api/CompileQuery.java | 3 +-
.../apache/jdo/tck/query/api/DeclareImports.java | 9 +-
.../jdo/tck/query/api/DeclareParameters.java | 9 +-
.../apache/jdo/tck/query/api/DeclareVariables.java | 6 +-
.../org/apache/jdo/tck/query/api/ExecuteQuery.java | 9 +-
.../jdo/tck/query/api/ExecuteQueryWithArray.java | 6 +-
.../jdo/tck/query/api/ExecuteQueryWithMap.java | 6 +-
.../jdo/tck/query/api/GetPersistenceManager.java | 6 +-
...sistenceManagerFromRestoredSerializedQuery.java | 3 +-
...ryFromExistingQueryBoundToPMFromSameVendor.java | 8 +-
.../api/NewQueryFromRestoredSerializedQuery.java | 3 +-
.../api/NewQueryWithCandidateClassAndExtent.java | 3 +-
.../api/NewQueryWithSpecifiedLanguageAndQuery.java | 3 +-
.../jdo/tck/query/api/SetCandidateCollection.java | 3 +-
.../jdo/tck/query/api/SetCandidateExtent.java | 3 +-
.../apache/jdo/tck/query/api/SetIgnoreCache.java | 3 +-
.../org/apache/jdo/tck/query/api/SetOrdering.java | 6 +-
...nmentPrePostIncrementDecrementNotSupported.java | 3 +-
...ExecuteQueryWhenPersistenceManagerIsClosed.java | 3 +-
...eryWhenNoTransactionNoNontransactionalRead.java | 3 +-
...ctiveQueryInstanceInSamePersistenceManager.java | 6 +-
.../jdo/tck/query/jdoql/OrderingSpecification.java | 9 +-
.../jdoql/ParenthesesMarkOperatorPrecedence.java | 27 ++----
.../jdo/tck/query/jdoql/QueryIsSerializable.java | 3 +-
.../jdoql/QueryResultPassedToAnotherQuery.java | 6 +-
.../jdo/tck/query/jdoql/QueryWithNoFilter.java | 3 +-
...ializedQueryInstanceLosesAssociationWithPM.java | 3 +-
.../jdoql/WhiteSpaceIsACharacterAndIgnored.java | 6 +-
.../keywords/UseOfThisToAcessHiddenField.java | 6 +-
.../tck/query/jdoql/methods/EnumMethodOrdinal.java | 3 +-
.../query/jdoql/methods/EnumMethodToString.java | 3 +-
.../MethodsAndObjectConstructionNotSupported.java | 5 +-
.../query/jdoql/methods/SupportedMathMethods.java | 105 +++++++++------------
.../query/jdoql/methods/SupportedTimeMethods.java | 13 +--
.../jdoql/parameters/BoundParameterCheck.java | 3 +-
...eclaredWithSameNameAsFieldOfCandidateClass.java | 3 +-
...eclaredWithSameNameAsFieldOfCandidateClass.java | 6 +-
.../query/result/DistinctCandidateInstances.java | 3 +-
38 files changed, 112 insertions(+), 199 deletions(-)
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/CompileQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/CompileQuery.java
index cd5b1200..ec87669b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/CompileQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/CompileQuery.java
@@ -62,8 +62,7 @@ public class CompileQuery extends QueryTest {
try {
tx.begin();
String params = "Integer param";
- 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(params);
query.setFilter("x == param");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareImports.java b/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareImports.java
index dbf44b9d..8b94f187 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareImports.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareImports.java
@@ -72,8 +72,7 @@ public class DeclareImports extends QueryTest {
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.declareImports("import java.lang.Integer");
query.declareParameters("Integer param");
@@ -104,8 +103,7 @@ public class DeclareImports extends QueryTest {
try {
tx.begin();
- Query<Department> query = pm.newQuery();
- query.setClass(Department.class);
+ Query<Department> query = pm.newQuery(Department.class);
query.setCandidates(pm.getExtent(Department.class, false));
query.declareImports("import org.apache.jdo.tck.pc.company.Employee");
query.declareVariables("Employee e" );
@@ -129,8 +127,7 @@ public class DeclareImports extends QueryTest {
try {
tx.begin();
- Query<Company> query = pm.newQuery();
- query.setClass(Company.class);
+ Query<Company> query = pm.newQuery(Company.class);
query.setCandidates(pm.getExtent(Company.class, false));
query.declareImports("import org.apache.jdo.tck.pc.company.Employee; import org.apache.jdo.tck.pc.company.Department");
query.declareVariables("Department d; Employee e" );
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareParameters.java
index 3034ec6d..b1ad6165 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareParameters.java
@@ -69,8 +69,7 @@ public class DeclareParameters extends QueryTest {
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 param");
query.setFilter("x == param");
@@ -100,8 +99,7 @@ public class DeclareParameters extends QueryTest {
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 param1, Integer param2");
query.setFilter("x == param1 && y == param2");
@@ -131,8 +129,7 @@ public class DeclareParameters extends QueryTest {
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("int a, int b");
query.setFilter("x == a && y == b");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareVariables.java b/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareVariables.java
index b9e7995b..b2946ff8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareVariables.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareVariables.java
@@ -67,8 +67,7 @@ public class DeclareVariables extends QueryTest {
try {
tx.begin();
- Query<Department> query = pm.newQuery();
- query.setClass(Department.class);
+ Query<Department> query = pm.newQuery(Department.class);
query.setCandidates(pm.getExtent(Department.class, false));
query.declareVariables("org.apache.jdo.tck.pc.company.Employee e" );
query.setFilter("employees.contains(e) && e.firstname==\"Michael\"" );
@@ -91,8 +90,7 @@ public class DeclareVariables extends QueryTest {
try {
tx.begin();
- Query<Department> query = pm.newQuery();
- query.setClass(Department.class);
+ Query<Department> query = pm.newQuery(Department.class);
query.setCandidates(pm.getExtent(Department.class, false));
query.declareVariables("org.apache.jdo.tck.pc.company.Employee e; org.apache.jdo.tck.pc.company.Project p;");
query.setFilter("employees.contains(e) && (e.projects.contains(p) && p.projid == 1)");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQuery.java
index 7a590320..a9613b71 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQuery.java
@@ -73,8 +73,7 @@ public class ExecuteQuery extends QueryTest {
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.setFilter("x == 4");
List<PCPoint> results = query.executeList();
@@ -103,8 +102,7 @@ public class ExecuteQuery extends QueryTest {
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 param");
query.setFilter("x == param");
@@ -135,8 +133,7 @@ public class ExecuteQuery extends QueryTest {
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 param1, Integer param2");
query.setFilter("x == param1 && y == param2");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java b/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java
index b4201c15..94fa23c4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java
@@ -74,8 +74,7 @@ public class ExecuteQueryWithArray extends QueryTest {
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 param");
query.setFilter("x == param");
@@ -107,8 +106,7 @@ public class ExecuteQueryWithArray extends QueryTest {
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 param1, Integer param2");
query.setFilter("x == param1 && y == param2");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java b/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java
index 7a546250..feb27924 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java
@@ -75,8 +75,7 @@ public class ExecuteQueryWithMap extends QueryTest {
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 param");
query.setFilter("x == param");
@@ -109,8 +108,7 @@ public class ExecuteQueryWithMap extends QueryTest {
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 param1, Integer param2");
query.setFilter("x == param1 && y == param2");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManager.java b/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManager.java
index f22cb9fc..8dcdaa2c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManager.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManager.java
@@ -70,8 +70,7 @@ public class GetPersistenceManager extends QueryTest {
tx.setOptimistic(false);
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));
PersistenceManager pm1 = query.getPersistenceManager();
@@ -104,8 +103,7 @@ public class GetPersistenceManager extends QueryTest {
tx.setOptimistic(true);
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));
PersistenceManager pm1 = query.getPersistenceManager();
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 e95b90fa..d5263a0e 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
@@ -74,8 +74,7 @@ public class GetPersistenceManagerFromRestoredSerializedQuery
/** */
void serializeQuery(PersistenceManager pm) throws IOException {
- Query<PCPoint> query = pm.newQuery();
- query.setClass(PCPoint.class);
+ Query<PCPoint> query = pm.newQuery(PCPoint.class);
query.setCandidates(pm.getExtent(PCPoint.class, false));
query.setFilter("x == 3");
query.compile();
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 819b87ca..38e84bcd 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
@@ -74,9 +74,8 @@ public class NewQueryFromExistingQueryBoundToPMFromSameVendor extends QueryTest
try {
tx.begin();
- Query<PCPoint> query = pm.newQuery();
- query.setClass(PCPoint.class);
-
+ Query<PCPoint> query = pm.newQuery(PCPoint.class);
+
Query<PCPoint> query1 = pm.newQuery(query);
query1.compile();
@@ -116,8 +115,7 @@ public class NewQueryFromExistingQueryBoundToPMFromSameVendor extends QueryTest
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<PCPoint> query1 = pm.newQuery(query);
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 e6a0b698..9332d59f 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
@@ -72,8 +72,7 @@ public class NewQueryFromRestoredSerializedQuery extends QueryTest {
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.setFilter("x == 3");
query.compile();
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java
index 29935868..f3a6bbfb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java
@@ -64,8 +64,7 @@ public class NewQueryWithCandidateClassAndExtent extends QueryTest {
Extent<PCPoint> extent = pm.getExtent(PCPoint.class, true);
tx.begin();
- Query<PCPoint> query = pm.newQuery();
- query.setClass(PCPoint.class);
+ Query<PCPoint> query = pm.newQuery(PCPoint.class);
query.setCandidates(extent);
Object results = query.execute();
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 36d3cf38..aeb0a5f3 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
@@ -64,8 +64,7 @@ public class NewQueryWithSpecifiedLanguageAndQuery extends QueryTest {
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<PCPoint> query1 = pm.newQuery("javax.jdo.query.JDOQL", query);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java
index df3bd248..507472f6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java
@@ -65,8 +65,7 @@ public class SetCandidateCollection extends QueryTest {
try {
tx.begin();
- Query<PCPoint> query = pm.newQuery();
- query.setClass(PCPoint.class);
+ Query<PCPoint> query = pm.newQuery(PCPoint.class);
query.setCandidates(inserted);
Object results = query.execute();
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java
index 0d1eb824..b1e2c17c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java
@@ -64,8 +64,7 @@ public class SetCandidateExtent extends QueryTest {
Transaction tx = pm.currentTransaction();
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));
Object results = query.execute();
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetIgnoreCache.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetIgnoreCache.java
index 3a593dce..b154b114 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetIgnoreCache.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetIgnoreCache.java
@@ -120,8 +120,7 @@ public class SetIgnoreCache extends QueryTest {
tx.setOptimistic(true);
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));
if (debug)
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetOrdering.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetOrdering.java
index e5444dfe..65e1afd7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetOrdering.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetOrdering.java
@@ -73,8 +73,7 @@ public class SetOrdering extends QueryTest {
tx.begin();
//ascending
- Query<PCPoint> query = pm.newQuery();
- query.setClass(PCPoint.class);
+ Query<PCPoint> query = pm.newQuery(PCPoint.class);
query.setCandidates(pm.getExtent(PCPoint.class, false));
query.setOrdering("x ascending");
Object results = query.execute();
@@ -100,8 +99,7 @@ public class SetOrdering extends QueryTest {
tx.begin();
//descending
- Query<PCPoint> query = pm.newQuery();
- query.setClass(PCPoint.class);
+ Query<PCPoint> query = pm.newQuery(PCPoint.class);
query.setCandidates(pm.getExtent(PCPoint.class, false));
query.setOrdering("x descending");
Object results = query.execute();
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/AssignmentPrePostIncrementDecrementNotSupported.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/AssignmentPrePostIncrementDecrementNotSupported.java
index f791b815..4892c383 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/AssignmentPrePostIncrementDecrementNotSupported.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/AssignmentPrePostIncrementDecrementNotSupported.java
@@ -111,11 +111,10 @@ public class AssignmentPrePostIncrementDecrementNotSupported extends QueryTest {
String filter,
Integer param) {
- Query<PCPoint> query = pm.newQuery();
+ Query<PCPoint> query = pm.newQuery(PCPoint.class);
String params = "Integer param";
String expectedMsg = "setFilter: Syntax error unexpected token ...";
- query.setClass(PCPoint.class);
query.setCandidates(pm.getExtent(PCPoint.class, false));
query.declareParameters(params);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecuteQueryWhenPersistenceManagerIsClosed.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecuteQueryWhenPersistenceManagerIsClosed.java
index 63683ae7..c59018d7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecuteQueryWhenPersistenceManagerIsClosed.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecuteQueryWhenPersistenceManagerIsClosed.java
@@ -68,8 +68,7 @@ public class ExecuteQueryWhenPersistenceManagerIsClosed extends QueryTest {
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.setFilter("x == 4");
query.compile();
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecutingQueryWhenNoTransactionNoNontransactionalRead.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecutingQueryWhenNoTransactionNoNontransactionalRead.java
index af8244cb..4d12832b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecutingQueryWhenNoTransactionNoNontransactionalRead.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecutingQueryWhenNoTransactionNoNontransactionalRead.java
@@ -68,8 +68,7 @@ public class ExecutingQueryWhenNoTransactionNoNontransactionalRead
/** */
void runTestNewQuery(PersistenceManager pm) {
Extent<PCPoint> extent = pm.getExtent(PCPoint.class, true);
- Query<PCPoint> query = pm.newQuery();
- query.setClass(PCPoint.class);
+ Query<PCPoint> query = pm.newQuery(PCPoint.class);
query.setCandidates(extent);
try {
query.execute();
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java
index d5ed8219..f775cd3d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java
@@ -71,13 +71,11 @@ public class MultipleActiveQueryInstanceInSamePersistenceManager extends QueryTe
void executeQueries(PersistenceManager pm) {
// query selecting all point instances
pm.currentTransaction().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 selecting point with x value 0
- Query<PCPoint> query2 = pm.newQuery();
- query2.setClass(PCPoint.class);
+ Query<PCPoint> query2 = pm.newQuery(PCPoint.class);
query2.setCandidates(pm.getExtent(PCPoint.class, false));
query2.setFilter("x == 0");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java
index ffd4582a..5fdc1acf 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java
@@ -153,8 +153,7 @@ public class OrderingSpecification extends QueryTest {
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.setOrdering("x ascending");
Object results = query.execute();
@@ -183,8 +182,7 @@ public class OrderingSpecification extends QueryTest {
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.setOrdering("x descending");
Object results = query.execute();
@@ -218,8 +216,7 @@ public class OrderingSpecification extends QueryTest {
try {
tx.begin();
- Query<AllTypes> query = pm.newQuery();
- query.setClass(AllTypes.class);
+ Query<AllTypes> query = pm.newQuery(AllTypes.class);
query.setCandidates(pm.getExtent(AllTypes.class, false));
StringBuffer buffer = new StringBuffer();
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java
index 361228e2..09499709 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java
@@ -79,8 +79,7 @@ public class ParenthesesMarkOperatorPrecedence extends QueryTest {
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.setFilter("x == (1 + 1)");
Object results = query.execute();
@@ -114,8 +113,7 @@ public class ParenthesesMarkOperatorPrecedence extends QueryTest {
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.setFilter("x == (1 + 1) * 2");
Object results = query.execute();
@@ -149,8 +147,7 @@ public class ParenthesesMarkOperatorPrecedence extends QueryTest {
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.setFilter("x == (9 - 1) * (3 + 5) / 32");
Object results = query.execute();
@@ -185,8 +182,7 @@ public class ParenthesesMarkOperatorPrecedence extends QueryTest {
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.setFilter("x == 2 && y == 2");
Object results = query.execute();
@@ -220,8 +216,7 @@ public class ParenthesesMarkOperatorPrecedence extends QueryTest {
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.setFilter("x == (1 + 1) || y == (1002 - 1000)");
@@ -256,8 +251,7 @@ public class ParenthesesMarkOperatorPrecedence extends QueryTest {
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.setFilter("x == (1 * 2) && true");
Object results = query.execute();
@@ -290,8 +284,7 @@ public class ParenthesesMarkOperatorPrecedence extends QueryTest {
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.setFilter("x == (10000 / 5000) || false");
Object results = query.execute();
@@ -324,8 +317,7 @@ public class ParenthesesMarkOperatorPrecedence extends QueryTest {
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.setFilter("(x == 2) == true");
Object results = query.execute();
@@ -358,8 +350,7 @@ public class ParenthesesMarkOperatorPrecedence extends QueryTest {
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.setFilter("(x == ((21 - 1/1)/10 + 1)) | (false && true)");
Object results = query.execute();
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 39a40b8e..75f9f7d0 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
@@ -110,8 +110,7 @@ public class QueryIsSerializable extends QueryTest {
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.setFilter("x == 3");
query.compile();
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java
index 7afa81f1..ee919a0a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java
@@ -75,8 +75,7 @@ public class QueryResultPassedToAnotherQuery extends QueryTest {
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));
resultCln = query.executeList();
// Create a new collection for the result collection.
@@ -102,8 +101,7 @@ public class QueryResultPassedToAnotherQuery extends QueryTest {
try {
tx.begin();
- Query<PCPoint> query = pm.newQuery();
- query.setClass(PCPoint.class);
+ Query<PCPoint> query = pm.newQuery(PCPoint.class);
query.setCandidates(resultCln);
query.setFilter("x == 1");
Object results = query.execute();
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java
index b180387e..92bd97e2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java
@@ -65,8 +65,7 @@ public class QueryWithNoFilter extends QueryTest {
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));
Object results = query.execute();
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 b75beda5..6f675f38 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
@@ -79,8 +79,7 @@ public class RestoredSerializedQueryInstanceLosesAssociationWithPM
Transaction tx = pm.currentTransaction();
try {
tx.begin();
- Query<Project> query = pm.newQuery();
- query.setClass(Project.class);
+ Query<Project> query = pm.newQuery(Project.class);
query.setCandidates(pm.getExtent(Project.class, false));
query.declareVariables("org.apache.jdo.tck.pc.company.Person a; org.apache.jdo.tck.pc.company.Person b" );
query.setFilter("reviewers.contains(a) && a.firstname==\"brazil\" || reviewers.contains(b) && b.firstname==\"brazil\"" );
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java
index b377d34d..664a140d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java
@@ -90,8 +90,7 @@ public class WhiteSpaceIsACharacterAndIgnored extends QueryTest {
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.setFilter(filter);
expected = query.executeList();
@@ -117,8 +116,7 @@ public class WhiteSpaceIsACharacterAndIgnored extends QueryTest {
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.setFilter(filter);
results = query.executeList();
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java
index 96cdc759..8d9de474 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java
@@ -71,8 +71,7 @@ public class UseOfThisToAcessHiddenField extends QueryTest {
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 x");
query.setFilter("this.x == x");
@@ -108,8 +107,7 @@ public class UseOfThisToAcessHiddenField extends QueryTest {
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("this.y == y");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodOrdinal.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodOrdinal.java
index 11e87c40..16e07fdf 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodOrdinal.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodOrdinal.java
@@ -71,8 +71,7 @@ public class EnumMethodOrdinal extends QueryTest {
List<FieldsOfSimpleEnum> expectedResult = new ArrayList<>();
expectedResult.add((FieldsOfSimpleEnum)pm.getObjectById(oidOfExpectedResult));
- Query<FieldsOfSimpleEnum> q = pm.newQuery();
- q.setClass(FieldsOfSimpleEnum.class);
+ Query<FieldsOfSimpleEnum> q = pm.newQuery(FieldsOfSimpleEnum.class);
q.setFilter(filter);
List<FieldsOfSimpleEnum> results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodToString.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodToString.java
index 23dee77d..46cb10b1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodToString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodToString.java
@@ -71,8 +71,7 @@ public class EnumMethodToString extends QueryTest {
List<FieldsOfSimpleEnum> expectedResult = new ArrayList<>();
expectedResult.add((FieldsOfSimpleEnum)pm.getObjectById(oidOfExpectedResult));
- Query<FieldsOfSimpleEnum> q = pm.newQuery();
- q.setClass(FieldsOfSimpleEnum.class);
+ Query<FieldsOfSimpleEnum> q = pm.newQuery(FieldsOfSimpleEnum.class);
q.setFilter(filter);
List<FieldsOfSimpleEnum> results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/MethodsAndObjectConstructionNotSupported.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/MethodsAndObjectConstructionNotSupported.java
index 83bb8f54..0e8d6af9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/MethodsAndObjectConstructionNotSupported.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/MethodsAndObjectConstructionNotSupported.java
@@ -66,9 +66,8 @@ public class MethodsAndObjectConstructionNotSupported extends QueryTest {
<T> void runTestUnsupportedOperators01(PersistenceManager pm,
Class<T> candidateClass, String filter) {
String expectedMsg = "setFilter: Invalid method call ....";
- Query<T> query = pm.newQuery();
- query.setClass(candidateClass);
-
+ Query<T> query = pm.newQuery(candidateClass);
+
try {
query.setFilter(filter);
query.compile();
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java
index ab75c960..137e776b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java
@@ -483,25 +483,22 @@ public class SupportedMathMethods extends QueryTest {
Collection<MathSample> expectedResult = new ArrayList<>();
expectedResult.add((MathSample)pm.getObjectById(oidOfMath1));
expectedResult.add((MathSample)pm.getObjectById(oidOfMath3));
- Query<MathSample> q = pm.newQuery();
- q.setClass(MathSample.class);
+ Query<MathSample> q = pm.newQuery(MathSample.class);
q.setFilter(filter);
List<MathSample> results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
filter = "Math.sin(angle) < 1.02 && Math.sin(angle) > 0.98";
expectedResult.clear();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath2));
- q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath2));
+ q = pm.newQuery(MathSample.class);
q.setFilter(filter);
results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
filter = "Math.sin(angle) < -0.98 && Math.sin(angle) > -1.02";
expectedResult.clear();
- q = pm.newQuery();
- q.setClass(MathSample.class);
+ q = pm.newQuery(MathSample.class);
q.setFilter(filter);
results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
@@ -530,26 +527,23 @@ public class SupportedMathMethods extends QueryTest {
String filter = "Math.cos(angle) < 0.02 && Math.cos(angle) > -0.02";
Collection<MathSample> expectedResult = new ArrayList<>();
expectedResult.add((MathSample)pm.getObjectById(oidOfMath2));
- Query<MathSample> q = pm.newQuery();
- q.setClass(MathSample.class);
+ Query<MathSample> q = pm.newQuery(MathSample.class);
q.setFilter(filter);
List<MathSample> results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
filter = "Math.cos(angle) < -0.98 && Math.cos(angle) > -1.02";
expectedResult.clear();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath1));
- q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath1));
+ q = pm.newQuery(MathSample.class);
q.setFilter(filter);
results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
filter = "Math.cos(angle) < 1.02 && Math.cos(angle) > 0.98";
expectedResult.clear();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath3));
- q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath3));
+ q = pm.newQuery(MathSample.class);
q.setFilter(filter);
results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
@@ -577,10 +571,9 @@ public class SupportedMathMethods extends QueryTest {
String filter = "Math.tan(angle) < 0.02 && Math.tan(angle) > -0.02";
Collection<MathSample> expectedResult = new ArrayList<>();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath1));
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath3));
- Query<MathSample> q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath1));
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath3));
+ Query<MathSample> q = pm.newQuery(MathSample.class);
q.setFilter(filter);
List<MathSample> results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
@@ -608,27 +601,24 @@ public class SupportedMathMethods extends QueryTest {
String filter = "Math.asin(trigValue) < 0.1 && Math.asin(trigValue) > -0.1";
List<MathSample> expectedResult = new ArrayList<>();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath1));
- Query<MathSample> q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath1));
+ Query<MathSample> q = pm.newQuery(MathSample.class);
q.setFilter(filter);
List<MathSample> results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
filter = "Math.asin(trigValue) < 1.5714 && Math.asin(trigValue) > 1.570";
expectedResult.clear();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath2));
- q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath2));
+ q = pm.newQuery(MathSample.class);
q.setFilter(filter);
results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
filter = "Math.asin(trigValue) < -1.570 && Math.asin(trigValue) > -1.5714";
expectedResult.clear();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath3));
- q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath3));
+ q = pm.newQuery(MathSample.class);
q.setFilter(filter);
results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
@@ -656,27 +646,24 @@ public class SupportedMathMethods extends QueryTest {
String filter = "Math.acos(trigValue) < 1.5714 && Math.acos(trigValue) > 1.570";
Collection<MathSample> expectedResult = new ArrayList<>();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath1));
- Query<MathSample> q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath1));
+ Query<MathSample> q = pm.newQuery(MathSample.class);
q.setFilter(filter);
List<MathSample> results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
filter = "Math.acos(trigValue) < 0.1 && Math.acos(trigValue) > -0.1";
expectedResult.clear();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath2));
- q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath2));
+ q = pm.newQuery(MathSample.class);
q.setFilter(filter);
results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
filter = "Math.acos(trigValue) < 3.147 && Math.acos(trigValue) > 3.14";
expectedResult.clear();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath3));
- q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath3));
+ q = pm.newQuery(MathSample.class);
q.setFilter(filter);
results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
@@ -705,8 +692,7 @@ public class SupportedMathMethods extends QueryTest {
String filter = "Math.atan(trigValue) < 0.5 && Math.atan(trigValue) > -0.5";
Collection<MathSample> expectedResult = new ArrayList<>();
expectedResult.add((MathSample)pm.getObjectById(oidOfMath1));
- Query<MathSample> q = pm.newQuery();
- q.setClass(MathSample.class);
+ Query<MathSample> q = pm.newQuery(MathSample.class);
q.setFilter(filter);
List<MathSample> results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
@@ -734,28 +720,25 @@ public class SupportedMathMethods extends QueryTest {
String filter = "Math.ceil(doubleValue) == 5";
Collection<MathSample> expectedResult = new ArrayList<>();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath1));
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath2));
- Query<MathSample> q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath1));
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath2));
+ Query<MathSample> q = pm.newQuery(MathSample.class);
q.setFilter(filter);
List<MathSample> results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
filter = "Math.ceil(floatValue) == 3";
expectedResult.clear();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath3));
- q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath3));
+ q = pm.newQuery(MathSample.class);
q.setFilter(filter);
results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
filter = "Math.ceil(intValue) == 5";
expectedResult.clear();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath1));
- q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath1));
+ q = pm.newQuery(MathSample.class);
q.setFilter(filter);
results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
@@ -783,28 +766,25 @@ public class SupportedMathMethods extends QueryTest {
String filter = "Math.floor(doubleValue) == 4";
Collection<MathSample> expectedResult = new ArrayList<>();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath1));
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath2));
- Query<MathSample> q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath1));
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath2));
+ Query<MathSample> q = pm.newQuery(MathSample.class);
q.setFilter(filter);
List<MathSample> results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
filter = "Math.floor(floatValue) == 2";
expectedResult.clear();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath3));
- q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath3));
+ q = pm.newQuery(MathSample.class);
q.setFilter(filter);
results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
filter = "Math.floor(intValue) == 4";
expectedResult.clear();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath2));
- q = pm.newQuery();
- q.setClass(MathSample.class);
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath2));
+ q = pm.newQuery(MathSample.class);
q.setFilter(filter);
results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
@@ -832,8 +812,8 @@ public class SupportedMathMethods extends QueryTest {
String filter = "Math.exp(doubleValue) < 85.63 && Math.exp(doubleValue) > 85.62";
Collection<MathSample> expectedResult = new ArrayList<>();
- expectedResult.add((MathSample)pm.getObjectById(oidOfMath2));
- Query<MathSample> q = pm.newQuery();
+ expectedResult.add(pm.getObjectById(MathSample.class, oidOfMath2));
+ Query<MathSample> q = pm.newQuery(MathSample.class);
q.setClass(MathSample.class);
q.setFilter(filter);
List<MathSample> results = q.executeList();
@@ -863,8 +843,7 @@ public class SupportedMathMethods extends QueryTest {
String filter = "Math.log(doubleValue) < 1.4935 && Math.log(doubleValue) > 1.491";
Collection<MathSample> expectedResult = new ArrayList<>();
expectedResult.add((MathSample)pm.getObjectById(oidOfMath2));
- Query<MathSample> q = pm.newQuery();
- q.setClass(MathSample.class);
+ Query<MathSample> q = pm.newQuery(MathSample.class);
q.setFilter(filter);
List<MathSample> results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedTimeMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedTimeMethods.java
index f7eb6c6b..6d1cc5bf 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedTimeMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedTimeMethods.java
@@ -75,10 +75,9 @@ public class SupportedTimeMethods extends QueryTest {
try {
tx.begin();
Collection<TimeSample> expectedResult = new ArrayList<>();
- expectedResult.add((TimeSample)pm.getObjectById(oidOfTime1));
+ expectedResult.add(pm.getObjectById(TimeSample.class, oidOfTime1));
- Query<TimeSample> q = pm.newQuery();
- q.setClass(TimeSample.class);
+ Query<TimeSample> q = pm.newQuery(TimeSample.class);
q.setFilter(filter);
List<TimeSample> results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
@@ -102,8 +101,7 @@ public class SupportedTimeMethods extends QueryTest {
Collection<TimeSample> expectedResult = new ArrayList<>();
expectedResult.add((TimeSample)pm.getObjectById(oidOfTime2));
- Query<TimeSample> q = pm.newQuery();
- q.setClass(TimeSample.class);
+ Query<TimeSample> q = pm.newQuery(TimeSample.class);
q.setFilter(filter);
List<TimeSample> results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
@@ -125,10 +123,9 @@ public class SupportedTimeMethods extends QueryTest {
try {
tx.begin();
Collection<TimeSample> expectedResult = new ArrayList<>();
- expectedResult.add((TimeSample)pm.getObjectById(oidOfTime2));
+ expectedResult.add(pm.getObjectById(TimeSample.class, oidOfTime2));
- Query<TimeSample> q = pm.newQuery();
- q.setClass(TimeSample.class);
+ Query<TimeSample> q = pm.newQuery(TimeSample.class);
q.setFilter(filter);
List<TimeSample> results = q.executeList();
checkQueryResultWithoutOrder(ASSERTION_FAILED, filter, results, expectedResult);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/BoundParameterCheck.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/BoundParameterCheck.java
index b516fd35..937c6fa7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/BoundParameterCheck.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/BoundParameterCheck.java
@@ -67,8 +67,7 @@ public class BoundParameterCheck extends QueryTest {
Transaction tx = pm.currentTransaction();
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( "int a" );
query.setFilter( "x == 0" );
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 e8e81a58..63cd6117 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
@@ -71,8 +71,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 x");
query.setFilter("x == x");
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariableDeclaredWithSameNameAsFieldOfCandidateClass.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariableDeclaredWithSameNameAsFieldOfCandidateClass.java
index 8f8be514..5c128e8a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariableDeclaredWithSameNameAsFieldOfCandidateClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariableDeclaredWithSameNameAsFieldOfCandidateClass.java
@@ -69,8 +69,7 @@ public class VariableDeclaredWithSameNameAsFieldOfCandidateClass extends QueryTe
Transaction tx = pm.currentTransaction();
try {
tx.begin();
- Query<Project> query = pm.newQuery();
- query.setClass(Project.class);
+ Query<Project> query = pm.newQuery(Project.class);
query.setCandidates(pm.getExtent(Project.class, false));
try {
query.declareVariables( "org.apache.jdo.tck.pc.company.Person reviewers;" );
@@ -91,8 +90,7 @@ public class VariableDeclaredWithSameNameAsFieldOfCandidateClass extends QueryTe
try {
tx.begin();
- Query<Project> query = pm.newQuery();
- query.setClass(Project.class);
+ Query<Project> query = pm.newQuery(Project.class);
query.setCandidates(pm.getExtent(Project.class, false));
query.declareVariables( "org.apache.jdo.tck.pc.company.Person reviewers;" );
query.setFilter( "this.reviewers.contains(reviewers) && reviewers.firstname==\"brazil\"" );
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java b/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java
index 9440c9e2..506f1818 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java
@@ -130,8 +130,7 @@ public class DistinctCandidateInstances extends QueryTest {
"SELECT DISTINCT FROM " + Person.class.getName();
List<Person> candidates = getPersistentCompanyModelInstancesAsList(Person.class, "emp1", "emp1");
- Query<Person> query = pm.newQuery();
- query.setClass(Person.class);
+ Query<Person> query = pm.newQuery(Person.class);
query.setCandidates(candidates);
query.setResult("this");
executeJDOQuery(ASSERTION_FAILED, query, singleStringQuery,