You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2020/01/10 04:00:52 UTC
[dubbo] branch master updated: backward compatible with
ListenableFilter (#5623)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 63809bf backward compatible with ListenableFilter (#5623)
63809bf is described below
commit 63809bf8e3bd556d2da4cea8affa9f530ee026a6
Author: Mr.Z <15...@163.com>
AuthorDate: Fri Jan 10 12:00:35 2020 +0800
backward compatible with ListenableFilter (#5623)
---
.../java/org/apache/dubbo/monitor/support/MonitorFilter.java | 2 +-
.../src/main/java/org/apache/dubbo/rpc/Filter.java | 10 +++++++++-
.../src/main/java/org/apache/dubbo/rpc/ListenableFilter.java | 2 +-
.../java/org/apache/dubbo/rpc/filter/ActiveLimitFilter.java | 2 +-
.../java/org/apache/dubbo/rpc/filter/CompatibleFilter.java | 2 +-
.../main/java/org/apache/dubbo/rpc/filter/ContextFilter.java | 2 +-
.../main/java/org/apache/dubbo/rpc/filter/ExceptionFilter.java | 2 +-
.../java/org/apache/dubbo/rpc/filter/ExecuteLimitFilter.java | 2 +-
.../main/java/org/apache/dubbo/rpc/filter/GenericFilter.java | 2 +-
.../java/org/apache/dubbo/rpc/filter/GenericImplFilter.java | 2 +-
.../main/java/org/apache/dubbo/rpc/filter/TimeoutFilter.java | 2 +-
.../org/apache/dubbo/rpc/protocol/ProtocolFilterWrapper.java | 10 +++++-----
.../org/apache/dubbo/rpc/filter/ActiveLimitFilterTest.java | 2 +-
.../apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java | 2 +-
14 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java
index b358e3d..036653c 100644
--- a/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java
+++ b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java
@@ -52,7 +52,7 @@ import static org.apache.dubbo.rpc.Constants.OUTPUT_KEY;
* MonitorFilter. (SPI, Singleton, ThreadSafe)
*/
@Activate(group = {PROVIDER, CONSUMER})
-public class MonitorFilter implements Filter, Filter.Listener {
+public class MonitorFilter implements Filter, Filter.Listener2 {
private static final Logger logger = LoggerFactory.getLogger(MonitorFilter.class);
private static final String MONITOR_FILTER_START_TIME = "monitor_filter_start_time";
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Filter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Filter.java
index 72a50c7..db67a2f 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Filter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Filter.java
@@ -48,7 +48,7 @@ public interface Filter {
Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException;
/**
- * Please use {@link Listener#onMessage(Result, Invoker, Invocation)} instead.
+ * Please use {@link Listener2#onMessage(Result, Invoker, Invocation)} instead.
* This method is kept only for compatibility and may get removed at any version in the future.
*
* @param appResponse
@@ -60,11 +60,19 @@ public interface Filter {
return appResponse;
}
+ @Deprecated
interface Listener {
+ void onResponse(Result appResponse, Invoker<?> invoker, Invocation invocation);
+
+ void onError(Throwable t, Invoker<?> invoker, Invocation invocation);
+ }
+ interface Listener2 {
+
void onMessage(Result appResponse, Invoker<?> invoker, Invocation invocation);
void onError(Throwable t, Invoker<?> invoker, Invocation invocation);
}
+
}
\ No newline at end of file
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/ListenableFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/ListenableFilter.java
index 1d75f07..cb60a7c 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/ListenableFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/ListenableFilter.java
@@ -18,7 +18,7 @@ package org.apache.dubbo.rpc;
/**
* This abstract will be removed soon from one future release.
- * Please implementing Filter.Listener directly for callback registration,
+ * Please implementing Filter.Listener2 directly for callback registration,
* check the default implementation, see {@link org.apache.dubbo.rpc.filter.ExceptionFilter}, for example.
*/
@Deprecated
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ActiveLimitFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ActiveLimitFilter.java
index 8652169..585b45e 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ActiveLimitFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ActiveLimitFilter.java
@@ -42,7 +42,7 @@ import static org.apache.dubbo.rpc.Constants.ACTIVES_KEY;
* @see Filter
*/
@Activate(group = CONSUMER, value = ACTIVES_KEY)
-public class ActiveLimitFilter implements Filter, Filter.Listener {
+public class ActiveLimitFilter implements Filter, Filter.Listener2 {
private static final String ACTIVELIMIT_FILTER_START_TIME = "activelimit_filter_start_time";
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/CompatibleFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/CompatibleFilter.java
index 9d9a629..0980a65 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/CompatibleFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/CompatibleFilter.java
@@ -45,7 +45,7 @@ import static org.apache.dubbo.remoting.Constants.SERIALIZATION_KEY;
* @see Filter
*
*/
-public class CompatibleFilter implements Filter, Filter.Listener {
+public class CompatibleFilter implements Filter, Filter.Listener2 {
private static Logger logger = LoggerFactory.getLogger(CompatibleFilter.class);
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
index d584754..e771f72 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
@@ -49,7 +49,7 @@ import static org.apache.dubbo.rpc.Constants.TOKEN_KEY;
* @see RpcContext
*/
@Activate(group = PROVIDER, order = -10000)
-public class ContextFilter implements Filter, Filter.Listener {
+public class ContextFilter implements Filter, Filter.Listener2 {
private static final String TAG_KEY = "dubbo.tag";
@Override
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExceptionFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExceptionFilter.java
index f0442ca..01c68fc 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExceptionFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExceptionFilter.java
@@ -44,7 +44,7 @@ import java.lang.reflect.Method;
* </ol>
*/
@Activate(group = CommonConstants.PROVIDER)
-public class ExceptionFilter implements Filter, Filter.Listener {
+public class ExceptionFilter implements Filter, Filter.Listener2 {
private Logger logger = LoggerFactory.getLogger(ExceptionFilter.class);
@Override
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExecuteLimitFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExecuteLimitFilter.java
index bf68501..ae52911 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExecuteLimitFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExecuteLimitFilter.java
@@ -37,7 +37,7 @@ import static org.apache.dubbo.rpc.Constants.EXECUTES_KEY;
*
*/
@Activate(group = CommonConstants.PROVIDER, value = EXECUTES_KEY)
-public class ExecuteLimitFilter implements Filter, Filter.Listener {
+public class ExecuteLimitFilter implements Filter, Filter.Listener2 {
private static final String EXECUTELIMIT_FILTER_START_TIME = "execugtelimit_filter_start_time";
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java
index 51b014c..3f3b0e8 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java
@@ -53,7 +53,7 @@ import static org.apache.dubbo.rpc.Constants.GENERIC_KEY;
* GenericInvokerFilter.
*/
@Activate(group = CommonConstants.PROVIDER, order = -20000)
-public class GenericFilter implements Filter, Filter.Listener {
+public class GenericFilter implements Filter, Filter.Listener2 {
@Override
public Result invoke(Invoker<?> invoker, Invocation inv) throws RpcException {
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericImplFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericImplFilter.java
index 7b78c0c..b704c4c 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericImplFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericImplFilter.java
@@ -49,7 +49,7 @@ import static org.apache.dubbo.rpc.Constants.GENERIC_KEY;
* GenericImplInvokerFilter
*/
@Activate(group = CommonConstants.CONSUMER, value = GENERIC_KEY, order = 20000)
-public class GenericImplFilter implements Filter, Filter.Listener {
+public class GenericImplFilter implements Filter, Filter.Listener2 {
private static final Logger logger = LoggerFactory.getLogger(GenericImplFilter.class);
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/TimeoutFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/TimeoutFilter.java
index b6cacfe..0588e3c 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/TimeoutFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/TimeoutFilter.java
@@ -32,7 +32,7 @@ import java.util.Arrays;
* Log any invocation timeout, but don't stop server from running
*/
@Activate(group = CommonConstants.PROVIDER)
-public class TimeoutFilter implements Filter, Filter.Listener {
+public class TimeoutFilter implements Filter, Filter.Listener2 {
private static final Logger logger = LoggerFactory.getLogger(TimeoutFilter.class);
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolFilterWrapper.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolFilterWrapper.java
index a5869ef..94a106d 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolFilterWrapper.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolFilterWrapper.java
@@ -85,8 +85,8 @@ public class ProtocolFilterWrapper implements Protocol {
if (listener != null) {
listener.onError(e, invoker, invocation);
}
- } else if (filter instanceof Filter.Listener) {
- Filter.Listener listener = (Filter.Listener) filter;
+ } else if (filter instanceof Filter.Listener2) {
+ Filter.Listener2 listener = (Filter.Listener2) filter;
listener.onError(e, invoker, invocation);
}
throw e;
@@ -98,13 +98,13 @@ public class ProtocolFilterWrapper implements Protocol {
Filter.Listener listener = ((ListenableFilter) filter).listener();
if (listener != null) {
if (t == null) {
- listener.onMessage(r, invoker, invocation);
+ listener.onResponse(r, invoker, invocation);
} else {
listener.onError(t, invoker, invocation);
}
}
- } else if (filter instanceof Filter.Listener) {
- Filter.Listener listener = (Filter.Listener) filter;
+ } else if (filter instanceof Filter.Listener2) {
+ Filter.Listener2 listener = (Filter.Listener2) filter;
if (t == null) {
listener.onMessage(r, invoker, invocation);
} else {
diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ActiveLimitFilterTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ActiveLimitFilterTest.java
index 0c4c313..6aefa82 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ActiveLimitFilterTest.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ActiveLimitFilterTest.java
@@ -126,7 +126,7 @@ public class ActiveLimitFilterTest {
activeLimitFilter.onMessage(result, invoker, invocation);
} catch (RpcException expected) {
count.incrementAndGet();
-// activeLimitFilter.listener().onError(expected, invoker, invocation);
+// activeLimitFilter.Listener2().onError(expected, invoker, invocation);
} catch (Exception e) {
fail();
}
diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
index 1f182a0..28f67e1 100644
--- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
+++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
@@ -38,7 +38,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.$INVOKE;
* EventFilter
*/
@Activate(group = CommonConstants.CONSUMER)
-public class FutureFilter implements Filter, Filter.Listener {
+public class FutureFilter implements Filter, Filter.Listener2 {
protected static final Logger logger = LoggerFactory.getLogger(FutureFilter.class);