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/11 21:14:27 UTC
[db-jdo] branch tck-compiler-warnings updated: JDO-817 removing compiler warnings: QueryElementHolder becomes generic class
This is an automated email from the ASF dual-hosted git repository.
mbo pushed a commit to branch tck-compiler-warnings
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
The following commit(s) were added to refs/heads/tck-compiler-warnings by this push:
new 9d1506d2 JDO-817 removing compiler warnings: QueryElementHolder becomes generic class
9d1506d2 is described below
commit 9d1506d2fda26025ee521cb647626ec19fd151fa
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Mon Jul 11 23:14:17 2022 +0200
JDO-817 removing compiler warnings: QueryElementHolder becomes generic class
---
.../java/org/apache/jdo/tck/query/QueryTest.java | 22 ++++----
.../jdo/tck/query/api/NewQuerySingleString.java | 4 +-
.../tck/query/api/SetterReplacePreviousValues.java | 8 +--
.../jdo/tck/query/delete/DeleteCallback.java | 6 +--
.../jdo/tck/query/delete/DeleteQueryElements.java | 22 ++++----
...nmentPrePostIncrementDecrementNotSupported.java | 3 +-
.../java/org/apache/jdo/tck/query/jdoql/Cast.java | 4 +-
.../query/jdoql/CharacterAndStringLiterals.java | 10 ++--
.../jdoql/ComparingCollectionFieldToNull.java | 2 +-
...omparingPersistentAndNonPersistentInstance.java | 4 +-
.../tck/query/jdoql/DenoteUniquenessInFilter.java | 6 +--
.../org/apache/jdo/tck/query/jdoql/Having.java | 10 ++--
.../query/jdoql/IdentifiersEqualFieldNames.java | 10 ++--
.../apache/jdo/tck/query/jdoql/IfElseInFilter.java | 16 +++---
.../tck/query/jdoql/MultipleIdenticalImports.java | 6 +--
.../query/jdoql/NavigationComparisonWithNull.java | 22 ++++----
.../jdoql/NavigationThroughACollectionField.java | 2 +-
.../jdoql/NavigationThroughANullValuedField.java | 8 +--
...NavigationThroughReferencesUsesDotOperator.java | 8 +--
.../apache/jdo/tck/query/jdoql/NegativeRange.java | 8 +--
.../jdoql/NullCollectionsAndContainsMethod.java | 4 +-
.../tck/query/jdoql/NullCollectionsAndIsEmpty.java | 2 +-
.../jdo/tck/query/jdoql/OrderingSpecification.java | 4 +-
.../apache/jdo/tck/query/jdoql/PositiveRange.java | 8 +--
.../apache/jdo/tck/query/jdoql/RangeAsString.java | 8 +--
.../query/jdoql/SeparateNamespaceForTypeNames.java | 4 +-
.../query/jdoql/keywords/InvalidUseOfKeywords.java | 6 +--
.../query/jdoql/keywords/KeywordsAsFieldNames.java | 8 +--
.../jdo/tck/query/jdoql/keywords/SingleString.java | 2 +-
.../query/jdoql/methods/StartsWithAndEndsWith.java | 4 +-
.../jdoql/methods/SupportedCollectionMethods.java | 16 +++---
.../query/jdoql/methods/SupportedDateMethods.java | 6 +--
.../jdoql/methods/SupportedJDOHelperMethods.java | 8 +--
.../query/jdoql/methods/SupportedListMethods.java | 4 +-
.../query/jdoql/methods/SupportedMapMethods.java | 10 ++--
.../query/jdoql/methods/SupportedMathMethods.java | 24 ++++-----
.../jdoql/methods/SupportedOptionalMethods.java | 4 +-
.../jdoql/methods/SupportedStringMethods.java | 30 +++++------
...dComparisonsBetweenDateFieldsAndParameters.java | 8 +--
...omparisonsBetweenStringFieldsAndParameters.java | 6 +--
.../jdo/tck/query/jdoql/operators/Instanceof.java | 4 +-
.../jdo/tck/query/jdoql/operators/Modulo.java | 2 +-
.../query/jdoql/operators/StringConcatenation.java | 4 +-
.../query/jdoql/parameters/ImplicitParameters.java | 8 +--
.../query/jdoql/parameters/MixedParameters.java | 12 ++---
.../tck/query/jdoql/variables/MixedVariables.java | 10 ++--
.../jdoql/variables/UnconstrainedVariable.java | 2 +-
.../query/jdoql/variables/VariablesAndFields.java | 12 ++---
.../jdoql/variables/VariablesWithoutExtent.java | 2 +-
.../jdo/tck/query/result/AggregateResult.java | 58 +++++++++++-----------
.../apache/jdo/tck/query/result/DefaultResult.java | 2 +-
.../apache/jdo/tck/query/result/DefaultUnique.java | 22 ++++----
.../query/result/DistinctCandidateInstances.java | 4 +-
.../apache/jdo/tck/query/result/DistinctQuery.java | 8 +--
.../org/apache/jdo/tck/query/result/Grouping.java | 6 +--
.../apache/jdo/tck/query/result/IfElseResult.java | 14 +++---
.../jdo/tck/query/result/MethodsInResult.java | 12 ++---
.../jdo/tck/query/result/NPEInResultExpr.java | 4 +-
.../apache/jdo/tck/query/result/NullResults.java | 6 +--
.../tck/query/result/ResultClassRequirements.java | 34 ++++++-------
.../jdo/tck/query/result/ResultExpressions.java | 44 ++++++++--------
.../apache/jdo/tck/query/result/ShapeOfResult.java | 20 ++++----
.../org/apache/jdo/tck/query/result/Unique.java | 6 +--
.../jdo/tck/query/result/VariableInResult.java | 10 ++--
.../result/VariableInResultMultipleNavigation.java | 6 +--
.../query/result/VariableInResultNavigation.java | 10 ++--
66 files changed, 334 insertions(+), 335 deletions(-)
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java b/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java
index 66bc1ca9..bbca4caa 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java
@@ -923,7 +923,7 @@ public abstract class QueryTest extends AbstractReaderTest {
* to succeed or to fail.
*/
protected void compileAPIQuery(String assertion,
- QueryElementHolder queryElementHolder, boolean positive) {
+ QueryElementHolder<?> queryElementHolder, boolean positive) {
if (logger.isDebugEnabled()) {
logger.debug("Compiling API query: " + queryElementHolder);
}
@@ -946,7 +946,7 @@ public abstract class QueryTest extends AbstractReaderTest {
* to succeed or to fail.
*/
protected void compileSingleStringQuery(String assertion,
- QueryElementHolder queryElementHolder, boolean positive) {
+ QueryElementHolder<?> queryElementHolder, boolean positive) {
if (logger.isDebugEnabled())
logger.debug("Compiling single string query: " +
queryElementHolder);
@@ -1000,7 +1000,7 @@ public abstract class QueryTest extends AbstractReaderTest {
* to succeed or to fail.
*/
private void compile(String assertion,
- QueryElementHolder queryElementHolder, boolean asSingleString,
+ QueryElementHolder<?> queryElementHolder, boolean asSingleString,
String singleStringQuery, boolean positive) {
getPM();
try {
@@ -1081,7 +1081,7 @@ public abstract class QueryTest extends AbstractReaderTest {
* @param expectedResult the expected query result.
*/
protected void executeAPIQuery(String assertion,
- QueryElementHolder queryElementHolder, Object expectedResult) {
+ QueryElementHolder<?> queryElementHolder, Object expectedResult) {
if (logger.isDebugEnabled()) {
logger.debug("Executing API query: " + queryElementHolder);
}
@@ -1100,7 +1100,7 @@ public abstract class QueryTest extends AbstractReaderTest {
* @param expectedResult the expected query result.
*/
protected void executeSingleStringQuery(String assertion,
- QueryElementHolder queryElementHolder, Object expectedResult) {
+ QueryElementHolder<?> queryElementHolder, Object expectedResult) {
if (logger.isDebugEnabled())
logger.debug("Executing single string query: " +
queryElementHolder);
@@ -1113,7 +1113,7 @@ public abstract class QueryTest extends AbstractReaderTest {
* @param queryElementHolder query elements
* @param expectedResult expected query result
*/
- protected void executeJDOQLTypedQuery(String assertion, QueryElementHolder queryElementHolder,
+ protected void executeJDOQLTypedQuery(String assertion, QueryElementHolder<?> queryElementHolder,
Object expectedResult) {
executeJDOQLTypedQuery(assertion, queryElementHolder, null, false, expectedResult);
}
@@ -1126,7 +1126,7 @@ public abstract class QueryTest extends AbstractReaderTest {
* @param resultClauseSpecified flag whether result clause is specified
* @param expectedResult the expected query result
*/
- protected void executeJDOQLTypedQuery(String assertion, QueryElementHolder queryElementHolder,
+ protected void executeJDOQLTypedQuery(String assertion, QueryElementHolder<?> queryElementHolder,
Class<?> resultClass, boolean resultClauseSpecified,
Object expectedResult) {
String singleStringQuery = queryElementHolder.toString();
@@ -1207,7 +1207,7 @@ public abstract class QueryTest extends AbstractReaderTest {
* @param expectedResult the expected query result.
* @return the query result
*/
- private Object execute(String assertion, QueryElementHolder queryElementHolder,
+ private Object execute(String assertion, QueryElementHolder<?> queryElementHolder,
boolean asSingleString, Object expectedResult) {
getPM();
Query<?> query = asSingleString ?
@@ -1432,7 +1432,7 @@ public abstract class QueryTest extends AbstractReaderTest {
* @param expectedNrOfDeletedObjects the expected number of deleted objects.
*/
protected void deletePersistentAllByAPIQuery(String assertion,
- QueryElementHolder queryElementHolder,
+ QueryElementHolder<?> queryElementHolder,
long expectedNrOfDeletedObjects) {
if (logger.isDebugEnabled()) {
logger.debug("Deleting persistent by API query: " +
@@ -1456,7 +1456,7 @@ public abstract class QueryTest extends AbstractReaderTest {
* @param expectedNrOfDeletedObjects the expected number of deleted objects.
*/
protected void deletePersistentAllBySingleStringQuery(String assertion,
- QueryElementHolder queryElementHolder, long expectedNrOfDeletedObjects) {
+ QueryElementHolder<?> queryElementHolder, long expectedNrOfDeletedObjects) {
if (logger.isDebugEnabled()) {
logger.debug("Deleting persistent by single string query: " +
queryElementHolder);
@@ -1482,7 +1482,7 @@ public abstract class QueryTest extends AbstractReaderTest {
* @param expectedNrOfDeletedObjects the expected number of deleted objects.
*/
private void delete(String assertion,
- QueryElementHolder queryElementHolder, boolean asSingleString, long expectedNrOfDeletedObjects) {
+ QueryElementHolder<?> queryElementHolder, boolean asSingleString, long expectedNrOfDeletedObjects) {
getPM();
Query<?> query = asSingleString ?
queryElementHolder.getSingleStringQuery(pm) :
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java
index ee9f18a5..ebc272a9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java
@@ -45,8 +45,8 @@ public class NewQuerySingleString extends QueryTest {
* The array of valid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] VALID_QUERIES = {
- new QueryElementHolder(
+ private static final QueryElementHolder<?>[] VALID_QUERIES = {
+ new QueryElementHolder<Person>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java
index 4b9eeccf..05e37c5c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java
@@ -48,9 +48,9 @@ public class SetterReplacePreviousValues extends QueryTest {
* The array of valid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] VALID_QUERIES = {
+ private static final QueryElementHolder<?>[] VALID_QUERIES = {
// replace parameter declaration
- new QueryElementHolder(
+ new QueryElementHolder<Department>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -65,7 +65,7 @@ public class SetterReplacePreviousValues extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
// replace filter setting
- new QueryElementHolder(
+ new QueryElementHolder<Employee>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -80,7 +80,7 @@ public class SetterReplacePreviousValues extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
// replace variable declaration
- new QueryElementHolder(
+ new QueryElementHolder<Department>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteCallback.java b/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteCallback.java
index 46ec774f..b5d7a13e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteCallback.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteCallback.java
@@ -79,8 +79,8 @@ public class DeleteCallback extends QueryTest {
* The array of valid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] VALID_QUERIES = {
- new QueryElementHolder(
+ private static final QueryElementHolder<?>[] VALID_QUERIES = {
+ new QueryElementHolder<Person>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -94,7 +94,7 @@ public class DeleteCallback extends QueryTest {
/*ORDER BY*/ null,
/*FROM*/ null,
/*TO*/ null),
- new QueryElementHolder(
+ new QueryElementHolder<PrimitiveTypes>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java b/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java
index 74eef3ca..5a7aa43a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java
@@ -53,9 +53,9 @@ public class DeleteQueryElements extends QueryTest {
* The array of invalid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] INVALID_QUERIES = {
+ private static final QueryElementHolder<?>[] INVALID_QUERIES = {
// The query is invalid because it defines a result clause.
- new QueryElementHolder(
+ new QueryElementHolder<Insurance>(
/*UNIQUE*/ null,
/*RESULT*/ "carrier",
/*INTO*/ null,
@@ -70,7 +70,7 @@ public class DeleteQueryElements extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
// The query is invalid because it defines a result class.
- new QueryElementHolder(
+ new QueryElementHolder<Insurance>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ String.class,
@@ -86,7 +86,7 @@ public class DeleteQueryElements extends QueryTest {
/*TO*/ null),
// The query is invalid because it defines a result clause
// and a result class.
- new QueryElementHolder(
+ new QueryElementHolder<Insurance>(
/*UNIQUE*/ null,
/*RESULT*/ "carrier",
/*INTO*/ String.class,
@@ -101,7 +101,7 @@ public class DeleteQueryElements extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
// The query is invalid because it defines a grouping clause.
- new QueryElementHolder(
+ new QueryElementHolder<Insurance>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -117,7 +117,7 @@ public class DeleteQueryElements extends QueryTest {
/*TO*/ null),
// The query is invalid because it defines a result clause
// and a grouping clause
- new QueryElementHolder(
+ new QueryElementHolder<Insurance>(
/*UNIQUE*/ null,
/*RESULT*/ "carrier",
/*INTO*/ null,
@@ -132,7 +132,7 @@ public class DeleteQueryElements extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
// The query is invalid because it defines an ordering clause.
- new QueryElementHolder(
+ new QueryElementHolder<Insurance>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -147,7 +147,7 @@ public class DeleteQueryElements extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
// The query is invalid because it defines a range clause.
- new QueryElementHolder(
+ new QueryElementHolder<Insurance>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -164,7 +164,7 @@ public class DeleteQueryElements extends QueryTest {
// The query is valid but deletePersistentAll is expected
// to throw a JDOUserException because it defines a
// unique clause but it affects multiple rows in the database.
- new QueryElementHolder(
+ new QueryElementHolder<Insurance>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ null,
/*INTO*/ null,
@@ -199,7 +199,7 @@ public class DeleteQueryElements extends QueryTest {
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("limit", new BigDecimal("2500000"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<DentalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ null,
/*INTO*/ null,
@@ -226,7 +226,7 @@ public class DeleteQueryElements extends QueryTest {
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("limit", new BigDecimal("2500000"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<DentalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ null,
/*INTO*/ null,
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 75526208..f791b815 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
@@ -84,10 +84,9 @@ public class AssignmentPrePostIncrementDecrementNotSupported extends QueryTest {
/** */
void runTestUnsupportedOperators01(PersistenceManager pm, String filter) {
- Query<PCPoint> query = pm.newQuery();
+ Query<PCPoint> query = pm.newQuery(PCPoint.class);
String expectedMsg = "setFilter: Syntax error unexpected token ...";
- query.setClass(PCPoint.class);
query.setCandidates(pm.getExtent(PCPoint.class, false));
try {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Cast.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Cast.java
index 624324b6..a3c0bf16 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Cast.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Cast.java
@@ -69,7 +69,7 @@ public class Cast extends QueryTest {
QFullTimeEmployee cast = (QFullTimeEmployee)cand.cast(FullTimeEmployee.class);
query.filter(cast.salary.gt(15000.0));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -103,7 +103,7 @@ public class Cast extends QueryTest {
QFullTimeEmployee cast = (QFullTimeEmployee)e.cast(FullTimeEmployee.class);
query.filter(cand.employees.contains(e).and(cast.salary.gt(15000.0)));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java
index 6377be91..fb46addd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java
@@ -51,8 +51,8 @@ public class CharacterAndStringLiterals extends QueryTest {
* The array of invalid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] INVALID_QUERIES = {
- new QueryElementHolder(
+ private static final QueryElementHolder<?>[] INVALID_QUERIES = {
+ new QueryElementHolder<PrimitiveTypes>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -66,7 +66,7 @@ public class CharacterAndStringLiterals extends QueryTest {
/*ORDER BY*/ null,
/*FROM*/ null,
/*TO*/ null),
- new QueryElementHolder(
+ new QueryElementHolder<PrimitiveTypes>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -101,7 +101,7 @@ public class CharacterAndStringLiterals extends QueryTest {
QPrimitiveTypes cand = QPrimitiveTypes.candidate();
query.filter(cand.stringNull.startsWith("Even").or(cand.charNotNull.eq('0')));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<PrimitiveTypes> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -133,7 +133,7 @@ public class CharacterAndStringLiterals extends QueryTest {
QPrimitiveTypes cand = QPrimitiveTypes.candidate();
query.filter(cand.stringNull.startsWith("Even").or(cand.charNotNull.eq('0')));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<PrimitiveTypes> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java
index 0c7a6b94..c095cb2f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java
@@ -68,7 +68,7 @@ public class ComparingCollectionFieldToNull extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.personid.eq(1L).and(cand.projects.eq(null)));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java
index 4dccc107..5562100e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java
@@ -70,7 +70,7 @@ public class ComparingPersistentAndNonPersistentInstance
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("param", getTransientCompanyModelInstance(Employee.class, "emp1"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -105,7 +105,7 @@ public class ComparingPersistentAndNonPersistentInstance
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("param", getTransientCompanyModelInstance(Employee.class, "emp1"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java
index 0899a4e4..a38b88b3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java
@@ -77,7 +77,7 @@ public class DenoteUniquenessInFilter extends QueryTest {
query.filter(cand.employees.contains(e1).and(e1.personid.eq(1l).and(
cand.employees.contains(e2).and(e2.weeklyhours.eq(40d)))));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -114,7 +114,7 @@ public class DenoteUniquenessInFilter extends QueryTest {
query.filter(cand.employees.contains(e1).and(e1.personid.eq(3l).and(
cand.employees.contains(e2).and(e2.weeklyhours.eq(19d).and(e1.ne(e2))))));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -154,7 +154,7 @@ public class DenoteUniquenessInFilter extends QueryTest {
query.filter(cand.employees.contains(e1).and(e1.personid.eq(1l).and(
cand.employees.contains(e2).and(e2.weeklyhours.eq(40d).and(e1.ne(e2))))));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Having.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Having.java
index 487d9793..6785ed88 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Having.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Having.java
@@ -50,9 +50,9 @@ public class Having extends QueryTest {
* The array of invalid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] INVALID_QUERIES = {
+ private static final QueryElementHolder<?>[] INVALID_QUERIES = {
// HAVING clause is not a boolean expression
- new QueryElementHolder(
+ new QueryElementHolder<Employee>(
/*UNIQUE*/ null,
/*RESULT*/ "department, AVG(weeklyhours)",
/*INTO*/ null,
@@ -67,7 +67,7 @@ public class Having extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
// HAVING clause is a non-aggregate expression using a non-grouping field
- new QueryElementHolder(
+ new QueryElementHolder<Employee>(
/*UNIQUE*/ null,
/*RESULT*/ "department, AVG(weeklyhours)",
/*INTO*/ null,
@@ -107,7 +107,7 @@ public class Having extends QueryTest {
query.groupBy(cand.department).having(cand.department.count().gt(0L));
query.result(false, cand.department, cand.weeklyhours.avg());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "department, AVG(weeklyhours)",
/*INTO*/ null,
@@ -145,7 +145,7 @@ public class Having extends QueryTest {
query.groupBy(cand.department).having(cand.personid.count().gt(1L));
query.result(false, cand.department, cand.weeklyhours.avg());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "department, AVG(weeklyhours)",
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java
index 01f0d21f..2607a817 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java
@@ -66,7 +66,7 @@ public class IdentifiersEqualFieldNames extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.eq("emp1First"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -97,7 +97,7 @@ public class IdentifiersEqualFieldNames extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.personid.lt((long)Byte.MAX_VALUE));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -127,7 +127,7 @@ public class IdentifiersEqualFieldNames extends QueryTest {
QDepartment cand = QDepartment.candidate();
query.filter(cand.employees.size().gt(org.apache.jdo.tck.pc.company.Department.RECOMMENDED_NO_OF_EMPS));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -157,7 +157,7 @@ public class IdentifiersEqualFieldNames extends QueryTest {
QDepartment cand = QDepartment.candidate();
query.filter(cand.employees.size().gt(Department.RECOMMENDED_NO_OF_EMPS));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -187,7 +187,7 @@ public class IdentifiersEqualFieldNames extends QueryTest {
QDepartment cand = QDepartment.candidate();
query.filter(cand.employees.size().gt(Department.RECOMMENDED_NO_OF_EMPS));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java
index 8c45ea8c..66b24b1d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java
@@ -52,9 +52,9 @@ public class IfElseInFilter extends QueryTest {
* The array of invalid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] INVALID_QUERIES = {
+ private static final QueryElementHolder<?>[] INVALID_QUERIES = {
// Invalid type of condition expression
- new QueryElementHolder(
+ new QueryElementHolder<Employee>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -69,7 +69,7 @@ public class IfElseInFilter extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
// missing ELSE
- new QueryElementHolder(
+ new QueryElementHolder<DentalInsurance>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -84,7 +84,7 @@ public class IfElseInFilter extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
// type of THEN expr must be the same as type of ELSE expr
- new QueryElementHolder(
+ new QueryElementHolder<DentalInsurance>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -121,7 +121,7 @@ public class IfElseInFilter extends QueryTest {
query.filter(cand.salary.gt(ifExpr));
query.orderBy(cand.personid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -154,7 +154,7 @@ public class IfElseInFilter extends QueryTest {
query.filter(ifExpr.eq(cand.department.deptid));
query.orderBy(cand.personid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -190,7 +190,7 @@ public class IfElseInFilter extends QueryTest {
query.filter(ifExpr.eq(2));
query.orderBy(cand.personid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -227,7 +227,7 @@ public class IfElseInFilter extends QueryTest {
query.ifThen(cond1, 1).ifThen(cond2, 2).ifThen(cond3, 3).elseEnd(4);
query.filter(ifExpr.eq(2));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java
index 7b25529a..0c39cf27 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java
@@ -73,7 +73,7 @@ public class MultipleIdenticalImports extends QueryTest {
paramValues.put("d", getPersistentCompanyModelInstance(Department.class, "dept1"));
// Import Department twice
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -111,7 +111,7 @@ public class MultipleIdenticalImports extends QueryTest {
paramValues.put("d", getPersistentCompanyModelInstance(Department.class, "dept1"));
// Import Department explictly and per type-import-on-demand
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -149,7 +149,7 @@ public class MultipleIdenticalImports extends QueryTest {
paramValues.put("d", getPersistentCompanyModelInstance(Department.class, "dept1"));
// type-import-on-demand twice
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationComparisonWithNull.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationComparisonWithNull.java
index 89abea88..8bd8bfe1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationComparisonWithNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationComparisonWithNull.java
@@ -94,7 +94,7 @@ public class NavigationComparisonWithNull extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.manager.eq((Employee)null));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -127,7 +127,7 @@ public class NavigationComparisonWithNull extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.manager.ne((Employee)null));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -160,7 +160,7 @@ public class NavigationComparisonWithNull extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.manager.eq((Employee)null).not());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -195,7 +195,7 @@ public class NavigationComparisonWithNull extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.manager.manager.eq((Employee)null));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -229,7 +229,7 @@ public class NavigationComparisonWithNull extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.manager.ne((Employee)null).and(cand.manager.manager.eq((Employee)null)));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -262,7 +262,7 @@ public class NavigationComparisonWithNull extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.manager.manager.ne((Employee)null));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -296,7 +296,7 @@ public class NavigationComparisonWithNull extends QueryTest {
QEmployee e = QEmployee.variable("e");
query.filter(cand.manager.manager.eq((Employee)null).not());
- QueryElementHolder holder =new QueryElementHolder(
+ QueryElementHolder<Employee> holder =new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -330,7 +330,7 @@ public class NavigationComparisonWithNull extends QueryTest {
QMedicalInsurance cand = QMedicalInsurance.candidate();
query.filter(cand.employee.manager.manager.eq((Employee)null));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<MedicalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -365,7 +365,7 @@ public class NavigationComparisonWithNull extends QueryTest {
query.filter(cand.employee.ne((Employee)null).and(cand.employee.manager.ne((Employee)null))
.and(cand.employee.manager.manager.eq((Employee)null)));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<MedicalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -400,7 +400,7 @@ public class NavigationComparisonWithNull extends QueryTest {
QMedicalInsurance cand = QMedicalInsurance.candidate();
query.filter(cand.employee.manager.manager.ne((Employee)null));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<MedicalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -433,7 +433,7 @@ public class NavigationComparisonWithNull extends QueryTest {
QMedicalInsurance cand = QMedicalInsurance.candidate();
query.filter(cand.employee.manager.manager.eq((Employee)null).not());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<MedicalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java
index 0cd189cd..6a0971cb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java
@@ -77,7 +77,7 @@ public class NavigationThroughACollectionField extends QueryTest {
QEmployee e = QEmployee.variable("e");
query.filter(cand.employees.contains(e).and(e.firstname.eq("emp1First")));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java
index fcb685c8..bf14ea4c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java
@@ -82,7 +82,7 @@ public class NavigationThroughANullValuedField extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.medicalInsurance.carrier.eq("Carrier1"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -113,7 +113,7 @@ public class NavigationThroughANullValuedField extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.manager.lastname.eq("emp4Last"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -143,7 +143,7 @@ public class NavigationThroughANullValuedField extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.manager.manager.lastname.eq("emp0Last"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -176,7 +176,7 @@ public class NavigationThroughANullValuedField extends QueryTest {
QEmployee e = QEmployee.variable("e");
query.filter(cand.employees.contains(e).and(e.medicalInsurance.carrier.eq("Carrier1")));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java
index eca789ac..915ba12f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java
@@ -77,7 +77,7 @@ public class NavigationThroughReferencesUsesDotOperator extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.medicalInsurance.carrier.eq("Carrier1"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -108,7 +108,7 @@ public class NavigationThroughReferencesUsesDotOperator extends QueryTest {
QMedicalInsurance cand = QMedicalInsurance.candidate();
query.filter(cand.employee.department.name.eq("Development"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<MedicalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -139,7 +139,7 @@ public class NavigationThroughReferencesUsesDotOperator extends QueryTest {
QMedicalInsurance cand = QMedicalInsurance.candidate();
query.filter(cand.employee.manager.firstname.eq("emp1First"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<MedicalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -170,7 +170,7 @@ public class NavigationThroughReferencesUsesDotOperator extends QueryTest {
QMedicalInsurance cand = QMedicalInsurance.candidate();
query.filter(cand.employee.manager.manager.firstname.eq("emp0First"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<MedicalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java
index aefa0d51..24f74413 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java
@@ -61,7 +61,7 @@ public class NegativeRange extends QueryTest {
JDOQLTypedQuery<Person> query = getPM().newJDOQLTypedQuery(Person.class);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -88,7 +88,7 @@ public class NegativeRange extends QueryTest {
JDOQLTypedQuery<Person> query = getPM().newJDOQLTypedQuery(Person.class);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -115,7 +115,7 @@ public class NegativeRange extends QueryTest {
JDOQLTypedQuery<Person> query = getPM().newJDOQLTypedQuery(Person.class);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ null,
/*INTO*/ null,
@@ -142,7 +142,7 @@ public class NegativeRange extends QueryTest {
JDOQLTypedQuery<Person> query = getPM().newJDOQLTypedQuery(Person.class);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java
index e071fe28..7150c551 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java
@@ -74,7 +74,7 @@ public class NullCollectionsAndContainsMethod extends QueryTest {
paramValues.put("p", getPersistentCompanyModelInstance(Project.class, "proj1"));
// contains
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -111,7 +111,7 @@ public class NullCollectionsAndContainsMethod extends QueryTest {
paramValues.put("p", getPersistentCompanyModelInstance(Project.class, "proj1"));
// contains
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java
index 6612d177..4198f730 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java
@@ -63,7 +63,7 @@ public class NullCollectionsAndIsEmpty extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.personid.eq(1L).and(cand.projects.isEmpty()));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
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 754f8e56..ffd4582a 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
@@ -81,7 +81,7 @@ public class OrderingSpecification extends QueryTest {
QDentalInsurance cand = QDentalInsurance.candidate();
query.orderBy(cand.lifetimeOrthoBenefit.asc().nullsFirst());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<DentalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -113,7 +113,7 @@ public class OrderingSpecification extends QueryTest {
QDentalInsurance cand = QDentalInsurance.candidate();
query.orderBy(cand.lifetimeOrthoBenefit.asc().nullsLast());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<DentalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java
index b357240f..3922f9be 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java
@@ -60,7 +60,7 @@ public class PositiveRange extends QueryTest {
QPerson cand = QPerson.candidate();
query.orderBy(cand.personid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -90,7 +90,7 @@ public class PositiveRange extends QueryTest {
QPerson cand = QPerson.candidate();
query.orderBy(cand.personid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -120,7 +120,7 @@ public class PositiveRange extends QueryTest {
QPerson cand = QPerson.candidate();
query.orderBy(cand.personid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -149,7 +149,7 @@ public class PositiveRange extends QueryTest {
QPerson cand = QPerson.candidate();
query.orderBy(cand.personid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java
index 8088f22f..b88ca73c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java
@@ -61,7 +61,7 @@ public class RangeAsString extends QueryTest {
QPerson cand = QPerson.candidate();
query.orderBy(cand.personid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -91,7 +91,7 @@ public class RangeAsString extends QueryTest {
QPerson cand = QPerson.candidate();
query.orderBy(cand.personid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -121,7 +121,7 @@ public class RangeAsString extends QueryTest {
QPerson cand = QPerson.candidate();
query.orderBy(cand.personid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -151,7 +151,7 @@ public class RangeAsString extends QueryTest {
QPerson cand = QPerson.candidate();
query.orderBy(cand.personid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java
index 676a6224..31329bed 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java
@@ -74,7 +74,7 @@ public class SeparateNamespaceForTypeNames extends QueryTest {
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("Department", getPersistentCompanyModelInstance(Department.class, "dept1"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -107,7 +107,7 @@ public class SeparateNamespaceForTypeNames extends QueryTest {
QEmployee variable = QEmployee.variable("Employee");
query.filter(cand.employees.contains(variable).and(variable.firstname.eq("emp1First")));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/InvalidUseOfKeywords.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/InvalidUseOfKeywords.java
index 664a26c4..512eb536 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/InvalidUseOfKeywords.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/InvalidUseOfKeywords.java
@@ -53,8 +53,8 @@ public class InvalidUseOfKeywords extends QueryTest {
* The array of invalid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] INVALID_QUERIES = {
- new QueryElementHolder(
+ private static final QueryElementHolder<?>[] INVALID_QUERIES = {
+ new QueryElementHolder<Person>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -68,7 +68,7 @@ public class InvalidUseOfKeywords extends QueryTest {
/*ORDER BY*/ null,
/*FROM*/ null,
/*TO*/ null),
- new QueryElementHolder(
+ new QueryElementHolder<Person>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/KeywordsAsFieldNames.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/KeywordsAsFieldNames.java
index 8ae51b2b..99d50d60 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/KeywordsAsFieldNames.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/KeywordsAsFieldNames.java
@@ -43,8 +43,8 @@ public class KeywordsAsFieldNames extends QueryTest {
* The array of invalid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] INVALID_QUERIES = {
- new QueryElementHolder(
+ private static final QueryElementHolder<?>[] INVALID_QUERIES = {
+ new QueryElementHolder<JDOQLKeywordsAsFieldNames>(
/*UNIQUE*/ null,
/*RESULT*/ "select",
/*INTO*/ null,
@@ -64,8 +64,8 @@ public class KeywordsAsFieldNames extends QueryTest {
* The array of valid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] VALID_QUERIES = {
- new QueryElementHolder(
+ private static final QueryElementHolder<?>[] VALID_QUERIES = {
+ new QueryElementHolder<JDOQLKeywordsAsFieldNames>(
/*UNIQUE*/ null,
/*RESULT*/ "this.select",
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java
index 6f38db7e..9d5f0d29 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java
@@ -64,7 +64,7 @@ public class SingleString extends QueryTest {
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("limit", new BigDecimal("2000"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.FALSE,
/*RESULT*/ "firstname AS firstName, lastname AS lastName",
/*INTO*/ FullName.class,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java
index f9a49f3b..066412b3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java
@@ -66,7 +66,7 @@ public class StartsWithAndEndsWith extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.firstname.startsWith("emp1"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -97,7 +97,7 @@ public class StartsWithAndEndsWith extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.firstname.endsWith("1First"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
index 809d2dda..2a1a8f00 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
@@ -73,7 +73,7 @@ public class SupportedCollectionMethods extends QueryTest {
QEmployee eVariable = QEmployee.variable("e");
query.filter(cand.employees.contains(eVariable).and(eVariable.personid.eq(1L)));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -108,7 +108,7 @@ public class SupportedCollectionMethods extends QueryTest {
Expression<Employee> paramExpression = query.parameter("e", Employee.class);
query.filter(cand.employees.contains(paramExpression));
- holder = new QueryElementHolder(
+ holder = new QueryElementHolder<Department>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -140,7 +140,7 @@ public class SupportedCollectionMethods extends QueryTest {
QDepartment cand = QDepartment.candidate();
query.filter(cand.employees.isEmpty().not());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -169,7 +169,7 @@ public class SupportedCollectionMethods extends QueryTest {
QEmployee empCand = QEmployee.candidate();
query2.filter(empCand.team.isEmpty());
- holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder2 = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -186,9 +186,9 @@ public class SupportedCollectionMethods extends QueryTest {
/*JDOQLTyped*/ query2,
/*paramValues*/ null);
- executeAPIQuery(ASSERTION_FAILED, holder, expectedResult2);
- executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult2);
- executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expectedResult2);
+ executeAPIQuery(ASSERTION_FAILED, holder2, expectedResult2);
+ executeSingleStringQuery(ASSERTION_FAILED, holder2, expectedResult2);
+ executeJDOQLTypedQuery(ASSERTION_FAILED, holder2, expectedResult2);
}
/** */
@@ -200,7 +200,7 @@ public class SupportedCollectionMethods extends QueryTest {
QDepartment cand = QDepartment.candidate();
query.filter(cand.employees.size().eq(3));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedDateMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedDateMethods.java
index b7fbc221..b8e05370 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedDateMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedDateMethods.java
@@ -65,7 +65,7 @@ public class SupportedDateMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.birthdate.getDay().eq(10));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -95,7 +95,7 @@ public class SupportedDateMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.birthdate.getMonth().eq(5));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -125,7 +125,7 @@ public class SupportedDateMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.birthdate.getYear().eq(1970));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
index 26d32ce7..d45b563f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
@@ -78,7 +78,7 @@ public class SupportedJDOHelperMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.result(false, cand.jdoObjectId());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "JDOHelper.getObjectId(this)",
/*INTO*/ null,
@@ -114,7 +114,7 @@ public class SupportedJDOHelperMethods extends QueryTest {
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("oid", JDOHelper.getObjectId(expectedResult.get(0)));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -153,7 +153,7 @@ public class SupportedJDOHelperMethods extends QueryTest {
QVersionedPCPoint cand = QVersionedPCPoint.candidate();
query.result(false, cand.jdoVersion());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<VersionedPCPoint> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "JDOHelper.getVersion(this)",
/*INTO*/ null,
@@ -186,7 +186,7 @@ public class SupportedJDOHelperMethods extends QueryTest {
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("ver", Long.valueOf(1));
- holder = new QueryElementHolder(
+ holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
index c1fa757e..9b49bcde 100755
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
@@ -79,7 +79,7 @@ public class SupportedListMethods extends QueryTest {
paramValues.put("room1", getPersistentCompanyModelInstance(MeetingRoom.class, "room2"));
getPM().currentTransaction().commit();
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -111,7 +111,7 @@ public class SupportedListMethods extends QueryTest {
query.result(false, cand.meetingRooms.get(1));
query.filter(cand.deptid.eq(1L));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "meetingRooms.get(1)",
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java
index 60be2e3d..dac4721e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java
@@ -69,7 +69,7 @@ public class SupportedMapMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.phoneNumbers.get("home").eq("1111"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -100,7 +100,7 @@ public class SupportedMapMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.phoneNumbers.containsKey("home"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -130,7 +130,7 @@ public class SupportedMapMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.phoneNumbers.containsValue("1111"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -160,7 +160,7 @@ public class SupportedMapMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.phoneNumbers.isEmpty());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -191,7 +191,7 @@ public class SupportedMapMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.phoneNumbers.size().eq(2));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
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 dccc66ac..ab75c960 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
@@ -88,7 +88,7 @@ public class SupportedMathMethods extends QueryTest {
QPrimitiveTypes cand = QPrimitiveTypes.candidate();
query.filter(cand.intNotNull.abs().eq(4));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<PrimitiveTypes> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -119,7 +119,7 @@ public class SupportedMathMethods extends QueryTest {
QPrimitiveTypes cand = QPrimitiveTypes.candidate();
query.filter(cand.intNull.abs().eq(4));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<PrimitiveTypes> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -150,7 +150,7 @@ public class SupportedMathMethods extends QueryTest {
QPrimitiveTypes cand = QPrimitiveTypes.candidate();
query.filter(cand.longNotNull.abs().eq(4L));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<PrimitiveTypes> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -181,7 +181,7 @@ public class SupportedMathMethods extends QueryTest {
QPrimitiveTypes cand = QPrimitiveTypes.candidate();
query.filter(cand.longNull.abs().eq(4L));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<PrimitiveTypes> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -213,7 +213,7 @@ public class SupportedMathMethods extends QueryTest {
query.filter(cand.floatNotNull.abs().lt(4.1f).
and(cand.floatNotNull.abs().gt(3.9f)));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<PrimitiveTypes> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -246,7 +246,7 @@ public class SupportedMathMethods extends QueryTest {
query.filter(cand.floatNull.abs().lt(4.1f).
and(cand.floatNull.abs().gt(3.9f)));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<PrimitiveTypes> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -279,7 +279,7 @@ public class SupportedMathMethods extends QueryTest {
query.filter(cand.doubleNotNull.abs().lt(4.1).
and(cand.doubleNotNull.abs().gt(3.9)));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<PrimitiveTypes> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -312,7 +312,7 @@ public class SupportedMathMethods extends QueryTest {
query.filter(cand.doubleNull.abs().lt(4.1).
and(cand.doubleNull.abs().gt(3.9)));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<PrimitiveTypes> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -344,7 +344,7 @@ public class SupportedMathMethods extends QueryTest {
query.filter(cand.doubleNotNull.gt(0d).and(cand.doubleNotNull.sqrt().lt(2.1).
and(cand.doubleNotNull.sqrt().gt(1.9))));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<PrimitiveTypes> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -377,7 +377,7 @@ public class SupportedMathMethods extends QueryTest {
query.filter(cand.doubleNull.gt(0d).and(cand.doubleNull.sqrt().lt(2.1).
and(cand.doubleNull.sqrt().gt(1.9))));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<PrimitiveTypes> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -410,7 +410,7 @@ public class SupportedMathMethods extends QueryTest {
query.filter(cand.intNotNull.gt(0).and(cand.intNotNull.sqrt().lt(2.1).
and(cand.intNotNull.sqrt().gt(1.9))));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<PrimitiveTypes> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -443,7 +443,7 @@ public class SupportedMathMethods extends QueryTest {
query.filter(cand.intNull.gt(0).and(cand.intNull.sqrt().lt(2.1).
and(cand.intNull.sqrt().gt(1.9))));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<PrimitiveTypes> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
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 05d69130..2407fbb9 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
@@ -144,7 +144,7 @@ public class SupportedOptionalMethods extends QueryTest {
}
private void checkQuery(String filter, Object ... resultOids) {
- QueryElementHolder qeh = new QueryElementHolder(
+ QueryElementHolder<OptionalSample> qeh = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -373,7 +373,7 @@ public class SupportedOptionalMethods extends QueryTest {
}
private void checkQuery(String filter, String paramDecl, Map<String, Object> paramValues, Object[] result) {
- QueryElementHolder qeh = new QueryElementHolder(
+ QueryElementHolder<OptionalSample> qeh = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java
index 1f7ac3df..6102d5c4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java
@@ -77,7 +77,7 @@ public class SupportedStringMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.toLowerCase().eq("emp1first"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -107,7 +107,7 @@ public class SupportedStringMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.toUpperCase().eq("EMP1FIRST"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -137,7 +137,7 @@ public class SupportedStringMethods extends QueryTest {
QDepartment cand = QDepartment.candidate();
query.filter(cand.name.indexOf("e").eq(1));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -167,7 +167,7 @@ public class SupportedStringMethods extends QueryTest {
QDepartment cand = QDepartment.candidate();
query.filter(cand.name.indexOf("e", 2).eq(3));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -198,7 +198,7 @@ public class SupportedStringMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.matches(".*First"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -229,7 +229,7 @@ public class SupportedStringMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.matches("emp.First"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -258,7 +258,7 @@ public class SupportedStringMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.matches("(?i)EMP1FIRST"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -289,7 +289,7 @@ public class SupportedStringMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.substring(4).eq("First"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -320,7 +320,7 @@ public class SupportedStringMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.substring(4,9).eq("First"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -351,7 +351,7 @@ public class SupportedStringMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.startsWith("emp"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -382,7 +382,7 @@ public class SupportedStringMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.endsWith("First"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -413,7 +413,7 @@ public class SupportedStringMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.startsWith("mp", 1));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -444,7 +444,7 @@ public class SupportedStringMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.length().eq(9));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -474,7 +474,7 @@ public class SupportedStringMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.charAt(3).eq('1'));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -504,7 +504,7 @@ public class SupportedStringMethods extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.trim().eq("emp1First"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
index e9f8e582..ae0560fe 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
@@ -97,7 +97,7 @@ public class EqualityAndComparisonsBetweenDateFieldsAndParameters
paramValues.put("param", FIRST_OF_JAN_1999);
// date field == date parameter
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -135,7 +135,7 @@ public class EqualityAndComparisonsBetweenDateFieldsAndParameters
paramValues.put("param", FIRST_OF_JAN_1999);
// date field >= date parameter
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -172,8 +172,8 @@ public class EqualityAndComparisonsBetweenDateFieldsAndParameters
paramValues.put("param", FIRST_OF_JAN_1999);
// Import Department twice
- QueryElementHolder holder = // date parameter < date field
- new QueryElementHolder(
+ QueryElementHolder<Employee> holder = // date parameter < date field
+ new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java
index 8f8817f2..eaa218e3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java
@@ -70,7 +70,7 @@ public class EqualityAndComparisonsBetweenStringFieldsAndParameters
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("param", "emp1First");
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -104,7 +104,7 @@ public class EqualityAndComparisonsBetweenStringFieldsAndParameters
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("param", "emp1First");
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -137,7 +137,7 @@ public class EqualityAndComparisonsBetweenStringFieldsAndParameters
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("param", "emp2First");
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Instanceof.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Instanceof.java
index 5e8005de..2206e85e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Instanceof.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Instanceof.java
@@ -61,7 +61,7 @@ public class Instanceof extends QueryTest {
query.filter(cand.mentor.instanceOf(PartTimeEmployee.class));
// Import Department twice
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -91,7 +91,7 @@ public class Instanceof extends QueryTest {
query.filter(cand.mentor.instanceOf(PartTimeEmployee.class));
// Import Department twice
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Modulo.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Modulo.java
index d670ccd8..960fd811 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Modulo.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Modulo.java
@@ -65,7 +65,7 @@ public class Modulo extends QueryTest {
query.filter(cand.personid.mod(2).eq(0L));
// Import Department twice
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java
index 26f47e7e..19fb4070 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java
@@ -68,7 +68,7 @@ public class StringConcatenation extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.filter(cand.firstname.eq("emp1" + "First"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -102,7 +102,7 @@ public class StringConcatenation extends QueryTest {
paramValues.put("param", "emp1FirstExt");
// Import Department twice
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ImplicitParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ImplicitParameters.java
index 47a4ad44..456d02c4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ImplicitParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ImplicitParameters.java
@@ -67,7 +67,7 @@ public class ImplicitParameters extends QueryTest {
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("param", PARAMETER);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "this, :param",
/*INTO*/ null,
@@ -96,7 +96,7 @@ public class ImplicitParameters extends QueryTest {
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("param", "emp1First");
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -127,7 +127,7 @@ public class ImplicitParameters extends QueryTest {
paramValues.put("minValue", Long.valueOf(3));
// Import Department twice
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "department.name",
/*INTO*/ null,
@@ -159,7 +159,7 @@ public class ImplicitParameters extends QueryTest {
paramValues.put("five", Long.valueOf(5));
// Import Department twice
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/MixedParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/MixedParameters.java
index 43b6b1cd..8a0bba4a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/MixedParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/MixedParameters.java
@@ -43,8 +43,8 @@ public class MixedParameters extends QueryTest {
* The array of invalid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] INVALID_QUERIES = {
- new QueryElementHolder(
+ private static final QueryElementHolder<?>[] INVALID_QUERIES = {
+ new QueryElementHolder<Person>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -58,7 +58,7 @@ public class MixedParameters extends QueryTest {
/*ORDER BY*/ null,
/*FROM*/ null,
/*TO*/ null),
- new QueryElementHolder(
+ new QueryElementHolder<Person>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -78,8 +78,8 @@ public class MixedParameters extends QueryTest {
* The array of valid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] VALID_QUERIES = {
- new QueryElementHolder(
+ private static final QueryElementHolder<?>[] VALID_QUERIES = {
+ new QueryElementHolder<Person>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -93,7 +93,7 @@ public class MixedParameters extends QueryTest {
/*ORDER BY*/ null,
/*FROM*/ null,
/*TO*/ null),
- new QueryElementHolder(
+ new QueryElementHolder<Person>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/MixedVariables.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/MixedVariables.java
index ed561d72..0dcfddd1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/MixedVariables.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/MixedVariables.java
@@ -44,8 +44,8 @@ public class MixedVariables extends QueryTest {
* The array of invalid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] INVALID_QUERIES = {
- new QueryElementHolder(
+ private static final QueryElementHolder<?>[] INVALID_QUERIES = {
+ new QueryElementHolder<Employee>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -66,8 +66,8 @@ public class MixedVariables extends QueryTest {
* The array of valid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] VALID_QUERIES = {
- new QueryElementHolder(
+ private static final QueryElementHolder<?>[] VALID_QUERIES = {
+ new QueryElementHolder<Employee>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -82,7 +82,7 @@ public class MixedVariables extends QueryTest {
/*ORDER BY*/ null,
/*FROM*/ null,
/*TO*/ null),
- new QueryElementHolder(
+ new QueryElementHolder<Employee>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/UnconstrainedVariable.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/UnconstrainedVariable.java
index 1c9d4776..3ff358c5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/UnconstrainedVariable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/UnconstrainedVariable.java
@@ -71,7 +71,7 @@ public class UnconstrainedVariable extends QueryTest {
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("id", Integer.valueOf(1));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java
index 759f088d..3ef95b05 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java
@@ -74,7 +74,7 @@ public class VariablesAndFields extends QueryTest {
QEmployee e = QEmployee.variable("e");
query.filter(cand.team.contains(e).and(e.firstname.eq("emp1First")));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -105,7 +105,7 @@ public class VariablesAndFields extends QueryTest {
QEmployee e = QEmployee.variable("e");
query.filter(cand.team.contains(e).and(e.firstname.eq("emp1First")));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -135,7 +135,7 @@ public class VariablesAndFields extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.firstname.eq("emp1First"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -166,7 +166,7 @@ public class VariablesAndFields extends QueryTest {
QEmployee manager = QEmployee.variable("manager");
query.filter(cand.team.contains(manager).and(manager.firstname.eq("emp1First")));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -196,7 +196,7 @@ public class VariablesAndFields extends QueryTest {
QEmployee manager = QEmployee.variable("manager");
query.filter(cand.team.contains(cand.manager).and(cand.manager.firstname.eq("emp1First")));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -226,7 +226,7 @@ public class VariablesAndFields extends QueryTest {
QEmployee employee = QEmployee.variable("employee");
query.filter(cand.team.contains(employee).and(employee.firstname.eq("emp1First")));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/* Note: the variable name is the same as the class
* name except for capitalization. This is legal. */
/*UNIQUE*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesWithoutExtent.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesWithoutExtent.java
index 0de72e58..60be574b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesWithoutExtent.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesWithoutExtent.java
@@ -62,7 +62,7 @@ public class VariablesWithoutExtent extends QueryTest {
Object expected = new LinkedList<>();
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/AggregateResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/AggregateResult.java
index 0caf6481..b8efb37c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/AggregateResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/AggregateResult.java
@@ -58,9 +58,9 @@ public class AggregateResult extends QueryTest {
* The array of invalid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] INVALID_QUERIES = {
+ private static final QueryElementHolder<?>[] INVALID_QUERIES = {
// SUM
- new QueryElementHolder(
+ new QueryElementHolder<FullTimeEmployee>(
/*UNIQUE*/ null,
/*RESULT*/ "SUM(firstname)",
/*INTO*/ null,
@@ -94,7 +94,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cand = QFullTimeEmployee.candidate();
query.result(false, cand.count());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "COUNT(this)",
/*INTO*/ null,
@@ -126,7 +126,7 @@ public class AggregateResult extends QueryTest {
query.result(false, cand.count());
query.filter(cand.personid.eq(0L));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "COUNT(this)",
/*INTO*/ null,
@@ -157,7 +157,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cand = QFullTimeEmployee.candidate();
query.result(false, cand.manager.count());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "COUNT(manager)",
/*INTO*/ null,
@@ -188,7 +188,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cand = QFullTimeEmployee.candidate();
query.result(false, cand.manager.personid.count());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "COUNT(manager.personid)",
/*INTO*/ null,
@@ -219,7 +219,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cand = QFullTimeEmployee.candidate();
query.result(false, cand.manager.countDistinct());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "COUNT(DISTINCT manager)",
/*INTO*/ null,
@@ -250,7 +250,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cand = QFullTimeEmployee.candidate();
query.result(false, cand.personid.sum());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "SUM(personid)",
/*INTO*/ null,
@@ -281,7 +281,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cand = QFullTimeEmployee.candidate();
query.result(false, cand.salary.sum());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "SUM(salary)",
/*INTO*/ null,
@@ -313,7 +313,7 @@ public class AggregateResult extends QueryTest {
QProject cand = QProject.candidate();
query.result(false, cand.budget.sum());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Project> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "SUM(budget)",
/*INTO*/ null,
@@ -345,7 +345,7 @@ public class AggregateResult extends QueryTest {
query.result(false, cand.budget.sum());
query.filter(cand.projid.eq(0L));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Project> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "SUM(budget)",
/*INTO*/ null,
@@ -379,7 +379,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cast = (QFullTimeEmployee)cand.manager.cast(FullTimeEmployee.class);
query.result(false, cast.salary.sum());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "SUM(((FullTimeEmployee)manager).salary)",
/*INTO*/ null,
@@ -413,7 +413,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cast = (QFullTimeEmployee)cand.manager.cast(FullTimeEmployee.class);
query.result(false, cast.salary.sumDistinct());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "SUM(DISTINCT ((FullTimeEmployee)manager).salary)",
/*INTO*/ null,
@@ -444,7 +444,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cand = QFullTimeEmployee.candidate();
query.result(false, cand.personid.min());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "MIN(personid)",
/*INTO*/ null,
@@ -475,7 +475,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cand = QFullTimeEmployee.candidate();
query.result(false, cand.salary.min());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "MIN(salary)",
/*INTO*/ null,
@@ -506,7 +506,7 @@ public class AggregateResult extends QueryTest {
QProject cand = QProject.candidate();
query.result(false, cand.budget.min());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Project> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "MIN(budget)",
/*INTO*/ null,
@@ -538,7 +538,7 @@ public class AggregateResult extends QueryTest {
query.result(false, cand.budget.min());
query.filter(cand.projid.eq(0L));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Project> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "MIN(budget)",
/*INTO*/ null,
@@ -572,7 +572,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cast = (QFullTimeEmployee)cand.manager.cast(FullTimeEmployee.class);
query.result(false, cast.salary.min());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "MIN(((FullTimeEmployee)manager).salary)",
/*INTO*/ null,
@@ -602,7 +602,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cand = QFullTimeEmployee.candidate();
query.result(false, cand.personid.max());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "MAX(personid)",
/*INTO*/ null,
@@ -633,7 +633,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cand = QFullTimeEmployee.candidate();
query.result(false, cand.salary.max());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "MAX(salary)",
/*INTO*/ null,
@@ -664,7 +664,7 @@ public class AggregateResult extends QueryTest {
QProject cand = QProject.candidate();
query.result(false, cand.budget.max());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Project> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "MAX(budget)",
/*INTO*/ null,
@@ -696,7 +696,7 @@ public class AggregateResult extends QueryTest {
query.result(false, cand.budget.max());
query.filter(cand.projid.eq(0L));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Project> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "MAX(budget)",
/*INTO*/ null,
@@ -730,7 +730,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cast = (QFullTimeEmployee)cand.manager.cast(FullTimeEmployee.class);
query.result(false, cast.salary.max());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "MAX(((FullTimeEmployee)manager).salary)",
/*INTO*/ null,
@@ -761,7 +761,7 @@ public class AggregateResult extends QueryTest {
QPerson cand = QPerson.candidate();
query.result(false, cand.personid.avg());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "AVG(personid)",
/*INTO*/ null,
@@ -792,7 +792,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cand = QFullTimeEmployee.candidate();
query.result(false, cand.salary.avg());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "AVG(salary)",
/*INTO*/ null,
@@ -823,7 +823,7 @@ public class AggregateResult extends QueryTest {
QDentalInsurance cand = QDentalInsurance.candidate();
query.result(false, cand.lifetimeOrthoBenefit.avg());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<DentalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "AVG(lifetimeOrthoBenefit)",
/*INTO*/ null,
@@ -855,7 +855,7 @@ public class AggregateResult extends QueryTest {
query.result(false, cand.lifetimeOrthoBenefit.avg());
query.filter(cand.insid.eq(0L));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<DentalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "AVG(lifetimeOrthoBenefit)",
/*INTO*/ null,
@@ -889,7 +889,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cast = (QFullTimeEmployee)cand.manager.cast(FullTimeEmployee.class);
query.result(false, cast.salary.avg());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "AVG(((FullTimeEmployee)manager).salary)",
/*INTO*/ null,
@@ -923,7 +923,7 @@ public class AggregateResult extends QueryTest {
QFullTimeEmployee cast = (QFullTimeEmployee)cand.manager.cast(FullTimeEmployee.class);
query.result(false, cast.salary.avgDistinct());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "AVG(DISTINCT ((FullTimeEmployee)manager).salary)",
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultResult.java
index b0755fe1..6428c259 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultResult.java
@@ -58,7 +58,7 @@ public class DefaultResult extends QueryTest {
JDOQLTypedQuery<Person> query = getPM().newJDOQLTypedQuery(Person.class);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultUnique.java b/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultUnique.java
index f8a889dd..e7085b40 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultUnique.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultUnique.java
@@ -66,7 +66,7 @@ public class DefaultUnique extends QueryTest {
JDOQLTypedQuery<Employee> query = getPM().newJDOQLTypedQuery(Employee.class);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -92,7 +92,7 @@ public class DefaultUnique extends QueryTest {
public void testAggregateNoGrouping0() {
Object expected = Long.valueOf(5);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "COUNT(department)",
/*INTO*/ null,
@@ -117,7 +117,7 @@ public class DefaultUnique extends QueryTest {
public void testAggregateNoGrouping1() {
Object expected = Double.valueOf("99.997");
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<DentalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "avg(lifetimeOrthoBenefit)",
/*INTO*/ null,
@@ -142,7 +142,7 @@ public class DefaultUnique extends QueryTest {
public void testAggregateNoGrouping2() {
Object expected = new BigDecimal("2000.99");
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Project> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "MIN(budget)",
/*INTO*/ null,
@@ -167,7 +167,7 @@ public class DefaultUnique extends QueryTest {
public void testAggregateNoGrouping3() {
Object expected = new BigDecimal("2500000.99");
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Project> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "MAX(budget)",
/*INTO*/ null,
@@ -192,7 +192,7 @@ public class DefaultUnique extends QueryTest {
public void testAggregateNoGrouping4() {
Object expected = new BigDecimal("2552001.98");
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Project> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "SUM (budget)",
/*INTO*/ null,
@@ -222,7 +222,7 @@ public class DefaultUnique extends QueryTest {
query.result(false, cand.department.count());
query.groupBy(cand.department);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "count(department)",
/*INTO*/ null,
@@ -254,7 +254,7 @@ public class DefaultUnique extends QueryTest {
query.result(false, cand.lifetimeOrthoBenefit.avg());
query.groupBy(cand.employee.department);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<DentalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "AVG(lifetimeOrthoBenefit)",
/*INTO*/ null,
@@ -286,7 +286,7 @@ public class DefaultUnique extends QueryTest {
query.result(false, cand.lifetimeOrthoBenefit.min());
query.groupBy(cand.employee.department);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<DentalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "min(lifetimeOrthoBenefit)",
/*INTO*/ null,
@@ -318,7 +318,7 @@ public class DefaultUnique extends QueryTest {
query.result(false, cand.lifetimeOrthoBenefit.max());
query.groupBy(cand.employee.department);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<DentalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "MAX(lifetimeOrthoBenefit)",
/*INTO*/ null,
@@ -350,7 +350,7 @@ public class DefaultUnique extends QueryTest {
query.result(false, cand.lifetimeOrthoBenefit.sum());
query.groupBy(cand.employee.department);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<DentalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "sum(lifetimeOrthoBenefit)",
/*INTO*/ null,
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 a99e8fc7..9440c9e2 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
@@ -67,7 +67,7 @@ public class DistinctCandidateInstances extends QueryTest {
JDOQLTypedQuery<Employee> query = getPM().newJDOQLTypedQuery(Employee.class);
query.variable("p", Person.class);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -100,7 +100,7 @@ public class DistinctCandidateInstances extends QueryTest {
query.result(true, cand);
query.variable("p", Person.class);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "DISTINCT",
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctQuery.java
index 5473b7b5..9a2a86a3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctQuery.java
@@ -66,7 +66,7 @@ public class DistinctQuery extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.result(false, cand.department);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "department",
/*INTO*/ null,
@@ -96,7 +96,7 @@ public class DistinctQuery extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.result(true, cand.department);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "DISTINCT department",
/*INTO*/ null,
@@ -131,7 +131,7 @@ public class DistinctQuery extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.result(false, cand.department.deptid, cand.department.name);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "department.deptid, department.name",
/*INTO*/ null,
@@ -163,7 +163,7 @@ public class DistinctQuery extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.result(true, cand.department.deptid, cand.department.name);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "DISTINCT department.deptid, department.name",
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/Grouping.java b/tck/src/main/java/org/apache/jdo/tck/query/result/Grouping.java
index 0eebae34..e4332f35 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/Grouping.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/Grouping.java
@@ -54,8 +54,8 @@ public class Grouping extends QueryTest {
* The array of invalid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] INVALID_QUERIES = {
- new QueryElementHolder(
+ private static final QueryElementHolder<?>[] INVALID_QUERIES = {
+ new QueryElementHolder<FullTimeEmployee>(
/*UNIQUE*/ null,
/*RESULT*/ "department, salary",
/*INTO*/ null,
@@ -91,7 +91,7 @@ public class Grouping extends QueryTest {
query.result(false, cand.department, cand.salary.sum());
query.groupBy(cand.department);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "department, SUM(salary)",
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java
index 9f5b40e5..5b5cc527 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java
@@ -52,9 +52,9 @@ public class IfElseResult extends QueryTest {
* The array of invalid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] INVALID_QUERIES = {
+ private static final QueryElementHolder<?>[] INVALID_QUERIES = {
// Invalid type of condition expression
- new QueryElementHolder(
+ new QueryElementHolder<Employee>(
/*UNIQUE*/ null,
/*RESULT*/ "IF (this.firstname) 0 ELSE 1",
/*INTO*/ null,
@@ -69,7 +69,7 @@ public class IfElseResult extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
// missing ELSE
- new QueryElementHolder(
+ new QueryElementHolder<DentalInsurance>(
/*UNIQUE*/ null,
/*RESULT*/ "IF (this.employee == null) 0",
/*INTO*/ null,
@@ -84,7 +84,7 @@ public class IfElseResult extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
// type of THEN expr must be the same as type of ELSE expr
- new QueryElementHolder(
+ new QueryElementHolder<DentalInsurance>(
/*UNIQUE*/ null,
/*RESULT*/ "IF (this.employee == null) 'Michael' ELSE this.employee",
/*INTO*/ null,
@@ -119,7 +119,7 @@ public class IfElseResult extends QueryTest {
query.ifThenElse(cand.employee.eq((Employee)null), "No employee", cand.employee.lastname));
query.orderBy(cand.insid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<DentalInsurance> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "IF (this.employee == null) 'No employee' ELSE this.employee.lastname",
/*INTO*/ null,
@@ -153,7 +153,7 @@ public class IfElseResult extends QueryTest {
cand.budget.mul(new BigDecimal("1.2")), cand.budget.mul(new BigDecimal("1.1"))));
query.orderBy(cand.projid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Project> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "IF (this.members.size() > 2) this.budget * 1.2 ELSE this.budget * 1.1",
/*INTO*/ null,
@@ -186,7 +186,7 @@ public class IfElseResult extends QueryTest {
query.result(false, ifThenElse);
query.orderBy(cand.projid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Project> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "IF (this.reviewers.isEmpty()) 'No reviewer' " +
"ELSE IF (this.reviewers.size() == 1) 'Single reviewer' ELSE 'Reviewer team'",
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java
index 559438af..330cb861 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java
@@ -66,7 +66,7 @@ public class MethodsInResult extends QueryTest {
query.result(false, cand.employees.size());
query.orderBy(cand.name.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "this.employees.size()",
/*INTO*/ null,
@@ -98,7 +98,7 @@ public class MethodsInResult extends QueryTest {
query.result(false, cand.phoneNumbers.size());
query.orderBy(cand.lastname.asc(), cand.firstname.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "this.phoneNumbers.size()",
/*INTO*/ null,
@@ -128,7 +128,7 @@ public class MethodsInResult extends QueryTest {
QDepartment cand = QDepartment.candidate();
query.result(false, cand.employees.size().max());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "MAX(this.employees.size())",
/*INTO*/ null,
@@ -159,7 +159,7 @@ public class MethodsInResult extends QueryTest {
query.result(false, cand.phoneNumbers.get("home"));
query.orderBy(cand.lastname.asc(), cand.firstname.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "this.phoneNumbers.get('home')",
/*INTO*/ null,
@@ -190,7 +190,7 @@ public class MethodsInResult extends QueryTest {
query.result(false, cand.firstname.substring(1, 4));
query.orderBy(cand.lastname.asc(), cand.firstname.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "this.firstname.substring(1,4)",
/*INTO*/ null,
@@ -222,7 +222,7 @@ public class MethodsInResult extends QueryTest {
query.result(false, cand.firstname.indexOf("First"));
query.orderBy(cand.lastname.asc(), cand.firstname.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "this.firstname.indexOf('First')",
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java b/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java
index 17d224da..278dbb71 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java
@@ -66,7 +66,7 @@ public class NPEInResultExpr extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.result(false, cand.manager.lastname);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "manager.lastname",
/*INTO*/ null,
@@ -98,7 +98,7 @@ public class NPEInResultExpr extends QueryTest {
query.filter(cand.employees.contains(e));
query.result(false, e.manager.lastname);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "e.manager.lastname",
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/NullResults.java b/tck/src/main/java/org/apache/jdo/tck/query/result/NullResults.java
index f3930731..7360d26f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/NullResults.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/NullResults.java
@@ -64,7 +64,7 @@ public class NullResults extends QueryTest {
query.filter(cand.lastname.eq("emp2Last"));
query.result(false, cand.manager);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "manager",
/*INTO*/ null,
@@ -95,7 +95,7 @@ public class NullResults extends QueryTest {
query.filter(cand.lastname.eq("emp2Last"));
query.result(false, cand.manager);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "manager",
/*INTO*/ null,
@@ -125,7 +125,7 @@ public class NullResults extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.result(true, cand.manager);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "DISTINCT manager",
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java b/tck/src/main/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java
index 56c28f43..5fa1f79f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java
@@ -58,9 +58,9 @@ public class ResultClassRequirements extends QueryTest {
* The array of invalid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] INVALID_QUERIES = {
+ private static final QueryElementHolder<?>[] INVALID_QUERIES = {
// JDK class
- new QueryElementHolder(
+ new QueryElementHolder<FullTimeEmployee>(
/*UNIQUE*/ null,
/*RESULT*/ "personid, lastname",
/*INTO*/ Long.class,
@@ -76,7 +76,7 @@ public class ResultClassRequirements extends QueryTest {
/*TO*/ null),
// JDK class, non assignment compatible
- new QueryElementHolder(
+ new QueryElementHolder<FullTimeEmployee>(
/*UNIQUE*/ null,
/*RESULT*/ "this",
/*INTO*/ Long.class,
@@ -92,7 +92,7 @@ public class ResultClassRequirements extends QueryTest {
/*TO*/ null),
// TCK class, salary field is not assignment compatible
- new QueryElementHolder(
+ new QueryElementHolder<FullTimeEmployee>(
/*UNIQUE*/ null,
/*RESULT*/ "personid AS l, salary AS s",
/*INTO*/ LongString.class,
@@ -108,7 +108,7 @@ public class ResultClassRequirements extends QueryTest {
/*TO*/ null),
// TCK class, non existing constructor
- new QueryElementHolder(
+ new QueryElementHolder<FullTimeEmployee>(
/*UNIQUE*/ null,
/*RESULT*/ "new LongString(personid)",
/*INTO*/ null,
@@ -124,7 +124,7 @@ public class ResultClassRequirements extends QueryTest {
/*TO*/ null),
// TCK class, no no-args constructor
- new QueryElementHolder(
+ new QueryElementHolder<FullTimeEmployee>(
/*UNIQUE*/ null,
/*RESULT*/ "personid",
/*INTO*/ MissingNoArgsConstructor.class,
@@ -140,7 +140,7 @@ public class ResultClassRequirements extends QueryTest {
/*TO*/ null),
// TCK class, no no-args constructor
- new QueryElementHolder(
+ new QueryElementHolder<FullTimeEmployee>(
/*UNIQUE*/ null,
/*RESULT*/ "personid",
/*INTO*/ NoFieldsNoMethods.class,
@@ -191,7 +191,7 @@ public class ResultClassRequirements extends QueryTest {
QFullTimeEmployee cand = QFullTimeEmployee.candidate();
query.result(false, cand.personid);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "personid",
/*INTO*/ Long.class,
@@ -221,7 +221,7 @@ public class ResultClassRequirements extends QueryTest {
QFullTimeEmployee cand = QFullTimeEmployee.candidate();
query.result(false, cand.salary);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "salary",
/*INTO*/ Double.class,
@@ -252,7 +252,7 @@ public class ResultClassRequirements extends QueryTest {
QProject cand = QProject.candidate();
query.result(false, cand.budget);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Project> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "budget",
/*INTO*/ BigDecimal.class,
@@ -285,7 +285,7 @@ public class ResultClassRequirements extends QueryTest {
QFullTimeEmployee cand = QFullTimeEmployee.candidate();
query.result(false, cand.hiredate);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "hiredate",
/*INTO*/ java.util.Date.class,
@@ -319,7 +319,7 @@ public class ResultClassRequirements extends QueryTest {
// JDOQLTypedQuery API: Map Result
query.result(false, cand.personid.as("id"), cand.lastname.as("name"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "personid AS id, lastname AS name",
/*INTO*/ Map.class,
@@ -353,7 +353,7 @@ public class ResultClassRequirements extends QueryTest {
// JDOQLTypedQuery API: user defined class
query.result(false, cand.personid.as("l"), cand.lastname.as("s"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "personid AS l, lastname AS s",
/*INTO*/ LongString.class,
@@ -387,7 +387,7 @@ public class ResultClassRequirements extends QueryTest {
// JDOQLTypedQuery API: constructor
query.result(false, cand.personid, cand.lastname);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "new LongString(personid, lastname)",
/*INTO*/ null,
@@ -421,7 +421,7 @@ public class ResultClassRequirements extends QueryTest {
// JDOQLTypedQuery API: constructor
query.result(false, cand.personid, cand.lastname);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "personid, lastname",
/*INTO*/ LongString.class,
@@ -455,7 +455,7 @@ public class ResultClassRequirements extends QueryTest {
// JDOQLTypedQuery API:
query.result(false, cand.personid.as("l"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "personid AS l",
/*INTO*/ PublicLongField.class,
@@ -489,7 +489,7 @@ public class ResultClassRequirements extends QueryTest {
// JDOQLTypedQuery API: constructor
query.result(false, cand.personid.as("personid"), cand.lastname.as("lastname"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<FullTimeEmployee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "personid, lastname",
/*INTO*/ PublicPutMethod.class,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java b/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java
index 381e7ce2..e7e5801c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java
@@ -59,9 +59,9 @@ public class ResultExpressions extends QueryTest {
* The array of invalid queries which may be executed as
* single string queries and as API queries.
*/
- private static final QueryElementHolder[] INVALID_QUERIES = {
+ private static final QueryElementHolder<?>[] INVALID_QUERIES = {
// unknown field x
- new QueryElementHolder(
+ new QueryElementHolder<Employee>(
/*UNIQUE*/ null,
/*RESULT*/ "x",
/*INTO*/ null,
@@ -76,7 +76,7 @@ public class ResultExpressions extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
// field salary is declared in a subclass of the candidate class
- new QueryElementHolder(
+ new QueryElementHolder<Employee>(
/*UNIQUE*/ null,
/*RESULT*/ "salary",
/*INTO*/ null,
@@ -91,7 +91,7 @@ public class ResultExpressions extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
// project collection field
- new QueryElementHolder(
+ new QueryElementHolder<Department>(
/*UNIQUE*/ null,
/*RESULT*/ "employees",
/*INTO*/ null,
@@ -106,7 +106,7 @@ public class ResultExpressions extends QueryTest {
/*FROM*/ null,
/*TO*/ null),
// project map field
- new QueryElementHolder(
+ new QueryElementHolder<Employee>(
/*UNIQUE*/ null,
/*RESULT*/ "phoneNumbers",
/*INTO*/ null,
@@ -142,7 +142,7 @@ public class ResultExpressions extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.result(false, cand);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "this",
/*INTO*/ null,
@@ -173,7 +173,7 @@ public class ResultExpressions extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.result(false, cand.personid);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "personid",
/*INTO*/ null,
@@ -205,7 +205,7 @@ public class ResultExpressions extends QueryTest {
query.result(false, p.projid);
query.filter(cand.projects.contains(p).and(cand.personid.eq(1l)));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "p.projid",
/*INTO*/ null,
@@ -237,7 +237,7 @@ public class ResultExpressions extends QueryTest {
query.result(false, variable);
query.filter(cand.projects.contains(variable).and(cand.personid.eq(1l)));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "p",
/*INTO*/ null,
@@ -268,7 +268,7 @@ public class ResultExpressions extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.result(false, cand.count());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "COUNT(this)",
/*INTO*/ null,
@@ -301,7 +301,7 @@ public class ResultExpressions extends QueryTest {
query.result(false, p.count());
query.filter(cand.projects.contains(p).and(cand.personid.eq(1l)));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "COUNT(p)",
/*INTO*/ null,
@@ -332,7 +332,7 @@ public class ResultExpressions extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.result(false, cand.personid.sum());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "SUM(personid)",
/*INTO*/ null,
@@ -363,7 +363,7 @@ public class ResultExpressions extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.result(false, cand.personid.min());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "MIN(personid)",
/*INTO*/ null,
@@ -394,7 +394,7 @@ public class ResultExpressions extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.result(false, cand.personid.max());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "MAX(personid)",
/*INTO*/ null,
@@ -425,7 +425,7 @@ public class ResultExpressions extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.result(false, cand.personid.avg());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "AVG(personid)",
/*INTO*/ null,
@@ -457,7 +457,7 @@ public class ResultExpressions extends QueryTest {
QPerson cand = QPerson.candidate();
query.result(false, cand.personid.add(1));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "personid + 1",
/*INTO*/ null,
@@ -489,7 +489,7 @@ public class ResultExpressions extends QueryTest {
QEmployee cand = QEmployee.candidate();
query.result(false, cand.personid);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "this.personid",
/*INTO*/ null,
@@ -524,7 +524,7 @@ public class ResultExpressions extends QueryTest {
query.result(true, e.department.name);
query.filter(cand.team.contains(eExpr).and(cand.personid.eq(2l)));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "distinct e.department.name",
/*INTO*/ null,
@@ -561,7 +561,7 @@ public class ResultExpressions extends QueryTest {
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("p", getPersistentCompanyModelInstance(Project.class, "proj1"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "p.projid",
/*INTO*/ null,
@@ -593,7 +593,7 @@ public class ResultExpressions extends QueryTest {
query.result(false, cand.department.deptid);
query.filter(cand.personid.eq(1l));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "department.deptid",
/*INTO*/ null,
@@ -630,7 +630,7 @@ public class ResultExpressions extends QueryTest {
Map<String, Object> paramValues = new HashMap<>();
paramValues.put("p", getPersistentCompanyModelInstance(Project.class, "proj1"));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "p",
/*INTO*/ null,
@@ -662,7 +662,7 @@ public class ResultExpressions extends QueryTest {
query.result(false, cand.manager.cast(FullTimeEmployee.class));
query.filter(cand.personid.eq(1l));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "(FullTimeEmployee)manager",
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/ShapeOfResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/ShapeOfResult.java
index e44a63d9..8aa27722 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/ShapeOfResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/ShapeOfResult.java
@@ -63,7 +63,7 @@ public class ShapeOfResult extends QueryTest {
JDOQLTypedQuery<Person> query = getPM().newJDOQLTypedQuery(Person.class);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ null,
/*INTO*/ null,
@@ -94,7 +94,7 @@ public class ShapeOfResult extends QueryTest {
QPerson cand = QPerson.candidate();
query.result(false, cand);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "this AS Person",
/*INTO*/ null,
@@ -125,7 +125,7 @@ public class ShapeOfResult extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.personid.eq(1l));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ null,
/*INTO*/ null,
@@ -157,7 +157,7 @@ public class ShapeOfResult extends QueryTest {
query.filter(cand.personid.eq(1l));
query.result(false, cand);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "this AS Person",
/*INTO*/ null,
@@ -188,7 +188,7 @@ public class ShapeOfResult extends QueryTest {
QPerson cand = QPerson.candidate();
query.result(false, cand.firstname);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "firstname",
/*INTO*/ null,
@@ -220,7 +220,7 @@ public class ShapeOfResult extends QueryTest {
query.filter(cand.personid.eq(1l));
query.result(false, cand.firstname);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "firstname",
/*INTO*/ null,
@@ -256,7 +256,7 @@ public class ShapeOfResult extends QueryTest {
QPerson cand = QPerson.candidate();
query.result(false, cand.firstname, cand.lastname);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "firstname, lastname",
/*INTO*/ null,
@@ -288,7 +288,7 @@ public class ShapeOfResult extends QueryTest {
query.filter(cand.personid.eq(1l));
query.result(false, cand.firstname, cand.lastname);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "firstname, lastname",
/*INTO*/ null,
@@ -325,7 +325,7 @@ public class ShapeOfResult extends QueryTest {
// JDOQLTypedQuery API
query.result(false, cand.firstname, cand.lastname);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "firstname, lastname",
/*INTO*/ FullName.class,
@@ -358,7 +358,7 @@ public class ShapeOfResult extends QueryTest {
// JDOQLTypedQuery API
query.result(false, cand.firstname, cand.lastname);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ "firstname, lastname",
/*INTO*/ FullName.class,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/Unique.java b/tck/src/main/java/org/apache/jdo/tck/query/result/Unique.java
index b2f77fb9..9a637524 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/Unique.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/Unique.java
@@ -67,7 +67,7 @@ public class Unique extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.personid.eq(1l));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ null,
/*INTO*/ null,
@@ -97,7 +97,7 @@ public class Unique extends QueryTest {
QPerson cand = QPerson.candidate();
query.filter(cand.personid.eq(0l));
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ null,
/*INTO*/ null,
@@ -127,7 +127,7 @@ public class Unique extends QueryTest {
QPerson cand = QPerson.candidate();
query.orderBy(cand.personid.asc());
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Person> holder = new QueryElementHolder<>(
/*UNIQUE*/ Boolean.TRUE,
/*RESULT*/ null,
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java
index 36feec3e..5acd2962 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java
@@ -80,7 +80,7 @@ public class VariableInResult extends QueryTest {
query.filter(cand.employees.contains(e));
query.result(true, e);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "distinct e",
/*INTO*/ null,
@@ -113,7 +113,7 @@ public class VariableInResult extends QueryTest {
query.filter(cand.projects.contains(p).and(p.name.eq("orange")));
query.result(true, p.projid, p.name);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "distinct p.projid, p.name",
/*INTO*/ null,
@@ -148,7 +148,7 @@ public class VariableInResult extends QueryTest {
query.filter(cand.projects.contains(p).and(p.name.eq("orange")));
query.result(false, p.projid, p.name);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Employee> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "p.projid, p.name",
/*INTO*/ null,
@@ -180,7 +180,7 @@ public class VariableInResult extends QueryTest {
query.filter(cand.employees.contains(e));
query.result(false, e);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "e",
/*INTO*/ null,
@@ -213,7 +213,7 @@ public class VariableInResult extends QueryTest {
query.result(false, e);
// SELECT e FROM Department WHERE deptid==2 & employees.contains(e) VARIABLES Employee e
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "e",
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java
index 2cd2d4d6..34455c9d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java
@@ -111,7 +111,7 @@ public class VariableInResultMultipleNavigation extends QueryTest {
cand.departments.contains(d)).and(d.employees.contains(e)).and(e.projects.contains(p)));
query.result(false, cand, d, e, p);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Company> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "this, d, e, p",
/*INTO*/ null,
@@ -154,7 +154,7 @@ public class VariableInResultMultipleNavigation extends QueryTest {
cand.departments.contains(d)).and(d.employees.contains(e)).and(e.projects.contains(p)));
query.result(false, cand, e, p);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Company> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "this, e, p",
/*INTO*/ null,
@@ -197,7 +197,7 @@ public class VariableInResultMultipleNavigation extends QueryTest {
cand.departments.contains(d)).and(d.employees.contains(e)).and(e.projects.contains(p)));
query.result(false, d, e, p);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Company> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "d, e, p",
/*INTO*/ null,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java
index 21a56985..aed9a6b1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java
@@ -102,7 +102,7 @@ public class VariableInResultNavigation extends QueryTest {
query.filter(cand.employees.contains(e).and(e.projects.contains(p)).and(p.name.eq("orange")));
query.result(false, e, p);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "e, p",
/*INTO*/ null,
@@ -142,7 +142,7 @@ public class VariableInResultNavigation extends QueryTest {
query.filter(cand.employees.contains(e).and(e.projects.contains(p)));
query.result(false, e, p);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "e, p",
/*INTO*/ null,
@@ -182,7 +182,7 @@ public class VariableInResultNavigation extends QueryTest {
query.filter(cand.employees.contains(e).and(e.projects.contains(p)));
query.result(false, cand, e, p);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "this, e, p",
/*INTO*/ null,
@@ -220,7 +220,7 @@ public class VariableInResultNavigation extends QueryTest {
query.filter(cand.deptid.eq(1l).and(cand.employees.contains(e)).and(e.projects.contains(p)));
query.result(false, e, p);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "e, p",
/*INTO*/ null,
@@ -260,7 +260,7 @@ public class VariableInResultNavigation extends QueryTest {
query.filter(cand.company.name.eq("Sun Microsystems, Inc.").and(cand.employees.contains(e)).and(e.projects.contains(p)));
query.result(false, e, p);
- QueryElementHolder holder = new QueryElementHolder(
+ QueryElementHolder<Department> holder = new QueryElementHolder<>(
/*UNIQUE*/ null,
/*RESULT*/ "e, p",
/*INTO*/ null,