This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new 35a6365d3f Fix ClassCastException caused by 2.x's filter in some
condition (#12286)
35a6365d3f is described below
commit 35a6365d3f773a4452560458cef82a7dfdd4802d
Author: Xiang Wei Zhang <[email protected]>
AuthorDate: Wed May 17 14:25:09 2023 +0800
Fix ClassCastException caused by 2.x's filter in some condition (#12286)
* fix ClassCastException caused by 2.x's filter in some condition
* compatible of RpcResult in dubbo version 2.x
* extends AppResponse to make code better
Co-authored-by: Albumen Kevin <[email protected]>
* Add whenCompleteWithContext empty implement to compatible of
FilterChainBuilder's invoke
* Add license
* Update compact
* Fix 2.6's Filter return RpcResult handle as AsyncRpcResult
When DubboProtocol.CompletableFuture running result.thenApply and
FilterChainBuilder.CallbackRegistrationInvoker running
asyncResult.whenCompleteWithContext. All Result handle as AsyncRpcResult, so
RpcResult add some methods implements seems like AsyncRpcResult does.
* revert last commit
---------
Co-authored-by: Albumen Kevin <[email protected]>
---
.../main/java/com/alibaba/dubbo/rpc/Filter.java | 18 +++++++--
.../main/java/com/alibaba/dubbo/rpc/Invoker.java | 17 +++++++-
.../main/java/com/alibaba/dubbo/rpc/Result.java | 45 ++++++++--------------
.../dubbo/rpc/{Filter.java => RpcResult.java} | 22 ++++++-----
.../java/org/apache/dubbo/filter/FilterTest.java | 20 +++++++---
.../org/apache/dubbo/filter/LegacyInvoker.java | 6 +--
.../java/org/apache/dubbo/filter/MyFilter.java | 5 +++
7 files changed, 81 insertions(+), 52 deletions(-)
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Filter.java
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Filter.java
index 4ccde294e3..fa7b3e40a3 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Filter.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Filter.java
@@ -17,6 +17,8 @@
package com.alibaba.dubbo.rpc;
+import org.apache.dubbo.rpc.AsyncRpcResult;
+
@Deprecated
public interface Filter extends org.apache.dubbo.rpc.Filter {
@@ -26,8 +28,18 @@ public interface Filter extends org.apache.dubbo.rpc.Filter {
default org.apache.dubbo.rpc.Result invoke(org.apache.dubbo.rpc.Invoker<?>
invoker,
org.apache.dubbo.rpc.Invocation
invocation)
throws org.apache.dubbo.rpc.RpcException {
- Result.CompatibleResult result = (Result.CompatibleResult) invoke(new
Invoker.CompatibleInvoker<>(invoker),
- new Invocation.CompatibleInvocation(invocation));
- return result.getDelegate();
+ Result invokeResult = invoke(new Invoker.CompatibleInvoker<>(invoker),
+ new Invocation.CompatibleInvocation(invocation));
+
+ if (invokeResult instanceof Result.CompatibleResult) {
+ return invokeResult;
+ }
+
+ AsyncRpcResult asyncRpcResult =
AsyncRpcResult.newDefaultAsyncResult(invocation);
+ asyncRpcResult.setValue(invokeResult.getValue());
+ asyncRpcResult.setException(invokeResult.getException());
+
asyncRpcResult.setObjectAttachments(invokeResult.getObjectAttachments());
+
+ return asyncRpcResult;
}
}
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java
index 124b063de6..fc38498649 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invoker.java
@@ -17,6 +17,8 @@
package com.alibaba.dubbo.rpc;
+import org.apache.dubbo.rpc.AsyncRpcResult;
+
import com.alibaba.dubbo.common.URL;
@Deprecated
@@ -54,9 +56,22 @@ public interface Invoker<T> extends
org.apache.dubbo.rpc.Invoker<T> {
public org.apache.dubbo.rpc.Result
invoke(org.apache.dubbo.rpc.Invocation invocation) throws
org.apache.dubbo.rpc.RpcException {
return new Result.CompatibleResult(invoker.invoke(invocation));
}
-
+
@Override
public Result invoke(Invocation invocation) throws RpcException {
+ if (invoker instanceof Invoker) {
+ Result result = ((Invoker) invoker).invoke(invocation);
+ if (result instanceof Result.CompatibleResult) {
+ return result;
+ } else {
+ AsyncRpcResult asyncRpcResult =
AsyncRpcResult.newDefaultAsyncResult(invocation.getOriginal());
+ asyncRpcResult.setValue(result.getValue());
+ asyncRpcResult.setException(result.getException());
+
asyncRpcResult.setObjectAttachments(result.getObjectAttachments());
+
+ return new Result.CompatibleResult(asyncRpcResult);
+ }
+ }
return new
Result.CompatibleResult(invoker.invoke(invocation.getOriginal()));
}
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Result.java
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Result.java
index 3a1da951c0..009ee707c2 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Result.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Result.java
@@ -64,35 +64,7 @@ public interface Result extends org.apache.dubbo.rpc.Result {
return null;
}
- abstract class AbstractResult implements Result {
-
- @Override
- public void setValue(Object value) {
-
- }
-
- @Override
- public org.apache.dubbo.rpc.Result
whenCompleteWithContext(BiConsumer<org.apache.dubbo.rpc.Result, Throwable> fn) {
- return null;
- }
-
- @Override
- public <U> CompletableFuture<U>
thenApply(Function<org.apache.dubbo.rpc.Result, ? extends U> fn) {
- return null;
- }
-
- @Override
- public org.apache.dubbo.rpc.Result get() throws InterruptedException,
ExecutionException {
- return null;
- }
-
- @Override
- public org.apache.dubbo.rpc.Result get(long timeout, TimeUnit unit)
throws InterruptedException, ExecutionException, TimeoutException {
- return null;
- }
- }
-
- class CompatibleResult extends AbstractResult {
+ class CompatibleResult implements Result {
private org.apache.dubbo.rpc.Result delegate;
public CompatibleResult(org.apache.dubbo.rpc.Result result) {
@@ -177,5 +149,20 @@ public interface Result extends
org.apache.dubbo.rpc.Result {
public void setObjectAttachment(String key, Object value) {
delegate.setObjectAttachment(key, value);
}
+
+ @Override
+ public <U> CompletableFuture<U>
thenApply(Function<org.apache.dubbo.rpc.Result, ? extends U> fn) {
+ return delegate.thenApply(fn);
+ }
+
+ @Override
+ public org.apache.dubbo.rpc.Result get() throws InterruptedException,
ExecutionException {
+ return delegate.get();
+ }
+
+ @Override
+ public org.apache.dubbo.rpc.Result get(long timeout, TimeUnit unit)
throws InterruptedException, ExecutionException, TimeoutException {
+ return delegate.get(timeout, unit);
+ }
}
}
diff --git a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Filter.java
b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/RpcResult.java
similarity index 58%
copy from dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Filter.java
copy to dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/RpcResult.java
index 4ccde294e3..d62eb09418 100644
--- a/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Filter.java
+++ b/dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/RpcResult.java
@@ -14,20 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package com.alibaba.dubbo.rpc;
+import org.apache.dubbo.rpc.AppResponse;
+
@Deprecated
-public interface Filter extends org.apache.dubbo.rpc.Filter {
+public class RpcResult extends AppResponse implements
com.alibaba.dubbo.rpc.Result {
+
+ public RpcResult() {
+ }
- Result invoke(Invoker<?> invoker, Invocation invocation) throws
RpcException;
+ public RpcResult(Object result) {
+ super(result);
+ }
- @Override
- default org.apache.dubbo.rpc.Result invoke(org.apache.dubbo.rpc.Invoker<?>
invoker,
- org.apache.dubbo.rpc.Invocation
invocation)
- throws org.apache.dubbo.rpc.RpcException {
- Result.CompatibleResult result = (Result.CompatibleResult) invoke(new
Invoker.CompatibleInvoker<>(invoker),
- new Invocation.CompatibleInvocation(invocation));
- return result.getDelegate();
+ public RpcResult(Throwable exception) {
+ super(exception);
}
+
}
diff --git
a/dubbo-compatible/src/test/java/org/apache/dubbo/filter/FilterTest.java
b/dubbo-compatible/src/test/java/org/apache/dubbo/filter/FilterTest.java
index e50d67d650..24996c2c32 100644
--- a/dubbo-compatible/src/test/java/org/apache/dubbo/filter/FilterTest.java
+++ b/dubbo-compatible/src/test/java/org/apache/dubbo/filter/FilterTest.java
@@ -18,11 +18,11 @@
package org.apache.dubbo.filter;
import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.rpc.RpcInvocation;
import com.alibaba.dubbo.rpc.Filter;
import com.alibaba.dubbo.rpc.Invocation;
import com.alibaba.dubbo.rpc.Invoker;
-import com.alibaba.dubbo.rpc.Result;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -46,15 +46,23 @@ class FilterTest {
}
@Test
- void testDefault() {
+ void testDefault() throws Throwable {
Invoker<FilterTest> invoker = new LegacyInvoker<FilterTest>(null);
- Invocation invocation = new LegacyInvocation("bbb");
- Result res = myFilter.invoke(invoker, invocation);
- System.out.println(res);
+ org.apache.dubbo.rpc.Invocation invocation = new RpcInvocation(null,
"echo", "DemoService", "DemoService", new Class[]{String.class}, new
Object[]{"bbb"});
+ org.apache.dubbo.rpc.Result res = myFilter.invoke(invoker, invocation);
+ Assertions.assertEquals("alibaba", res.recreate());
+ }
+
+ @Test
+ void testRecreate() throws Throwable {
+ Invoker<FilterTest> invoker = new LegacyInvoker<FilterTest>(null);
+ org.apache.dubbo.rpc.Invocation invocation = new RpcInvocation(null,
"echo", "DemoService", "DemoService", new Class[]{String.class}, new
Object[]{"cc"});
+ org.apache.dubbo.rpc.Result res = myFilter.invoke(invoker, invocation);
+ Assertions.assertEquals("123test", res.recreate());
}
@AfterAll
public static void tear() {
- Assertions.assertEquals(2, MyFilter.count);
+ Assertions.assertEquals(3, MyFilter.count);
}
}
diff --git
a/dubbo-compatible/src/test/java/org/apache/dubbo/filter/LegacyInvoker.java
b/dubbo-compatible/src/test/java/org/apache/dubbo/filter/LegacyInvoker.java
index b1d19b57c3..328b842321 100644
--- a/dubbo-compatible/src/test/java/org/apache/dubbo/filter/LegacyInvoker.java
+++ b/dubbo-compatible/src/test/java/org/apache/dubbo/filter/LegacyInvoker.java
@@ -17,7 +17,6 @@
package org.apache.dubbo.filter;
-import org.apache.dubbo.rpc.AppResponse;
import org.apache.dubbo.service.DemoService;
import com.alibaba.dubbo.common.URL;
@@ -25,6 +24,7 @@ import com.alibaba.dubbo.rpc.Invocation;
import com.alibaba.dubbo.rpc.Invoker;
import com.alibaba.dubbo.rpc.Result;
import com.alibaba.dubbo.rpc.RpcException;
+import com.alibaba.dubbo.rpc.RpcResult;
public class LegacyInvoker<T> implements Invoker<T> {
@@ -58,13 +58,13 @@ public class LegacyInvoker<T> implements Invoker<T> {
}
public Result invoke(Invocation invocation) throws RpcException {
- AppResponse result = new AppResponse();
+ RpcResult result = new RpcResult();
if (!hasException) {
result.setValue("alibaba");
} else {
result.setException(new RuntimeException("mocked exception"));
}
- return new Result.CompatibleResult(result);
+ return result;
}
@Override
diff --git
a/dubbo-compatible/src/test/java/org/apache/dubbo/filter/MyFilter.java
b/dubbo-compatible/src/test/java/org/apache/dubbo/filter/MyFilter.java
index b7d7e24e70..68c5c8786b 100644
--- a/dubbo-compatible/src/test/java/org/apache/dubbo/filter/MyFilter.java
+++ b/dubbo-compatible/src/test/java/org/apache/dubbo/filter/MyFilter.java
@@ -22,6 +22,7 @@ import com.alibaba.dubbo.rpc.Invocation;
import com.alibaba.dubbo.rpc.Invoker;
import com.alibaba.dubbo.rpc.Result;
import com.alibaba.dubbo.rpc.RpcException;
+import com.alibaba.dubbo.rpc.RpcResult;
public class MyFilter implements Filter {
@@ -36,6 +37,10 @@ public class MyFilter implements Filter {
throw new RpcException(new IllegalArgumentException("arg0
illegal"));
}
+ if (invocation.getArguments()[0].equals("cc")) {
+ return new RpcResult("123test");
+ }
+
Result tmp = invoker.invoke(invocation);
return tmp;
}
