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:48 UTC
[19/30] cayenne git commit: CAY-2377. Remove getDataMap()
CAY-2377. Remove getDataMap()
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/6b464038
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/6b464038
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/6b464038
Branch: refs/heads/master
Commit: 6b4640381d4868864f61efc8ecbc3f6b09ddb3e1
Parents: ad04fb8
Author: Arseni Bulatski <an...@gmail.com>
Authored: Fri Oct 27 13:05:01 2017 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Wed Nov 15 10:27:47 2017 +0300
----------------------------------------------------------------------
.../apache/cayenne/lifecycle/id/StringIdQuery.java | 6 ------
.../org/apache/cayenne/access/DataDomainQuery.java | 1 -
.../cayenne/access/ObjectsFromDataRowsQuery.java | 1 -
.../java/org/apache/cayenne/query/AbstractQuery.java | 8 --------
.../java/org/apache/cayenne/query/BatchQuery.java | 9 ---------
.../java/org/apache/cayenne/query/EJBQLQuery.java | 8 --------
.../java/org/apache/cayenne/query/IndirectQuery.java | 9 ---------
.../src/main/java/org/apache/cayenne/query/Query.java | 7 -------
.../java/org/apache/cayenne/query/QueryChain.java | 8 --------
.../java/org/apache/cayenne/query/RefreshQuery.java | 9 ---------
.../org/apache/cayenne/remote/IncrementalQuery.java | 9 ---------
.../java/org/apache/cayenne/remote/RangeQuery.java | 7 -------
.../test/java/org/apache/cayenne/query/MockQuery.java | 5 -----
docs/doc/src/main/resources/UPGRADE.txt | 14 +++++++++++++-
14 files changed, 13 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b464038/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java
index bec2c9c..a6d6f72 100644
--- a/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java
+++ b/cayenne-lifecycle/src/main/java/org/apache/cayenne/lifecycle/id/StringIdQuery.java
@@ -262,10 +262,4 @@ public class StringIdQuery implements Query {
public void setName(String name) {
this.name = name;
}
-
- @Deprecated
- public DataMap getDataMap() {
- return dataMap;
- }
-
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b464038/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQuery.java
index d913465..a1cfda1 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQuery.java
@@ -102,7 +102,6 @@ class DataDomainQuery implements Query, QueryMetadata {
return null;
}
- @Deprecated
public DataMap getDataMap() {
return null;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b464038/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectsFromDataRowsQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectsFromDataRowsQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectsFromDataRowsQuery.java
index a4b467c..7d68beb 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectsFromDataRowsQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/ObjectsFromDataRowsQuery.java
@@ -73,7 +73,6 @@ class ObjectsFromDataRowsQuery implements Query, QueryMetadata {
return null;
}
- @Deprecated
public DataMap getDataMap() {
return null;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b464038/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java
index 1d91eeb..8589d0b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java
@@ -47,14 +47,6 @@ public abstract class AbstractQuery extends CacheableQuery {
* @since 3.1
*/
@Deprecated
- public DataMap getDataMap() {
- return dataMap;
- }
-
- /**
- * @since 3.1
- */
- @Deprecated
public void setDataMap(DataMap dataMap) {
this.dataMap = dataMap;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b464038/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 695224a..b655932 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
@@ -86,15 +86,6 @@ public abstract class BatchQuery implements Query {
/**
* @since 3.1
*/
- @Override
- @Deprecated
- public DataMap getDataMap() {
- return dataMap;
- }
-
- /**
- * @since 3.1
- */
@Deprecated
public void setDataMap(DataMap dataMap) {
this.dataMap = dataMap;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b464038/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
index 7103562..64232ce 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
@@ -58,14 +58,6 @@ public class EJBQLQuery extends CacheableQuery {
public EJBQLQuery() {
}
- /**
- * @since 3.1
- */
- @Deprecated
- public DataMap getDataMap() {
- return dataMap;
- }
-
/**
* @since 3.1
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b464038/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 ec711ec..ea2da51 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
@@ -46,15 +46,6 @@ public abstract class IndirectQuery implements Query {
/**
* @since 3.1
*/
- @Override
- @Deprecated
- public DataMap getDataMap() {
- return dataMap;
- }
-
- /**
- * @since 3.1
- */
@Deprecated
public void setDataMap(DataMap dataMap) {
this.dataMap = dataMap;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b464038/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java b/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
index d0790b9..a3eda27 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/Query.java
@@ -72,11 +72,4 @@ public interface Query extends Serializable {
*/
@Deprecated
String getName();
-
- /**
- * @since 3.1
- * @deprecated since 4.0, {@link QueryDescriptor#getDataMap()} should be used instead
- */
- @Deprecated
- DataMap getDataMap();
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b464038/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 272c681..927b93b 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
@@ -129,14 +129,6 @@ public class QueryChain implements Query {
* @since 3.1
*/
@Deprecated
- public DataMap getDataMap() {
- return dataMap;
- }
-
- /**
- * @since 3.1
- */
- @Deprecated
public void setDataMap(DataMap dataMap) {
this.dataMap = dataMap;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b464038/cayenne-server/src/main/java/org/apache/cayenne/query/RefreshQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/RefreshQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/RefreshQuery.java
index 72c3597..cd0fbb6 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/RefreshQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/RefreshQuery.java
@@ -149,16 +149,7 @@ public class RefreshQuery implements Query {
Query substitutedQuery) {
query.route(router, resolver, this);
}
-
- @Deprecated
- public DataMap getDataMap() {
- return query.getDataMap();
- }
};
}
- @Deprecated
- public DataMap getDataMap() {
- return null;
- }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b464038/cayenne-server/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java
index 9541a42..c832cd5 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/remote/IncrementalQuery.java
@@ -75,13 +75,4 @@ class IncrementalQuery implements Query {
public String getName() {
return query.getName();
}
-
- /**
- * @since 3.1
- * @deprecated since 4.0
- */
- @Deprecated
- public DataMap getDataMap() {
- return query.getDataMap();
- }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b464038/cayenne-server/src/main/java/org/apache/cayenne/remote/RangeQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/remote/RangeQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/remote/RangeQuery.java
index bb54e62..406d1e6 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/remote/RangeQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/remote/RangeQuery.java
@@ -163,11 +163,4 @@ class RangeQuery implements Query {
throw new UnsupportedOperationException();
}
- /**
- * @since 3.1
- */
- @Deprecated
- public DataMap getDataMap() {
- throw new UnsupportedOperationException();
- }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b464038/cayenne-server/src/test/java/org/apache/cayenne/query/MockQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/MockQuery.java b/cayenne-server/src/test/java/org/apache/cayenne/query/MockQuery.java
index ba3276b..0373425 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/query/MockQuery.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/query/MockQuery.java
@@ -34,11 +34,6 @@ public class MockQuery implements Query {
public MockQuery() {
}
- @Deprecated
- public DataMap getDataMap() {
- return null;
- }
-
public QueryMetadata getMetaData(EntityResolver resolver) {
return DefaultQueryMetadata.defaultMetadata;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/6b464038/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 73a6cce..41f9bb9 100644
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ b/docs/doc/src/main/resources/UPGRADE.txt
@@ -186,7 +186,19 @@ UPGRADING TO 4.1.M2
- removed void useLocalCache(String... cacheGroups) {since 4.0, use CacheableQuery#useLocalCache(String)} in org.apache.cayenne.org.apacche.cayenne.query.CacheableQuery with test
void testUseLocalCacheOld() in org.apache.cayenne.query.SelectQueryCacheKeyIT;
- removed int size() {since 4.0 use getRows().size()} in org.apache.cayenne.query.BatchQuery;
-
+ - removed DataMap getDataMap(); {since 4.0, QueryDescriptor#getDataMap() should be used instead} in org.apache.cayenne.query.Query;
+ - removed DataMap getDataMap() in org.apache.cayenne.lifecycle.StringIdQuery;
+ - removed DataMap getDataMap() in org.apache.cayenne.query.RefreshQuery;
+ - removed DataMap getDataMap() in org.apache.cayenne.query.MockQuery;
+ - removed DataMap getDataMap() in org.apache.cayenne.query.IndirectQuery;
+ - removed DataMap getDataMap() in org.apache.cayenne.remote.IncrementalQuery;
+ - removed @deprecated from DataMap gerDataMap() in org.apache.cayenne.access.DataDomainQuery;
+ - removed @deprecated from DataMap gerDataMap() in org.apache.cayenne.access.ObjectsFromDataRowsQuery;
+ - removed DataMap getDataMap() in org.apache.cayenne.query.AbstractQuery;
+ - removed DataMap getDataMap() in org.apache.cayenne.query.BatchQuery;
+ - 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;
UPGRADING TO 4.1.M1