This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 1c7e37aa9aa41804676b0c707a768e977c1ef7ac
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Thu Jun 30 17:59:35 2022 +0300
CAY-2737 Cayenne 4.3: cleanup deprecated code
- delete DataDomainFilter
---
.../java/org/apache/cayenne/DataChannelFilter.java | 71 ----------------------
.../org/apache/cayenne/DataChannelFilterChain.java | 40 ------------
.../java/org/apache/cayenne/access/DataDomain.java | 47 --------------
.../configuration/server/DataDomainProvider.java | 13 ----
4 files changed, 171 deletions(-)
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/DataChannelFilter.java
b/cayenne-server/src/main/java/org/apache/cayenne/DataChannelFilter.java
deleted file mode 100644
index b81b3b832..000000000
--- a/cayenne-server/src/main/java/org/apache/cayenne/DataChannelFilter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne;
-
-import org.apache.cayenne.graph.GraphDiff;
-import org.apache.cayenne.query.Query;
-
-/**
- * An interface of a filter that allows to intercept DataChannel operations.
Filters allow
- * to implement chains of custom processors around a DataChannel, that can be
used for
- * security, monitoring, business logic, providing context to lifecycle event
listeners,
- * etc.
- *
- * @since 3.1
- * @deprecated since 4.1 use {@link DataChannelQueryFilter} and {@link
DataChannelSyncFilter}
- */
-@Deprecated
-public interface DataChannelFilter extends DataChannelSyncFilter,
DataChannelQueryFilter {
-
- void init(DataChannel channel);
-
- QueryResponse onQuery(ObjectContext originatingContext, Query query,
- DataChannelFilterChain filterChain);
-
- GraphDiff onSync(ObjectContext originatingContext, GraphDiff changes, int
syncType,
- DataChannelFilterChain filterChain);
-
- /**
- * Adapter method that allows to use old DataChannelFilter as new query
filter
- */
- @Override
- default QueryResponse onQuery(ObjectContext originatingContext, Query
query,
- DataChannelQueryFilterChain filterChain) {
- return onQuery(originatingContext, query, new DataChannelFilterChain(){
- @Override
- public QueryResponse onQuery(ObjectContext originatingContext,
Query query) {
- return filterChain.onQuery(originatingContext, query);
- }
- });
- }
-
- /**
- * Adapter method that allows to use old DataChannelFilter as new sync
filter
- */
- @Override
- default GraphDiff onSync(ObjectContext originatingContext, GraphDiff
changes, int syncType,
- DataChannelSyncFilterChain filterChain) {
- return onSync(originatingContext, changes, syncType, new
DataChannelFilterChain(){
- @Override
- public GraphDiff onSync(ObjectContext originatingContext,
GraphDiff changes, int syncType) {
- return filterChain.onSync(originatingContext, changes,
syncType);
- }
- });
- }
-}
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/DataChannelFilterChain.java
b/cayenne-server/src/main/java/org/apache/cayenne/DataChannelFilterChain.java
deleted file mode 100644
index ad47e7c49..000000000
---
a/cayenne-server/src/main/java/org/apache/cayenne/DataChannelFilterChain.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne;
-
-import org.apache.cayenne.graph.GraphDiff;
-import org.apache.cayenne.query.Query;
-
-/**
- * Provides DataChannelFilters with API to pass control to the next filter in
the chain or
- * the underlying DataChannel for the last chain filter.
- *
- * @since 3.1
- * @deprecated since 4.1 in favor of {@link DataChannelSyncFilterChain} and
{@link DataChannelQueryFilterChain}
- */
-public interface DataChannelFilterChain {
-
- default QueryResponse onQuery(ObjectContext originatingContext, Query
query) {
- throw new UnsupportedOperationException();
- }
-
- default GraphDiff onSync(ObjectContext originatingContext, GraphDiff
changes, int syncType) {
- throw new UnsupportedOperationException();
- }
-}
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java
b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java
index fa9d9c87c..6ab496f2d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomain.java
@@ -21,7 +21,6 @@ package org.apache.cayenne.access;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.DataChannel;
-import org.apache.cayenne.DataChannelFilter;
import org.apache.cayenne.DataChannelQueryFilter;
import org.apache.cayenne.DataChannelQueryFilterChain;
import org.apache.cayenne.DataChannelSyncFilter;
@@ -93,13 +92,6 @@ public class DataDomain implements QueryEngine, DataChannel {
*/
protected int maxIdQualifierSize;
- /**
- * @since 3.1
- * @deprecated since 4.1 this field is unused
- */
- @Deprecated
- protected List<DataChannelFilter> filters;
-
/**
* @since 4.1
*/
@@ -682,17 +674,6 @@ public class DataDomain implements QueryEngine,
DataChannel {
}
}
- /**
- * Since 4.1 returns empty list.
- *
- * @since 3.1
- * @deprecated since 4.1 use {@link #getQueryFilters()} and {@link
#getSyncFilters()}
- */
- @Deprecated
- public List<DataChannelFilter> getFilters() {
- return Collections.emptyList();
- }
-
/**
* Returns an unmodifiable list of query filters registered with this
DataDomain.
* <p>
@@ -719,22 +700,6 @@ public class DataDomain implements QueryEngine,
DataChannel {
return Collections.unmodifiableList(syncFilters);
}
- /**
- * Adds a new filter, immediately calling its 'init' method. Since 4.0
this
- * method also registers passed filter as an event listener, if any of
its
- * methods have event annotations.
- *
- * @since 3.1
- * @deprecated since 4.1 use {@link
#addQueryFilter(DataChannelQueryFilter)} and {@link
#addSyncFilter(DataChannelSyncFilter)} instead
- */
- @Deprecated
- public void addFilter(DataChannelFilter filter) {
- filter.init(this);
- addListener(filter);
- queryFilters.add(filter);
- syncFilters.add(filter);
- }
-
/**
* Adds a new query filter.
* Also registers passed filter as an event listener, if any of its
methods have event annotations.
@@ -763,18 +728,6 @@ public class DataDomain implements QueryEngine,
DataChannel {
syncFilters.add(filter);
}
- /**
- * Removes a filter from the filter chain.
- *
- * @since 3.1
- * @deprecated since 4.1 use {@link
#removeQueryFilter(DataChannelQueryFilter)} and {@link
#removeSyncFilter(DataChannelSyncFilter)} instead
- */
- @Deprecated
- public void removeFilter(DataChannelFilter filter) {
- removeQueryFilter(filter);
- removeSyncFilter(filter);
- }
-
/**
* Removes a query filter from the filter chain.
*
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
index 69219e299..e948c8355 100644
---
a/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
+++
b/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
@@ -20,7 +20,6 @@ package org.apache.cayenne.configuration.server;
import org.apache.cayenne.ConfigurationException;
import org.apache.cayenne.DataChannel;
-import org.apache.cayenne.DataChannelFilter;
import org.apache.cayenne.DataChannelQueryFilter;
import org.apache.cayenne.DataChannelSyncFilter;
import org.apache.cayenne.access.DataDomain;
@@ -71,13 +70,6 @@ public class DataDomainProvider implements
Provider<DataDomain> {
@Inject
protected DataChannelDescriptorLoader loader;
- /**
- * @deprecated since 4.1, use query and sync filters instead
- */
- @Deprecated
- @Inject(Constants.SERVER_DOMAIN_FILTERS_LIST)
- protected List<DataChannelFilter> filters;
-
/**
* @since 4.1
*/
@@ -183,11 +175,6 @@ public class DataDomainProvider implements
Provider<DataDomain> {
dataDomain.setDefaultNode(defaultNode);
}
- // filters are deprecated, used here for backward compatibility
- for (DataChannelFilter filter : filters) {
- dataDomain.addFilter(filter);
- }
-
for (DataChannelQueryFilter filter : queryFilters) {
dataDomain.addQueryFilter(filter);
}
