Skip to content

[3.2]Fix:triple protocol echoService invoke. #15127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlbumenJ merged 2 commits into from
Feb 13, 2025
Merged

[3.2]Fix:triple protocol echoService invoke. #15127

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6885ed
Fix:triple protocol echoService invoke.
wuwen5 Feb 12, 2025
321e62c
Merge branch '3.2' into 3.2-trip-echo
AlbumenJ Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix:triple protocol echoService invoke.
  • Loading branch information
@wuwen5
wuwen5 committed Feb 13, 2025
commit f6885ed3088e7f862b9a7bff7b34d10871915902
6 changes: 6 additions & 0 deletions dubbo-rpc/dubbo-rpc-triple/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@
<artifactId>reactor-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-cluster</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
17 changes: 11 additions & 6 deletions ...o-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,17 @@ protected Result doInvoke(final Invocation invocation) {
ServiceDescriptor serviceDescriptor = consumerModel.getServiceModel();
MethodDescriptor methodDescriptor =
serviceDescriptor.getMethod(invocation.getMethodName(), invocation.getParameterTypes());
if (methodDescriptor == null
&& RpcUtils.isGenericCall(
((RpcInvocation) invocation).getParameterTypesDesc(), invocation.getMethodName())) {
// Only reach when server generic
methodDescriptor = ServiceDescriptorInternalCache.genericService()
.getMethod(invocation.getMethodName(), invocation.getParameterTypes());
if (methodDescriptor == null) {
if (RpcUtils.isGenericCall(
((RpcInvocation) invocation).getParameterTypesDesc(), invocation.getMethodName())) {
// Only reach when server generic
methodDescriptor = ServiceDescriptorInternalCache.genericService()
.getMethod(invocation.getMethodName(), invocation.getParameterTypes());
} else if (RpcUtils.isEcho(
((RpcInvocation) invocation).getParameterTypesDesc(), invocation.getMethodName())) {
methodDescriptor = ServiceDescriptorInternalCache.echoService()
.getMethod(invocation.getMethodName(), invocation.getParameterTypes());
}
}
ExecutorService callbackExecutor =
isSync(methodDescriptor, invocation) ? new ThreadlessExecutor() : streamExecutor;
Expand Down
11 changes: 10 additions & 1 deletion .../dubbo-rpc-triple/src/test/java/org/apache/dubbo/rpc/protocol/tri/TripleProtocolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.dubbo.rpc.protocol.tri;

import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.stream.StreamObserver;
import org.apache.dubbo.common.utils.ClassUtils;
import org.apache.dubbo.common.utils.NetUtils;
Expand All @@ -33,13 +34,15 @@
import org.apache.dubbo.rpc.protocol.tri.support.IGreeter;
import org.apache.dubbo.rpc.protocol.tri.support.IGreeterImpl;
import org.apache.dubbo.rpc.protocol.tri.support.MockStreamObserver;
import org.apache.dubbo.rpc.service.EchoService;

import java.util.concurrent.TimeUnit;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import static org.apache.dubbo.rpc.protocol.tri.support.IGreeter.SERVER_MSG;
import static org.junit.jupiter.api.Assertions.assertEquals;

class TripleProtocolTest {

Expand All @@ -65,7 +68,8 @@ void testDemoProtocol() throws Exception {
serviceRepository.registerProvider(providerModel);
providerUrl = providerUrl.setServiceModel(providerModel);

Protocol protocol = new TripleProtocol(providerUrl.getOrDefaultFrameworkModel());
Protocol protocol = ExtensionLoader.getExtensionLoader(Protocol.class).getExtension("tri");

ProxyFactory proxy =
applicationModel.getExtensionLoader(ProxyFactory.class).getAdaptiveExtension();
Invoker<IGreeter> invoker = proxy.getInvoker(serviceImpl, IGreeter.class, providerUrl);
Expand Down Expand Up @@ -107,6 +111,11 @@ void testDemoProtocol() throws Exception {
Assertions.assertEquals(REQUEST_MSG, serverOutboundMessageSubscriber.getOnNextData());
Assertions.assertTrue(serverOutboundMessageSubscriber.isOnCompleted());

EchoService echo = proxy.getProxy(protocol.refer(EchoService.class, consumerUrl));
assertEquals(echo.$echo("test"), "test");
assertEquals(echo.$echo("abcdefg"), "abcdefg");
assertEquals(echo.$echo(1234), 1234);

export.unexport();
protocol.destroy();
// resource recycle.
Expand Down