Merge branch '3.3' into dependabot/maven/io.micrometer-micrometer-bom…

…-1.13.6
apache · Oct 22, 2024 · 8fc7d44 · 8fc7d44
2 parents ff903a1 + 542479b
commit 8fc7d44
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml
@@ -182,7 +182,7 @@ jobs:
     strategy:
       fail-fast: false
     env:
-      ZOOKEEPER_VERSION: 3.7.3
+      ZOOKEEPER_VERSION: 3.7.2
     steps:
       - name: "Cache zookeeper binary archive"
         uses: actions/cache@v3
@@ -218,7 +218,7 @@ jobs:
     env:
       DISABLE_FILE_SYSTEM_TEST: true
       CURRENT_ROLE: ${{ matrix.case-role }}
-      ZOOKEEPER_VERSION: 3.7.3
+      ZOOKEEPER_VERSION: 3.7.2
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v3

diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml b/.github/workflows/build-and-test-scheduled-3.1.yml
@@ -85,7 +85,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest, windows-latest ]
     env:
-      ZOOKEEPER_VERSION: 3.7.3
+      ZOOKEEPER_VERSION: 3.7.2
     steps:
       - uses: actions/cache@v3
         name: "Cache zookeeper binary archive"

diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml b/.github/workflows/build-and-test-scheduled-3.2.yml
@@ -85,7 +85,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest, windows-latest ]
     env:
-      ZOOKEEPER_VERSION: 3.7.3
+      ZOOKEEPER_VERSION: 3.7.2
     steps:
       - uses: actions/cache@v3
         name: "Cache zookeeper binary archive"

diff --git a/.github/workflows/build-and-test-scheduled-3.3.yml b/.github/workflows/build-and-test-scheduled-3.3.yml
@@ -85,7 +85,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest, windows-latest ]
     env:
-      ZOOKEEPER_VERSION: 3.7.3
+      ZOOKEEPER_VERSION: 3.7.2
     steps:
       - uses: actions/cache@v3
         name: "Cache zookeeper binary archive"

diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml
@@ -83,7 +83,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest, windows-latest ]
     env:
-      ZOOKEEPER_VERSION: 3.7.3
+      ZOOKEEPER_VERSION: 3.7.2
     steps:
       - uses: actions/cache@v3
         name: "Cache zookeeper binary archive"

diff --git a/...emoting-http12/src/main/java/org/apache/dubbo/remoting/http12/message/MethodMetadata.java b/...emoting-http12/src/main/java/org/apache/dubbo/remoting/http12/message/MethodMetadata.java
@@ -21,6 +21,7 @@
 import org.apache.dubbo.rpc.model.StubMethodDescriptor;
 
 import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 
 public class MethodMetadata {
 
@@ -64,18 +65,18 @@ private static MethodMetadata doResolveReflection(ReflectionMethodDescriptor met
             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]);
                 return new MethodMetadata(actualRequestTypes, actualResponseType);
             case SERVER_STREAM:
                 actualRequestTypes = new Class[] {method.getMethod().getParameterTypes()[0]};
-                actualResponseType =
-                        (Class<?>) ((ParameterizedType) method.getMethod().getGenericParameterTypes()[1])
-                                .getActualTypeArguments()[0];
+                actualResponseType = obtainActualTypeInStreamObserver(
+                        ((ParameterizedType) method.getMethod().getGenericParameterTypes()[1])
+                                .getActualTypeArguments()[0]);
                 return new MethodMetadata(actualRequestTypes, actualResponseType);
             case UNARY:
                 actualRequestTypes = method.getParameterClasses();
@@ -84,4 +85,11 @@ private static MethodMetadata doResolveReflection(ReflectionMethodDescriptor met
         }
         throw new IllegalStateException("Can not reach here");
     }
+
+    static Class<?> obtainActualTypeInStreamObserver(Type typeInStreamObserver) {
+        return (Class<?>)
+                (typeInStreamObserver instanceof ParameterizedType
+                        ? ((ParameterizedType) typeInStreamObserver).getRawType()
+                        : typeInStreamObserver);
+    }
 }