This is an automated email from the ASF dual-hosted git repository.
abulatski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 5e3813139de26b4fbf226d3b63860d8c07d50a62
Author: Arseni Bulatski <ancars...@gmail.com>
AuthorDate: Fri Jun 28 16:09:41 2019 +0300
CAY-2523 Deprecate SelectQuery
---
RELEASE-NOTES.txt | 1 +
UPGRADE.txt | 2 ++
.../org/apache/cayenne/map/SelectQueryDescriptor.java | 12 +++++++-----
.../java/org/apache/cayenne/query/SelectQuery.java | 19 +++++++++++--------
.../org/apache/cayenne/query/SelectQueryMetadata.java | 2 ++
5 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 6f45986..125692d 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -22,6 +22,7 @@ CAY-2517 EventManager: optimization of adding listeners
CAY-2518 Add method to append having qualifier expression to ObjectSelect
CAY-2520 Split ObjectId into several specialized variants
CAY-2522 Make ObjectSelect a direct query
+CAY-2523 Deprecate SelectQuery
CAY-2525 Deprecate OpenBase adapter
CAY-2540 Modeler: redesign dbRelationship editor dialog
CAY-2542 Modeler: redesign ObjRelationship editor dialog
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 81a87b7..250250c 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -10,6 +10,8 @@ UPGRADING TO 4.2.M1
* Per CAY-2520 ObjectId can't be instantiated directly, ObjectId.of(..)
methods should be used.
E.g. ObjectId.of("Artist", 1) instead of new ObjectId("Artist", 1).
+* Per CAY-2523 SelectQuery was deprecated. Use ObjectSelect instead.
+
* Per CAY-2525 OpenBase adapter was deprecated.
* Per CAY-2467 Property class is replaced with a type-aware Property API, it's
mostly backwards compatible.
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
b/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
index df700e9..f7b5a88 100644
---
a/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
+++
b/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
@@ -18,6 +18,11 @@
****************************************************************/
package org.apache.cayenne.map;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.cayenne.configuration.ConfigurationNodeVisitor;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.query.Ordering;
@@ -25,14 +30,11 @@ import org.apache.cayenne.query.PrefetchTreeNode;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.util.XMLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
/**
* @since 4.0
+ * @deprecated since 4.2
*/
+@Deprecated
public class SelectQueryDescriptor extends QueryDescriptor {
private static final long serialVersionUID = -8798258795351950215L;
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQuery.java
b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQuery.java
index 51f225e..ea2eeea 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQuery.java
@@ -19,31 +19,34 @@
package org.apache.cayenne.query;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.ResultBatchIterator;
import org.apache.cayenne.ResultIterator;
import org.apache.cayenne.ResultIteratorCallback;
-import org.apache.cayenne.exp.property.BaseProperty;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionFactory;
+import org.apache.cayenne.exp.property.BaseProperty;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.map.ObjEntity;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
/**
* A query that selects persistent objects of a certain type or "raw data" (aka
* DataRows). Supports expression qualifier, multiple orderings and a number of
* other parameters that serve as runtime hints to Cayenne on how to optimize
* the fetch and result processing.
+ * @deprecated since 4.2
+ * use {@link org.apache.cayenne.query.ObjectSelect}
*/
+@Deprecated
public class SelectQuery<T> extends AbstractQuery implements
ParameterizedQuery, Select<T> {
private static final long serialVersionUID = 5486418811888197559L;
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQueryMetadata.java
b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQueryMetadata.java
index 8e01314..3cad914 100644
---
a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQueryMetadata.java
+++
b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectQueryMetadata.java
@@ -37,7 +37,9 @@ import org.apache.cayenne.map.ObjRelationship;
/**
* @since 3.0
+ * @deprecated since 4.2
*/
+@Deprecated
class SelectQueryMetadata extends BaseQueryMetadata {
private static final long serialVersionUID = 7465922769303943945L;
