You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by ea...@apache.org on 2023/02/08 07:26:02 UTC
[dubbo-samples] branch master updated: valid tri return future (#723)
This is an automated email from the ASF dual-hosted git repository.
earthchen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 06f183b3 valid tri return future (#723)
06f183b3 is described below
commit 06f183b380f40a5e2e72c88f0b96cd027c18039f
Author: earthchen <ea...@gmail.com>
AuthorDate: Wed Feb 8 15:25:53 2023 +0800
valid tri return future (#723)
* valid tri return future
* valid tri return future
* grpc ignore
---
.../apache/dubbo/sample/tri/api/PojoGreeter.java | 6 ++++++
.../dubbo/sample/tri/pojo/PojoGreeterImpl.java | 11 +++++++++++
.../apache/dubbo/sample/tri/stub/GreeterImpl.java | 7 ++++++-
.../apache/dubbo/sample/tri/BaseClientTest.java | 22 +++++++++++++++++++++-
.../dubbo/sample/tri/BaseTriPojoClientTest.java | 21 +++++++++++++++++++++
.../sample/tri/grpc/TriGrpcDirectClientTest.java | 5 +++++
6 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/api/PojoGreeter.java b/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/api/PojoGreeter.java
index eeb05edd..845c7ec6 100644
--- a/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/api/PojoGreeter.java
+++ b/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/api/PojoGreeter.java
@@ -19,6 +19,8 @@ package org.apache.dubbo.sample.tri.api;
import org.apache.dubbo.common.stream.StreamObserver;
+import java.util.concurrent.CompletableFuture;
+
/**
* Triple supports manual interface with POJO to support migrating from original protocols.
*/
@@ -27,8 +29,12 @@ public interface PojoGreeter {
ParentPojo greetChildPojo(Byte test);
+ CompletableFuture<String> unaryFuture(String request);
+
String overload();
+ String methodNotFound();
+
String overload(String param);
/**
diff --git a/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/pojo/PojoGreeterImpl.java b/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/pojo/PojoGreeterImpl.java
index e6d6f182..9cde94b6 100644
--- a/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/pojo/PojoGreeterImpl.java
+++ b/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/pojo/PojoGreeterImpl.java
@@ -28,6 +28,8 @@ import org.apache.dubbo.sample.tri.util.EchoStreamObserver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.concurrent.CompletableFuture;
+
public class PojoGreeterImpl implements PojoGreeter {
private static final Logger LOGGER = LoggerFactory.getLogger(PojoGreeterImpl.class);
private final Greeter delegate;
@@ -36,6 +38,10 @@ public class PojoGreeterImpl implements PojoGreeter {
this.delegate = new GreeterImpl("tri-wrap");
}
+ public CompletableFuture<String> unaryFuture(String request) {
+ return CompletableFuture.completedFuture(request);
+ }
+
@Override
public ParentPojo greetChildPojo(Byte test) {
ChildPojo childPojo = new ChildPojo();
@@ -50,6 +56,11 @@ public class PojoGreeterImpl implements PojoGreeter {
return "overload";
}
+ @Override
+ public String methodNotFound() {
+ return "methodNotFound";
+ }
+
@Override
public String overload(String param) {
return param;
diff --git a/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/stub/GreeterImpl.java b/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/stub/GreeterImpl.java
index 5b432598..f2cb958f 100644
--- a/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/stub/GreeterImpl.java
+++ b/3-extensions/protocol/dubbo-samples-triple/src/main/java/org/apache/dubbo/sample/tri/stub/GreeterImpl.java
@@ -23,12 +23,12 @@ import org.apache.dubbo.rpc.protocol.tri.ServerStreamObserver;
import org.apache.dubbo.sample.tri.DubboGreeterTriple.GreeterImplBase;
import org.apache.dubbo.sample.tri.GreeterReply;
import org.apache.dubbo.sample.tri.GreeterRequest;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.CompletableFuture;
public class GreeterImpl extends GreeterImplBase {
private static final Logger LOGGER = LoggerFactory.getLogger(GreeterImpl.class);
@@ -48,6 +48,11 @@ public class GreeterImpl extends GreeterImplBase {
.build();
}
+
+ public CompletableFuture<GreeterReply> greetAsync(org.apache.dubbo.sample.tri.GreeterRequest request){
+ return CompletableFuture.completedFuture(greet(request));
+ }
+
@Override
public GreeterReply greetWithAttachment(GreeterRequest request) {
final String key = "user-attachment";
diff --git a/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseClientTest.java b/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseClientTest.java
index ee1072da..606c2b60 100644
--- a/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseClientTest.java
+++ b/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseClientTest.java
@@ -24,7 +24,6 @@ import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.protocol.tri.CancelableStreamObserver;
import org.apache.dubbo.rpc.protocol.tri.ClientStreamObserver;
import org.apache.dubbo.sample.tri.util.StdoutStreamObserver;
-
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Ignore;
@@ -34,6 +33,7 @@ import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -324,6 +324,26 @@ public abstract class BaseClientTest {
Assert.assertTrue(latch.await(10, TimeUnit.SECONDS));
}
+ @Test
+ public void unaryGreeterAsync() throws InterruptedException {
+ CountDownLatch latch = new CountDownLatch(1);
+ Map<String, Integer> map = new HashMap<>();
+ map.put("val", 1);
+ final CompletableFuture<GreeterReply> future = delegate.greetAsync(GreeterRequest.newBuilder()
+ .setName("name")
+ .build());
+ future.whenComplete((s, throwable) -> {
+ System.out.println(s);
+ if ("hello,name".equals(s.getMessage())) {
+ map.put("val", map.get("val") + 1);
+ }
+ latch.countDown();
+ });
+ map.put("val", 2);
+ latch.await(3, TimeUnit.SECONDS);
+ Assert.assertEquals(3, map.get("val").intValue());
+ }
+
@Test
public void unaryGreeter() {
final GreeterReply reply = delegate.greet(GreeterRequest.newBuilder()
diff --git a/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseTriPojoClientTest.java b/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseTriPojoClientTest.java
index 9b9806bb..fd2fd6c7 100644
--- a/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseTriPojoClientTest.java
+++ b/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/BaseTriPojoClientTest.java
@@ -30,6 +30,9 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -44,6 +47,24 @@ public abstract class BaseTriPojoClientTest {
protected static DubboBootstrap appDubboBootstrap;
+
+ @Test
+ public void unaryFuture() throws InterruptedException {
+ CountDownLatch latch = new CountDownLatch(1);
+ Map<String, Integer> map = new HashMap<>();
+ map.put("val", 1);
+ CompletableFuture<String> future = delegate.unaryFuture("unaryFuture");
+ future.whenComplete((s, throwable) -> {
+ if ("unaryFuture".equals(s)) {
+ map.put("val", map.get("val") + 1);
+ }
+ latch.countDown();
+ });
+ map.put("val", 2);
+ latch.await(3, TimeUnit.SECONDS);
+ Assert.assertEquals(3, map.get("val").intValue());
+ }
+
@Test
public void overload() {
String ret = delegate.overload();
diff --git a/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/grpc/TriGrpcDirectClientTest.java b/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/grpc/TriGrpcDirectClientTest.java
index 4c6b49b8..543260ab 100644
--- a/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/grpc/TriGrpcDirectClientTest.java
+++ b/3-extensions/protocol/dubbo-samples-triple/src/test/java/org/apache/dubbo/sample/tri/grpc/TriGrpcDirectClientTest.java
@@ -51,4 +51,9 @@ public class TriGrpcDirectClientTest extends BaseClientTest {
protected void validUpperHeader(String key2, String value2) {
// grpc not support upper header
}
+
+ @Override
+ public void unaryGreeterAsync() throws InterruptedException {
+ // grpc not support
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org