CAY-2377. Cleanup org.apache.cayenne.remote and org.apache.cayenne.query
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/98a2d238 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/98a2d238 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/98a2d238 Branch: refs/heads/master Commit: 98a2d238a39b5d758491d0f447255be8e3231aad Parents: 4af8de5 Author: Arseni Bulatski <ancars...@gmail.com> Authored: Wed Oct 25 13:55:07 2017 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Wed Nov 15 10:27:47 2017 +0300 ---------------------------------------------------------------------- .../apache/cayenne/query/BaseQueryMetadata.java | 8 ----- .../cayenne/query/DefaultQueryMetadata.java | 9 ------ .../org/apache/cayenne/remote/RangeQuery.java | 5 --- .../apache/cayenne/remote/RemoteSession.java | 32 -------------------- .../apache/cayenne/query/MockQueryMetadata.java | 5 --- docs/doc/src/main/resources/UPGRADE.txt | 7 +++++ 6 files changed, 7 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/98a2d238/cayenne-server/src/main/java/org/apache/cayenne/query/BaseQueryMetadata.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/BaseQueryMetadata.java b/cayenne-server/src/main/java/org/apache/cayenne/query/BaseQueryMetadata.java index a450b3b..0eb0e1b 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/query/BaseQueryMetadata.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/query/BaseQueryMetadata.java @@ -351,14 +351,6 @@ class BaseQueryMetadata implements QueryMetadata, Serializable { } /** - * @deprecated since 4.0, use {@link BaseQueryMetadata#getOriginatingQuery()} - */ - @Deprecated - public Query getOrginatingQuery() { - return null; - } - - /** * @since 4.0 */ public Query getOriginatingQuery() { http://git-wip-us.apache.org/repos/asf/cayenne/blob/98a2d238/cayenne-server/src/main/java/org/apache/cayenne/query/DefaultQueryMetadata.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/DefaultQueryMetadata.java b/cayenne-server/src/main/java/org/apache/cayenne/query/DefaultQueryMetadata.java index 47aa751..43d9a25 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/query/DefaultQueryMetadata.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/query/DefaultQueryMetadata.java @@ -74,15 +74,6 @@ class DefaultQueryMetadata implements QueryMetadata { } /** - * @since 3.0 - * @deprecated use {@link DefaultQueryMetadata#getOriginatingQuery()} - */ - @Deprecated - public Query getOrginatingQuery() { - return null; - } - - /** * @since 4.0 */ public Query getOriginatingQuery() { http://git-wip-us.apache.org/repos/asf/cayenne/blob/98a2d238/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 970b5a7..bb54e62 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 @@ -72,11 +72,6 @@ class RangeQuery implements Query { return new QueryMetadataProxy(originatingMetadata) { - @Deprecated - public Query getOrginatingQuery() { - return getOriginatingQuery(); - } - public Query getOriginatingQuery() { return originatingQuery; } http://git-wip-us.apache.org/repos/asf/cayenne/blob/98a2d238/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteSession.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteSession.java b/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteSession.java index 8841d0a..461e79d 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteSession.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/remote/RemoteSession.java @@ -109,38 +109,6 @@ public class RemoteSession implements Serializable { return eventBridgeFactory != null; } - /** - * Creates an EventBridge that will listen for server events. Returns null if server - * events support is not configured in the descriptor. - * - * @throws CayenneRuntimeException if EventBridge startup fails for any reason. - * - * @deprecated since 4.0. Factory creation should is handled by the client connection. - */ - @Deprecated - public EventBridge createServerEventBridge() throws CayenneRuntimeException { - - if (!isServerEventsEnabled()) { - return null; - } - - try { - EventBridgeFactory factory = (EventBridgeFactory) Class.forName( - eventBridgeFactory).newInstance(); - - Map<String, String> parameters = eventBridgeParameters != null - ? eventBridgeParameters - : Collections.<String, String>emptyMap(); - - // must use "name", not the sessionId as an external subject for the event - // bridge - return factory.createEventBridge(SUBJECTS, name, parameters); - } - catch (Exception ex) { - throw new CayenneRuntimeException("Error creating EventBridge.", ex); - } - } - @Override public String toString() { ToStringBuilder builder = new ToStringBuilder(this) http://git-wip-us.apache.org/repos/asf/cayenne/blob/98a2d238/cayenne-server/src/test/java/org/apache/cayenne/query/MockQueryMetadata.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/MockQueryMetadata.java b/cayenne-server/src/test/java/org/apache/cayenne/query/MockQueryMetadata.java index 1b7df00..ddfac88 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/query/MockQueryMetadata.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/query/MockQueryMetadata.java @@ -108,11 +108,6 @@ public class MockQueryMetadata implements QueryMetadata { return null; } - @Deprecated - public Query getOrginatingQuery() { - return null; - } - public Query getOriginatingQuery() { return null; } http://git-wip-us.apache.org/repos/asf/cayenne/blob/98a2d238/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 27b9388..f1f1558 100644 --- a/docs/doc/src/main/resources/UPGRADE.txt +++ b/docs/doc/src/main/resources/UPGRADE.txt @@ -176,6 +176,13 @@ UPGRADING TO 4.1.M2 - removed List<EntityListener> defaultEntityListeners; {since 4.0 unused as listeners are no longer tied to a DataMap} in org.apache.cayenne.map.DataMap; - removed List<EntityListener> entityListeners; in org.apache.cayenne.map.ObjEntity; - removed EntityListener getEntityListener(String className) in org.apache.cayenne.map.MockMappingNamespace; + - removed Query getOrginatingQuery() in org.apache.cayenne.remote.RangeQuery; + - removed EventBridge createServerEventBridge() {since 4.0. Factory creation should is handled by the client connection} in org.apache.cayenne.remote.RemoteSession; + - removed Query getOrginatingQuery() {use DefaultQueryMetadata#getOriginatingQuery()} in org.apache.cayenne.query.DefaultQueryMetadata; + - removed Query getOrginatingQuery() in org.apache.cayenne.query.MockQueryMetadata; + - removed Query getOrginatingQuery() {since 4.0, use BaseQueryMetadata#getOriginatingQuery()} in org.apache.cayenne.query.BaseQueryMetadata; + + UPGRADING TO 4.1.M1
