CAY-2377. Remove getOrginatingQuery()
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5a912add Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5a912add Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5a912add Branch: refs/heads/master Commit: 5a912add56882ed87d24566402c4894847d39053 Parents: c470d37 Author: Arseni Bulatski <ancars...@gmail.com> Authored: Wed Oct 25 12:42:25 2017 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Wed Nov 15 10:27:46 2017 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/cayenne/query/QueryMetadataProxy.java | 6 ------ docs/doc/src/main/resources/UPGRADE.txt | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5a912add/cayenne-server/src/main/java/org/apache/cayenne/query/QueryMetadataProxy.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/QueryMetadataProxy.java b/cayenne-server/src/main/java/org/apache/cayenne/query/QueryMetadataProxy.java index 259aa51..821c7e9 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/query/QueryMetadataProxy.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/query/QueryMetadataProxy.java @@ -88,12 +88,6 @@ public class QueryMetadataProxy implements QueryMetadata { return mdDelegate.getObjEntity(); } - @Deprecated - @Override - public Query getOrginatingQuery() { - return mdDelegate.getOriginatingQuery(); - } - @Override public Query getOriginatingQuery() { return mdDelegate.getOriginatingQuery(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/5a912add/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 964e212..7ffa685 100644 --- a/docs/doc/src/main/resources/UPGRADE.txt +++ b/docs/doc/src/main/resources/UPGRADE.txt @@ -139,6 +139,7 @@ UPGRADING TO 4.1.M2 Use DriverDataSource(Driver, String, String, String)} in org.apache.cayenne.datasource.DriverDataSource; - removed static Driver loadDriver(String driverClassName) {since 4.0 as class loading should not happen here} in org.apache.cayenne.datasource.DriverDataSource; - removed Query getOrginatingQuery(); {since 4.0, use QueryMetadata#getOriginatingQuery()} in org.apache.cayenne.query.QueryMetadata; + - removed Query getOrginatingQuery(); in org.apache.Cayenne.query.QueryMetadataProxy; - removed Query getOrginatingQuery(); in org.apache.cayenne.access.DataDomainQuery; - removed Query getOrginatingQuery(); in org.apache.cayenne.access.ObjectsFromDataRowsQuery; - removed Ehcache getDefaultCache() {since 4.0 - this method is no longer in use. If you are overriding it, override cacheName(QueryMetadata) instead.}
