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:39 UTC
[10/30] cayenne git commit: CAY-2377. Cleanup deprecated code
CAY-2377. Cleanup deprecated code
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c470d372
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c470d372
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c470d372
Branch: refs/heads/master
Commit: c470d3723255676ae21363954da6355fb875cdc4
Parents: 7c09e7f
Author: Arseni Bulatski <an...@gmail.com>
Authored: Wed Oct 25 12:16:03 2017 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Wed Nov 15 10:27:46 2017 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/access/DataDomainQuery.java | 5 -----
.../cayenne/access/ObjectsFromDataRowsQuery.java | 5 -----
.../org/apache/cayenne/cache/EhCacheQueryCache.java | 12 ------------
.../configuration/server/ServerRuntimeBuilder.java | 16 ----------------
.../org/apache/cayenne/query/QueryMetadata.java | 7 -------
docs/doc/src/main/resources/UPGRADE.txt | 8 ++++++++
6 files changed, 8 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c470d372/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 7d20356..d913465 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
@@ -63,11 +63,6 @@ class DataDomainQuery implements Query, QueryMetadata {
return false;
}
- @Deprecated
- public Query getOrginatingQuery() {
- return null;
- }
-
/**
* @since 4.0
*/
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c470d372/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 f0f319e..a4b467c 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
@@ -131,11 +131,6 @@ class ObjectsFromDataRowsQuery implements Query, QueryMetadata {
return 0;
}
- @Deprecated
- public Query getOrginatingQuery() {
- return null;
- }
-
public Query getOriginatingQuery() {
return null;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c470d372/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java b/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
index f6ca82f..5eff2cd 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/cache/EhCacheQueryCache.java
@@ -189,18 +189,6 @@ public class EhCacheQueryCache implements QueryCache {
}
/**
- * Returns default cache group.
- *
- * @deprecated since 4.0 - this method is no longer in use. If you are
- * overriding it, override {@link #cacheName(QueryMetadata)}
- * instead.
- */
- @Deprecated
- public Ehcache getDefaultCache() {
- return cacheManager.getCache(DEFAULT_CACHE_NAME);
- }
-
- /**
* Shuts down EhCache CacheManager
*/
@BeforeScopeEnd
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c470d372/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder.java
index c9ac8a3..208eb3b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerRuntimeBuilder.java
@@ -60,22 +60,6 @@ public class ServerRuntimeBuilder {
private boolean autoLoadModules;
/**
- * @deprecated since 4.0.M5 in favor of {@link ServerRuntime#builder()}
- */
- @Deprecated
- public static ServerRuntimeBuilder builder() {
- return ServerRuntime.builder();
- }
-
- /**
- * @deprecated since 4.0.M5 in favor of {@link ServerRuntime#builder(String)}
- */
- @Deprecated
- public static ServerRuntimeBuilder builder(String name) {
- return ServerRuntime.builder(name);
- }
-
- /**
* Creates an empty builder.
*
* @deprecated since 4.0.M5 in favor of {@link ServerRuntime#builder()}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c470d372/cayenne-server/src/main/java/org/apache/cayenne/query/QueryMetadata.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/QueryMetadata.java b/cayenne-server/src/main/java/org/apache/cayenne/query/QueryMetadata.java
index 3de4737..a0f1705 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/QueryMetadata.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/QueryMetadata.java
@@ -205,13 +205,6 @@ public interface QueryMetadata {
int getFetchLimit();
/**
- * @since 3.0
- * @deprecated since 4.0, use {@link QueryMetadata#getOriginatingQuery()}
- */
- @Deprecated
- Query getOrginatingQuery();
-
- /**
* Returns a query that originated this query. Originating query is a query whose
* result is needed to obtain the result of the query owning this metadata. Most often
* than not the returned value is null. One example of non-null originating query is a
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c470d372/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 1da0c9c..964e212 100644
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ b/docs/doc/src/main/resources/UPGRADE.txt
@@ -138,6 +138,14 @@ UPGRADING TO 4.1.M2
- removed DriverDataSource(String driverClassName, String connectionUrl, String userName, String password) {since 4.0 as class loading should not happen here.
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.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.}
+ in org.apache.cayenne.cache.EhCacheQueryCache;
+ - removed ServerRuntimeBuilder builder() {since 4.0.M5 in favor of ServerRuntime#builder()} in org.apache.cayenne.configuration.server.ServerRuntimeBuilder;
+ - removed ServerRuntimeBuilder builder(String name) {since 4.0.M5 in favor of ServerRuntime#builder(String)} in org.apache.cayenne.configuration.server.ServerRuntimeBuilder;
+
UPGRADING TO 4.1.M1