natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix streamobserver actual type (#13446) 

* fix:obtain actual type in StreamObserver.

* format code

---------

Co-authored-by: kaze <kaze-official@foxmail.com>
This commit is contained in:
kaze 2023-12-06 10:57:09 +08:00 committed by GitHub
parent 0d879666b4
commit 5554706256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 80 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/ReflectionPackableMethod.java
View File

@ -33,6 +33,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Collection;
import java.util.Iterator;
import java.util.stream.Stream;
@ -73,18 +74,18 @@ public class ReflectionPackableMethod implements PackableMethod {
case CLIENT_STREAM:
case BI_STREAM:
actualRequestTypes = new Class<?>[] {
(Class<?>)
((ParameterizedType) method.getMethod().getGenericReturnType()).getActualTypeArguments()[0]
obtainActualTypeInStreamObserver(
((ParameterizedType) method.getMethod().getGenericReturnType()).getActualTypeArguments()[0])
};
actualResponseType =
(Class<?>) ((ParameterizedType) method.getMethod().getGenericParameterTypes()[0])
.getActualTypeArguments()[0];
actualResponseType = obtainActualTypeInStreamObserver(
((ParameterizedType) method.getMethod().getGenericParameterTypes()[0])
.getActualTypeArguments()[0]);
break;
case SERVER_STREAM:
actualRequestTypes = method.getMethod().getParameterTypes();
actualResponseType =
(Class<?>) ((ParameterizedType) method.getMethod().getGenericParameterTypes()[1])
.getActualTypeArguments()[0];
actualResponseType = obtainActualTypeInStreamObserver(
((ParameterizedType) method.getMethod().getGenericParameterTypes()[1])
.getActualTypeArguments()[0]);
break;
case UNARY:
actualRequestTypes = method.getParameterClasses();
@ -290,6 +291,13 @@ public class ReflectionPackableMethod implements PackableMethod {
return serializeType;
}
static Class<?> obtainActualTypeInStreamObserver(Type typeInStreamObserver) {
return (Class<?>)
(typeInStreamObserver instanceof ParameterizedType
? ((ParameterizedType) typeInStreamObserver).getRawType()
: typeInStreamObserver);
}
@Override
public Pack getRequestPack() {
return requestPack;

21
dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/DataWrapper.java Normal file
View File

@ -0,0 +1,21 @@
/*
* 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
*
* http://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.dubbo.rpc.protocol.tri;
public class DataWrapper<T> {
public T data;
}

11
dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/DescriptorService.java
View File

@ -68,6 +68,17 @@ public interface DescriptorService {
void sayHelloServerStream2(Object request, StreamObserver<Object> reply);
/**
* obtain actual type in streamObserver
*/
void serverStream1(Object request, StreamObserver<String> streamObserver);
void serverStream2(Object request, StreamObserver<DataWrapper<String>> streamObserver);
StreamObserver<String> biStream1(StreamObserver<String> streamObserver);
StreamObserver<DataWrapper<String>> biStream2(StreamObserver<DataWrapper<String>> streamObserver);
/***********************grpc******************************/
java.util.Iterator<HelloReply> iteratorServerStream(HelloReply request);

32
dubbo-rpc/dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/ReflectionPackableMethodTest.java
View File

@ -124,6 +124,38 @@ class ReflectionPackableMethodTest {
Assertions.assertTrue(needWrap(descriptor2));
}
@Test
void testObtainActualType() throws NoSuchMethodException {
Method method1 = DescriptorService.class.getMethod("serverStream1", Object.class, StreamObserver.class);
Class<?> clazz1 = ReflectionPackableMethod.obtainActualTypeInStreamObserver(
((ParameterizedType) method1.getGenericParameterTypes()[1]).getActualTypeArguments()[0]);
Assertions.assertEquals(clazz1.getName(), String.class.getName());
Method method2 = DescriptorService.class.getMethod("serverStream2", Object.class, StreamObserver.class);
Class<?> clazz2 = ReflectionPackableMethod.obtainActualTypeInStreamObserver(
((ParameterizedType) method2.getGenericParameterTypes()[1]).getActualTypeArguments()[0]);
Assertions.assertEquals(clazz2.getName(), DataWrapper.class.getName());
Method method3 = DescriptorService.class.getMethod("biStream1", StreamObserver.class);
Class<?> clazz31 = ReflectionPackableMethod.obtainActualTypeInStreamObserver(
((ParameterizedType) method3.getGenericReturnType()).getActualTypeArguments()[0]);
Assertions.assertEquals(clazz31.getName(), String.class.getName());
Class<?> clazz32 = ReflectionPackableMethod.obtainActualTypeInStreamObserver(
((ParameterizedType) method3.getGenericParameterTypes()[0]).getActualTypeArguments()[0]);
Assertions.assertEquals(clazz32.getName(), String.class.getName());
Method method4 = DescriptorService.class.getMethod("biStream2", StreamObserver.class);
Class<?> clazz41 = ReflectionPackableMethod.obtainActualTypeInStreamObserver(
((ParameterizedType) method4.getGenericReturnType()).getActualTypeArguments()[0]);
Assertions.assertEquals(clazz41.getName(), DataWrapper.class.getName());
Class<?> clazz42 = ReflectionPackableMethod.obtainActualTypeInStreamObserver(
((ParameterizedType) method4.getGenericParameterTypes()[0]).getActualTypeArguments()[0]);
Assertions.assertEquals(clazz42.getName(), DataWrapper.class.getName());
}
@Test
void testIsNeedWrap() throws NoSuchMethodException {
Method method = DescriptorService.class.getMethod("noParameterMethod");