You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/12/07 10:09:47 UTC
[18/30] cayenne git commit: CAY-2377. Remove setDataMap(DataMap map)
CAY-2377. Remove setDataMap(DataMap map)
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/185646f8
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/185646f8
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/185646f8
Branch: refs/heads/master
Commit: 185646f8463188c6cc3df4489cf3ae54b0e66c22
Parents: 6b46403
Author: Arseni Bulatski <an...@gmail.com>
Authored: Fri Oct 27 13:23:37 2017 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Wed Nov 15 10:27:47 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/query/BatchQuery.java | 14 --------------
.../java/org/apache/cayenne/query/IndirectQuery.java | 8 --------
.../java/org/apache/cayenne/query/QueryChain.java | 14 --------------
docs/doc/src/main/resources/UPGRADE.txt | 5 +++++
4 files changed, 5 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/185646f8/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java
index b655932..bc46999 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/BatchQuery.java
@@ -45,12 +45,6 @@ public abstract class BatchQuery implements Query {
protected String name;
/**
- * @since 3.1
- */
- @Deprecated
- protected DataMap dataMap;
-
- /**
* @since 4.0
*/
protected List<BatchQueryRow> rows;
@@ -84,14 +78,6 @@ public abstract class BatchQuery implements Query {
}
/**
- * @since 3.1
- */
- @Deprecated
- public void setDataMap(DataMap dataMap) {
- this.dataMap = dataMap;
- }
-
- /**
* Returns default select parameters.
*
* @since 1.2
http://git-wip-us.apache.org/repos/asf/cayenne/blob/185646f8/cayenne-server/src/main/java/org/apache/cayenne/query/IndirectQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/IndirectQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/IndirectQuery.java
index ea2da51..5d9f290 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/IndirectQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/IndirectQuery.java
@@ -44,14 +44,6 @@ public abstract class IndirectQuery implements Query {
protected transient EntityResolver lastResolver;
/**
- * @since 3.1
- */
- @Deprecated
- public void setDataMap(DataMap dataMap) {
- this.dataMap = dataMap;
- }
-
- /**
* Returns the metadata obtained from the replacement query.
*/
@Override
http://git-wip-us.apache.org/repos/asf/cayenne/blob/185646f8/cayenne-server/src/main/java/org/apache/cayenne/query/QueryChain.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/QueryChain.java b/cayenne-server/src/main/java/org/apache/cayenne/query/QueryChain.java
index 927b93b..d13fc6d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/QueryChain.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/QueryChain.java
@@ -42,12 +42,6 @@ public class QueryChain implements Query {
protected String name;
/**
- * @since 3.1
- */
- @Deprecated
- protected DataMap dataMap;
-
- /**
* Creates an empty QueryChain.
*/
public QueryChain() {
@@ -126,14 +120,6 @@ public class QueryChain implements Query {
}
/**
- * @since 3.1
- */
- @Deprecated
- public void setDataMap(DataMap dataMap) {
- this.dataMap = dataMap;
- }
-
- /**
* Returns default metadata.
*/
public QueryMetadata getMetaData(EntityResolver resolver) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/185646f8/docs/doc/src/main/resources/UPGRADE.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/UPGRADE.txt b/docs/doc/src/main/resources/UPGRADE.txt
index 41f9bb9..c618ccf 100644
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ b/docs/doc/src/main/resources/UPGRADE.txt
@@ -199,6 +199,11 @@ UPGRADING TO 4.1.M2
- removed DataMap getDataMap() in org.apache.cayenne.query.EJBQLQuery;
- removed DataMap getDataMap() in org.apache.cayenne.query.QueryChain;
- removed DataMap getDataMap() in org.apache.cayenne.remote.RangeQuery;
+ - removed void setDataMap(DataMap dataMap) in org.apache.cayenne.query.IndirectQuery;
+ - removed void setDataMap(DataMap dataMap) in org.apache.cayenne.query.QueryChain;
+ - removed DataMap dataMap in org.apache.cayenne.query.QueryChain;
+ - removed DataMap dataMap in org.apache.cayenne.query.BatchQuery;
+ - removed void setDataMap(DataMap dataMap) in org.apache.cayenne.query.BatchQuery;
UPGRADING TO 4.1.M1