This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/main by this push:
new dc7cd647 fix(java_interop): update dubbo version to fix java_interop
sample on protobuf-triple (#761)
dc7cd647 is described below
commit dc7cd647aa88037dbfb24fbc75358ab7f9aedd84
Author: Chales Xu <[email protected]>
AuthorDate: Wed May 8 14:20:46 2024 +0800
fix(java_interop): update dubbo version to fix java_interop sample on
protobuf-triple (#761)
---
java_interop/protobuf-triple/README.md | 6 ++-
.../apache/dubbo/sample/DubboGreeterTriple.java | 45 +++++++++++++++++-----
.../java/org/apache/dubbo/sample/Greeter.java | 28 +++-----------
.../java/org/apache/dubbo/sample/HelloReply.java | 22 +++++------
.../apache/dubbo/sample/HelloReplyOrBuilder.java | 2 +-
.../java/org/apache/dubbo/sample/HelloRequest.java | 22 +++++------
.../apache/dubbo/sample/HelloRequestOrBuilder.java | 2 +-
.../org/apache/dubbo/sample/HelloWorldProto.java | 34 ++++++++--------
.../protobuf-triple/java/java-client/pom.xml | 3 +-
.../protobuf-triple/java/java-client/run.sh | 0
.../apache/dubbo/sample/DubboGreeterTriple.java | 45 +++++++++++++++++-----
.../java/org/apache/dubbo/sample/Greeter.java | 24 ++----------
.../protobuf-triple/java/java-server/pom.xml | 2 +-
.../protobuf-triple/java/java-server/run.sh | 0
14 files changed, 129 insertions(+), 106 deletions(-)
diff --git a/java_interop/protobuf-triple/README.md
b/java_interop/protobuf-triple/README.md
index 5376d55a..beda2d5d 100644
--- a/java_interop/protobuf-triple/README.md
+++ b/java_interop/protobuf-triple/README.md
@@ -64,7 +64,8 @@ curl \
运行以下命令，启动 java 客户端，可以看到服务调用 go server 正常输出结果：
```shell
-./java/java-client/run.sh
+#在java-client目录中
+./run.sh
```
### Go client 调用 java server
@@ -76,7 +77,8 @@ curl \
> 注意，请关闭之前启动的 go server，避免出现端口占用冲突。
```shell
-./java/java-server/run.sh
+#在java-server目录中
+./run.sh
```
可通过以下命令测试服务运行正常：
diff --git
a/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/DubboGreeterTriple.java
b/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/DubboGreeterTriple.java
index 5fba7248..4f761923 100644
---
a/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/DubboGreeterTriple.java
+++
b/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/DubboGreeterTriple.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
- package org.apache.dubbo.sample;
+package org.apache.dubbo.sample;
import org.apache.dubbo.common.stream.StreamObserver;
import org.apache.dubbo.common.URL;
@@ -68,23 +68,27 @@ public final class DubboGreeterTriple {
* </pre>
*/
private static final StubMethodDescriptor sayHelloMethod = new
StubMethodDescriptor("SayHello",
- org.apache.dubbo.sample.HelloRequest.class,
org.apache.dubbo.sample.HelloReply.class, serviceDescriptor,
MethodDescriptor.RpcType.UNARY,
+ org.apache.dubbo.sample.HelloRequest.class,
org.apache.dubbo.sample.HelloReply.class, MethodDescriptor.RpcType.UNARY,
obj -> ((Message) obj).toByteArray(), obj -> ((Message)
obj).toByteArray(), org.apache.dubbo.sample.HelloRequest::parseFrom,
org.apache.dubbo.sample.HelloReply::parseFrom);
private static final StubMethodDescriptor sayHelloAsyncMethod = new
StubMethodDescriptor("SayHello",
- org.apache.dubbo.sample.HelloRequest.class,
java.util.concurrent.CompletableFuture.class, serviceDescriptor,
MethodDescriptor.RpcType.UNARY,
+ org.apache.dubbo.sample.HelloRequest.class,
java.util.concurrent.CompletableFuture.class, MethodDescriptor.RpcType.UNARY,
obj -> ((Message) obj).toByteArray(), obj -> ((Message)
obj).toByteArray(), org.apache.dubbo.sample.HelloRequest::parseFrom,
org.apache.dubbo.sample.HelloReply::parseFrom);
private static final StubMethodDescriptor sayHelloProxyAsyncMethod = new
StubMethodDescriptor("SayHelloAsync",
- org.apache.dubbo.sample.HelloRequest.class,
org.apache.dubbo.sample.HelloReply.class, serviceDescriptor,
MethodDescriptor.RpcType.UNARY,
+ org.apache.dubbo.sample.HelloRequest.class,
org.apache.dubbo.sample.HelloReply.class, MethodDescriptor.RpcType.UNARY,
obj -> ((Message) obj).toByteArray(), obj -> ((Message)
obj).toByteArray(), org.apache.dubbo.sample.HelloRequest::parseFrom,
org.apache.dubbo.sample.HelloReply::parseFrom);
+ static{
+ serviceDescriptor.addMethod(sayHelloMethod);
+ serviceDescriptor.addMethod(sayHelloProxyAsyncMethod);
+ }
public static class GreeterStub implements Greeter{
private final Invoker<Greeter> invoker;
@@ -93,7 +97,7 @@ public final class DubboGreeterTriple {
this.invoker = invoker;
}
- /**
+ /**
* <pre>
* Sends a greeting
* </pre>
@@ -107,12 +111,11 @@ public final class DubboGreeterTriple {
return StubInvocationUtil.unaryCall(invoker, sayHelloAsyncMethod,
request);
}
- /**
+ /**
* <pre>
* Sends a greeting
* </pre>
*/
- @Override
public void sayHello(org.apache.dubbo.sample.HelloRequest request,
StreamObserver<org.apache.dubbo.sample.HelloReply> responseObserver){
StubInvocationUtil.unaryCall(invoker, sayHelloMethod , request,
responseObserver);
}
@@ -138,6 +141,26 @@ public final class DubboGreeterTriple {
};
}
+ @Override
+ public CompletableFuture<org.apache.dubbo.sample.HelloReply>
sayHelloAsync(org.apache.dubbo.sample.HelloRequest request){
+ return CompletableFuture.completedFuture(sayHello(request));
+ }
+
+ /**
+ * This server stream type unary method is <b>only</b> used for
generated stub to support async unary method.
+ * It will not be called if you are NOT using Dubbo3 generated triple
stub and <b>DO NOT</b> implement this method.
+ */
+ public void sayHello(org.apache.dubbo.sample.HelloRequest request,
StreamObserver<org.apache.dubbo.sample.HelloReply> responseObserver){
+ sayHelloAsync(request).whenComplete((r, t) -> {
+ if (t != null) {
+ responseObserver.onError(t);
+ } else {
+ responseObserver.onNext(r);
+ responseObserver.onCompleted();
+ }
+ });
+ }
+
@Override
public final Invoker<Greeter> getInvoker(URL url) {
PathResolver pathResolver = url.getOrDefaultFrameworkModel()
@@ -145,8 +168,12 @@ public final class DubboGreeterTriple {
.getDefaultExtension();
Map<String,StubMethodHandler<?, ?>> handlers = new HashMap<>();
- pathResolver.addNativeStub( "/" + SERVICE_NAME + "/SayHello" );
- pathResolver.addNativeStub( "/" + SERVICE_NAME + "/SayHelloAsync"
);
+ pathResolver.addNativeStub( "/" + SERVICE_NAME + "/SayHello");
+ pathResolver.addNativeStub( "/" + SERVICE_NAME + "/SayHelloAsync");
+ // for compatibility
+ pathResolver.addNativeStub( "/" + JAVA_SERVICE_NAME + "/SayHello");
+ pathResolver.addNativeStub( "/" + JAVA_SERVICE_NAME +
"/SayHelloAsync");
+
BiConsumer<org.apache.dubbo.sample.HelloRequest,
StreamObserver<org.apache.dubbo.sample.HelloReply>> sayHelloFunc =
this::sayHello;
handlers.put(sayHelloMethod.getMethodName(), new
UnaryStubMethodHandler<>(sayHelloFunc));
diff --git
a/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/Greeter.java
b/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/Greeter.java
index e783758b..2f2f69b6 100644
---
a/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/Greeter.java
+++
b/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/Greeter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
- package org.apache.dubbo.sample;
+package org.apache.dubbo.sample;
import org.apache.dubbo.common.stream.StreamObserver;
import com.google.protobuf.Message;
@@ -25,36 +25,20 @@ import java.util.Map;
import java.util.function.BiConsumer;
import java.util.concurrent.CompletableFuture;
-public interface Greeter {
+public interface Greeter extends org.apache.dubbo.rpc.model.DubboStub {
String JAVA_SERVICE_NAME = "org.apache.dubbo.sample.Greeter";
- String SERVICE_NAME = "org.apache.dubbo.samples.Greeter";
-
- /**
+ String SERVICE_NAME = "org.apache.dubbo.sample.Greeter";
+ /**
* <pre>
* Sends a greeting
* </pre>
*/
org.apache.dubbo.sample.HelloReply
sayHello(org.apache.dubbo.sample.HelloRequest request);
- default CompletableFuture<org.apache.dubbo.sample.HelloReply>
sayHelloAsync(org.apache.dubbo.sample.HelloRequest request){
- return CompletableFuture.completedFuture(sayHello(request));
- }
+ CompletableFuture<org.apache.dubbo.sample.HelloReply>
sayHelloAsync(org.apache.dubbo.sample.HelloRequest request);
+
- /**
- * This server stream type unary method is <b>only</b> used for generated
stub to support async unary method.
- * It will not be called if you are NOT using Dubbo3 generated triple stub
and <b>DO NOT</b> implement this method.
- */
- default void sayHello(org.apache.dubbo.sample.HelloRequest request,
StreamObserver<org.apache.dubbo.sample.HelloReply> responseObserver){
- sayHelloAsync(request).whenComplete((r, t) -> {
- if (t != null) {
- responseObserver.onError(t);
- } else {
- responseObserver.onNext(r);
- responseObserver.onCompleted();
- }
- });
- }
diff --git
a/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloReply.java
b/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloReply.java
index 8712757b..ccc87213 100644
---
a/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloReply.java
+++
b/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloReply.java
@@ -8,11 +8,11 @@ package org.apache.dubbo.sample;
* The response message containing the greetings
* </pre>
*
- * Protobuf type {@code org.apache.dubbo.samples.HelloReply}
+ * Protobuf type {@code org.apache.dubbo.sample.HelloReply}
*/
public final class HelloReply extends
com.google.protobuf.GeneratedMessageV3 implements
- //
@@protoc_insertion_point(message_implements:org.apache.dubbo.samples.HelloReply)
+ //
@@protoc_insertion_point(message_implements:org.apache.dubbo.sample.HelloReply)
HelloReplyOrBuilder {
private static final long serialVersionUID = 0L;
// Use HelloReply.newBuilder() to construct.
@@ -80,13 +80,13 @@ private static final long serialVersionUID = 0L;
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_samples_HelloReply_descriptor;
+ return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_sample_HelloReply_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
- return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_samples_HelloReply_fieldAccessorTable
+ return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_sample_HelloReply_fieldAccessorTable
.ensureFieldAccessorsInitialized(
org.apache.dubbo.sample.HelloReply.class,
org.apache.dubbo.sample.HelloReply.Builder.class);
}
@@ -288,21 +288,21 @@ private static final long serialVersionUID = 0L;
* The response message containing the greetings
* </pre>
*
- * Protobuf type {@code org.apache.dubbo.samples.HelloReply}
+ * Protobuf type {@code org.apache.dubbo.sample.HelloReply}
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
- //
@@protoc_insertion_point(builder_implements:org.apache.dubbo.samples.HelloReply)
+ //
@@protoc_insertion_point(builder_implements:org.apache.dubbo.sample.HelloReply)
org.apache.dubbo.sample.HelloReplyOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_samples_HelloReply_descriptor;
+ return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_sample_HelloReply_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
- return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_samples_HelloReply_fieldAccessorTable
+ return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_sample_HelloReply_fieldAccessorTable
.ensureFieldAccessorsInitialized(
org.apache.dubbo.sample.HelloReply.class,
org.apache.dubbo.sample.HelloReply.Builder.class);
}
@@ -333,7 +333,7 @@ private static final long serialVersionUID = 0L;
@java.lang.Override
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_samples_HelloReply_descriptor;
+ return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_sample_HelloReply_descriptor;
}
@java.lang.Override
@@ -523,10 +523,10 @@ private static final long serialVersionUID = 0L;
}
- //
@@protoc_insertion_point(builder_scope:org.apache.dubbo.samples.HelloReply)
+ //
@@protoc_insertion_point(builder_scope:org.apache.dubbo.sample.HelloReply)
}
- // @@protoc_insertion_point(class_scope:org.apache.dubbo.samples.HelloReply)
+ // @@protoc_insertion_point(class_scope:org.apache.dubbo.sample.HelloReply)
private static final org.apache.dubbo.sample.HelloReply DEFAULT_INSTANCE;
static {
DEFAULT_INSTANCE = new org.apache.dubbo.sample.HelloReply();
diff --git
a/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloReplyOrBuilder.java
b/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloReplyOrBuilder.java
index 71da562d..79831ab0 100644
---
a/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloReplyOrBuilder.java
+++
b/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloReplyOrBuilder.java
@@ -4,7 +4,7 @@
package org.apache.dubbo.sample;
public interface HelloReplyOrBuilder extends
- //
@@protoc_insertion_point(interface_extends:org.apache.dubbo.samples.HelloReply)
+ //
@@protoc_insertion_point(interface_extends:org.apache.dubbo.sample.HelloReply)
com.google.protobuf.MessageOrBuilder {
/**
diff --git
a/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloRequest.java
b/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloRequest.java
index b8a490ae..86829ab3 100644
---
a/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloRequest.java
+++
b/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloRequest.java
@@ -8,11 +8,11 @@ package org.apache.dubbo.sample;
* The request message containing the user's name.
* </pre>
*
- * Protobuf type {@code org.apache.dubbo.samples.HelloRequest}
+ * Protobuf type {@code org.apache.dubbo.sample.HelloRequest}
*/
public final class HelloRequest extends
com.google.protobuf.GeneratedMessageV3 implements
- //
@@protoc_insertion_point(message_implements:org.apache.dubbo.samples.HelloRequest)
+ //
@@protoc_insertion_point(message_implements:org.apache.dubbo.sample.HelloRequest)
HelloRequestOrBuilder {
private static final long serialVersionUID = 0L;
// Use HelloRequest.newBuilder() to construct.
@@ -80,13 +80,13 @@ private static final long serialVersionUID = 0L;
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_samples_HelloRequest_descriptor;
+ return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_sample_HelloRequest_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
- return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_samples_HelloRequest_fieldAccessorTable
+ return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_sample_HelloRequest_fieldAccessorTable
.ensureFieldAccessorsInitialized(
org.apache.dubbo.sample.HelloRequest.class,
org.apache.dubbo.sample.HelloRequest.Builder.class);
}
@@ -288,21 +288,21 @@ private static final long serialVersionUID = 0L;
* The request message containing the user's name.
* </pre>
*
- * Protobuf type {@code org.apache.dubbo.samples.HelloRequest}
+ * Protobuf type {@code org.apache.dubbo.sample.HelloRequest}
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
- //
@@protoc_insertion_point(builder_implements:org.apache.dubbo.samples.HelloRequest)
+ //
@@protoc_insertion_point(builder_implements:org.apache.dubbo.sample.HelloRequest)
org.apache.dubbo.sample.HelloRequestOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_samples_HelloRequest_descriptor;
+ return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_sample_HelloRequest_descriptor;
}
@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
- return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_samples_HelloRequest_fieldAccessorTable
+ return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_sample_HelloRequest_fieldAccessorTable
.ensureFieldAccessorsInitialized(
org.apache.dubbo.sample.HelloRequest.class,
org.apache.dubbo.sample.HelloRequest.Builder.class);
}
@@ -333,7 +333,7 @@ private static final long serialVersionUID = 0L;
@java.lang.Override
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_samples_HelloRequest_descriptor;
+ return
org.apache.dubbo.sample.HelloWorldProto.internal_static_org_apache_dubbo_sample_HelloRequest_descriptor;
}
@java.lang.Override
@@ -523,10 +523,10 @@ private static final long serialVersionUID = 0L;
}
- //
@@protoc_insertion_point(builder_scope:org.apache.dubbo.samples.HelloRequest)
+ //
@@protoc_insertion_point(builder_scope:org.apache.dubbo.sample.HelloRequest)
}
- //
@@protoc_insertion_point(class_scope:org.apache.dubbo.samples.HelloRequest)
+ // @@protoc_insertion_point(class_scope:org.apache.dubbo.sample.HelloRequest)
private static final org.apache.dubbo.sample.HelloRequest DEFAULT_INSTANCE;
static {
DEFAULT_INSTANCE = new org.apache.dubbo.sample.HelloRequest();
diff --git
a/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloRequestOrBuilder.java
b/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloRequestOrBuilder.java
index 0573b3db..2fc6552f 100644
---
a/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloRequestOrBuilder.java
+++
b/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloRequestOrBuilder.java
@@ -4,7 +4,7 @@
package org.apache.dubbo.sample;
public interface HelloRequestOrBuilder extends
- //
@@protoc_insertion_point(interface_extends:org.apache.dubbo.samples.HelloRequest)
+ //
@@protoc_insertion_point(interface_extends:org.apache.dubbo.sample.HelloRequest)
com.google.protobuf.MessageOrBuilder {
/**
diff --git
a/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloWorldProto.java
b/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloWorldProto.java
index aed85f54..26b1cbe7 100644
---
a/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloWorldProto.java
+++
b/java_interop/protobuf-triple/java/java-client/build/protobuf/java/org/apache/dubbo/sample/HelloWorldProto.java
@@ -15,15 +15,15 @@ public final class HelloWorldProto {
(com.google.protobuf.ExtensionRegistryLite) registry);
}
static final com.google.protobuf.Descriptors.Descriptor
- internal_static_org_apache_dubbo_samples_HelloRequest_descriptor;
+ internal_static_org_apache_dubbo_sample_HelloRequest_descriptor;
static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
- internal_static_org_apache_dubbo_samples_HelloRequest_fieldAccessorTable;
+ internal_static_org_apache_dubbo_sample_HelloRequest_fieldAccessorTable;
static final com.google.protobuf.Descriptors.Descriptor
- internal_static_org_apache_dubbo_samples_HelloReply_descriptor;
+ internal_static_org_apache_dubbo_sample_HelloReply_descriptor;
static final
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
- internal_static_org_apache_dubbo_samples_HelloReply_fieldAccessorTable;
+ internal_static_org_apache_dubbo_sample_HelloReply_fieldAccessorTable;
public static com.google.protobuf.Descriptors.FileDescriptor
getDescriptor() {
@@ -33,29 +33,29 @@ public final class HelloWorldProto {
descriptor;
static {
java.lang.String[] descriptorData = {
- "\n\013greet.proto\022\030org.apache.dubbo.samples\"" +
- "\034\n\014HelloRequest\022\014\n\004name\030\001
\001(\t\"\035\n\nHelloRe" +
- "ply\022\017\n\007message\030\001
\001(\t2c\n\007Greeter\022X\n\010SayHe" +
- "llo\022&.org.apache.dubbo.samples.HelloRequ" +
- "est\032$.org.apache.dubbo.samples.HelloRepl" +
- "yB?\n\027org.apache.dubbo.sampleB\017HelloWorld" +
- "ProtoP\001Z\014/proto;proto\242\002\002WHb\006proto3"
+ "\n\013greet.proto\022\027org.apache.dubbo.sample\"\034" +
+ "\n\014HelloRequest\022\014\n\004name\030\001 \001(\t\"\035\n\nHelloRep"
+
+ "ly\022\017\n\007message\030\001
\001(\t2a\n\007Greeter\022V\n\010SayHel" +
+ "lo\022%.org.apache.dubbo.sample.HelloReques" +
+ "t\032#.org.apache.dubbo.sample.HelloReplyB?" +
+ "\n\027org.apache.dubbo.sampleB\017HelloWorldPro" +
+ "toP\001Z\014/proto;proto\242\002\002WHb\006proto3"
};
descriptor = com.google.protobuf.Descriptors.FileDescriptor
.internalBuildGeneratedFileFrom(descriptorData,
new com.google.protobuf.Descriptors.FileDescriptor[] {
});
- internal_static_org_apache_dubbo_samples_HelloRequest_descriptor =
+ internal_static_org_apache_dubbo_sample_HelloRequest_descriptor =
getDescriptor().getMessageTypes().get(0);
- internal_static_org_apache_dubbo_samples_HelloRequest_fieldAccessorTable =
new
+ internal_static_org_apache_dubbo_sample_HelloRequest_fieldAccessorTable =
new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
- internal_static_org_apache_dubbo_samples_HelloRequest_descriptor,
+ internal_static_org_apache_dubbo_sample_HelloRequest_descriptor,
new java.lang.String[] { "Name", });
- internal_static_org_apache_dubbo_samples_HelloReply_descriptor =
+ internal_static_org_apache_dubbo_sample_HelloReply_descriptor =
getDescriptor().getMessageTypes().get(1);
- internal_static_org_apache_dubbo_samples_HelloReply_fieldAccessorTable =
new
+ internal_static_org_apache_dubbo_sample_HelloReply_fieldAccessorTable = new
com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
- internal_static_org_apache_dubbo_samples_HelloReply_descriptor,
+ internal_static_org_apache_dubbo_sample_HelloReply_descriptor,
new java.lang.String[] { "Message", });
}
diff --git a/java_interop/protobuf-triple/java/java-client/pom.xml
b/java_interop/protobuf-triple/java/java-client/pom.xml
index 77468c7f..e5b3818a 100644
--- a/java_interop/protobuf-triple/java/java-client/pom.xml
+++ b/java_interop/protobuf-triple/java/java-client/pom.xml
@@ -12,7 +12,7 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <dubbo.version>3.1.7</dubbo.version>
+ <dubbo.version>3.3.0-beta.2</dubbo.version>
</properties>
<dependencies>
<dependency>
@@ -57,7 +57,6 @@
<artifactId>log4j-api</artifactId>
<version>2.14.1</version>
</dependency>
-
</dependencies>
<build>
diff --git a/java_interop/protobuf-triple/java/java-client/run.sh
b/java_interop/protobuf-triple/java/java-client/run.sh
old mode 100644
new mode 100755
diff --git
a/java_interop/protobuf-triple/java/java-server/build/protobuf/java/org/apache/dubbo/sample/DubboGreeterTriple.java
b/java_interop/protobuf-triple/java/java-server/build/protobuf/java/org/apache/dubbo/sample/DubboGreeterTriple.java
index 5fba7248..4f761923 100644
---
a/java_interop/protobuf-triple/java/java-server/build/protobuf/java/org/apache/dubbo/sample/DubboGreeterTriple.java
+++
b/java_interop/protobuf-triple/java/java-server/build/protobuf/java/org/apache/dubbo/sample/DubboGreeterTriple.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
- package org.apache.dubbo.sample;
+package org.apache.dubbo.sample;
import org.apache.dubbo.common.stream.StreamObserver;
import org.apache.dubbo.common.URL;
@@ -68,23 +68,27 @@ public final class DubboGreeterTriple {
* </pre>
*/
private static final StubMethodDescriptor sayHelloMethod = new
StubMethodDescriptor("SayHello",
- org.apache.dubbo.sample.HelloRequest.class,
org.apache.dubbo.sample.HelloReply.class, serviceDescriptor,
MethodDescriptor.RpcType.UNARY,
+ org.apache.dubbo.sample.HelloRequest.class,
org.apache.dubbo.sample.HelloReply.class, MethodDescriptor.RpcType.UNARY,
obj -> ((Message) obj).toByteArray(), obj -> ((Message)
obj).toByteArray(), org.apache.dubbo.sample.HelloRequest::parseFrom,
org.apache.dubbo.sample.HelloReply::parseFrom);
private static final StubMethodDescriptor sayHelloAsyncMethod = new
StubMethodDescriptor("SayHello",
- org.apache.dubbo.sample.HelloRequest.class,
java.util.concurrent.CompletableFuture.class, serviceDescriptor,
MethodDescriptor.RpcType.UNARY,
+ org.apache.dubbo.sample.HelloRequest.class,
java.util.concurrent.CompletableFuture.class, MethodDescriptor.RpcType.UNARY,
obj -> ((Message) obj).toByteArray(), obj -> ((Message)
obj).toByteArray(), org.apache.dubbo.sample.HelloRequest::parseFrom,
org.apache.dubbo.sample.HelloReply::parseFrom);
private static final StubMethodDescriptor sayHelloProxyAsyncMethod = new
StubMethodDescriptor("SayHelloAsync",
- org.apache.dubbo.sample.HelloRequest.class,
org.apache.dubbo.sample.HelloReply.class, serviceDescriptor,
MethodDescriptor.RpcType.UNARY,
+ org.apache.dubbo.sample.HelloRequest.class,
org.apache.dubbo.sample.HelloReply.class, MethodDescriptor.RpcType.UNARY,
obj -> ((Message) obj).toByteArray(), obj -> ((Message)
obj).toByteArray(), org.apache.dubbo.sample.HelloRequest::parseFrom,
org.apache.dubbo.sample.HelloReply::parseFrom);
+ static{
+ serviceDescriptor.addMethod(sayHelloMethod);
+ serviceDescriptor.addMethod(sayHelloProxyAsyncMethod);
+ }
public static class GreeterStub implements Greeter{
private final Invoker<Greeter> invoker;
@@ -93,7 +97,7 @@ public final class DubboGreeterTriple {
this.invoker = invoker;
}
- /**
+ /**
* <pre>
* Sends a greeting
* </pre>
@@ -107,12 +111,11 @@ public final class DubboGreeterTriple {
return StubInvocationUtil.unaryCall(invoker, sayHelloAsyncMethod,
request);
}
- /**
+ /**
* <pre>
* Sends a greeting
* </pre>
*/
- @Override
public void sayHello(org.apache.dubbo.sample.HelloRequest request,
StreamObserver<org.apache.dubbo.sample.HelloReply> responseObserver){
StubInvocationUtil.unaryCall(invoker, sayHelloMethod , request,
responseObserver);
}
@@ -138,6 +141,26 @@ public final class DubboGreeterTriple {
};
}
+ @Override
+ public CompletableFuture<org.apache.dubbo.sample.HelloReply>
sayHelloAsync(org.apache.dubbo.sample.HelloRequest request){
+ return CompletableFuture.completedFuture(sayHello(request));
+ }
+
+ /**
+ * This server stream type unary method is <b>only</b> used for
generated stub to support async unary method.
+ * It will not be called if you are NOT using Dubbo3 generated triple
stub and <b>DO NOT</b> implement this method.
+ */
+ public void sayHello(org.apache.dubbo.sample.HelloRequest request,
StreamObserver<org.apache.dubbo.sample.HelloReply> responseObserver){
+ sayHelloAsync(request).whenComplete((r, t) -> {
+ if (t != null) {
+ responseObserver.onError(t);
+ } else {
+ responseObserver.onNext(r);
+ responseObserver.onCompleted();
+ }
+ });
+ }
+
@Override
public final Invoker<Greeter> getInvoker(URL url) {
PathResolver pathResolver = url.getOrDefaultFrameworkModel()
@@ -145,8 +168,12 @@ public final class DubboGreeterTriple {
.getDefaultExtension();
Map<String,StubMethodHandler<?, ?>> handlers = new HashMap<>();
- pathResolver.addNativeStub( "/" + SERVICE_NAME + "/SayHello" );
- pathResolver.addNativeStub( "/" + SERVICE_NAME + "/SayHelloAsync"
);
+ pathResolver.addNativeStub( "/" + SERVICE_NAME + "/SayHello");
+ pathResolver.addNativeStub( "/" + SERVICE_NAME + "/SayHelloAsync");
+ // for compatibility
+ pathResolver.addNativeStub( "/" + JAVA_SERVICE_NAME + "/SayHello");
+ pathResolver.addNativeStub( "/" + JAVA_SERVICE_NAME +
"/SayHelloAsync");
+
BiConsumer<org.apache.dubbo.sample.HelloRequest,
StreamObserver<org.apache.dubbo.sample.HelloReply>> sayHelloFunc =
this::sayHello;
handlers.put(sayHelloMethod.getMethodName(), new
UnaryStubMethodHandler<>(sayHelloFunc));
diff --git
a/java_interop/protobuf-triple/java/java-server/build/protobuf/java/org/apache/dubbo/sample/Greeter.java
b/java_interop/protobuf-triple/java/java-server/build/protobuf/java/org/apache/dubbo/sample/Greeter.java
index 23f70f05..2f2f69b6 100644
---
a/java_interop/protobuf-triple/java/java-server/build/protobuf/java/org/apache/dubbo/sample/Greeter.java
+++
b/java_interop/protobuf-triple/java/java-server/build/protobuf/java/org/apache/dubbo/sample/Greeter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
- package org.apache.dubbo.sample;
+package org.apache.dubbo.sample;
import org.apache.dubbo.common.stream.StreamObserver;
import com.google.protobuf.Message;
@@ -29,32 +29,16 @@ public interface Greeter extends
org.apache.dubbo.rpc.model.DubboStub {
String JAVA_SERVICE_NAME = "org.apache.dubbo.sample.Greeter";
String SERVICE_NAME = "org.apache.dubbo.sample.Greeter";
-
- /**
+ /**
* <pre>
* Sends a greeting
* </pre>
*/
org.apache.dubbo.sample.HelloReply
sayHello(org.apache.dubbo.sample.HelloRequest request);
- default CompletableFuture<org.apache.dubbo.sample.HelloReply>
sayHelloAsync(org.apache.dubbo.sample.HelloRequest request){
- return CompletableFuture.completedFuture(sayHello(request));
- }
+ CompletableFuture<org.apache.dubbo.sample.HelloReply>
sayHelloAsync(org.apache.dubbo.sample.HelloRequest request);
+
- /**
- * This server stream type unary method is <b>only</b> used for generated
stub to support async unary method.
- * It will not be called if you are NOT using Dubbo3 generated triple stub
and <b>DO NOT</b> implement this method.
- */
- default void sayHello(org.apache.dubbo.sample.HelloRequest request,
StreamObserver<org.apache.dubbo.sample.HelloReply> responseObserver){
- sayHelloAsync(request).whenComplete((r, t) -> {
- if (t != null) {
- responseObserver.onError(t);
- } else {
- responseObserver.onNext(r);
- responseObserver.onCompleted();
- }
- });
- }
diff --git a/java_interop/protobuf-triple/java/java-server/pom.xml
b/java_interop/protobuf-triple/java/java-server/pom.xml
index 0bdd6a3b..9e870297 100644
--- a/java_interop/protobuf-triple/java/java-server/pom.xml
+++ b/java_interop/protobuf-triple/java/java-server/pom.xml
@@ -12,7 +12,7 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <dubbo.version>3.3.0-beta.1</dubbo.version>
+ <dubbo.version>3.3.0-beta.2</dubbo.version>
</properties>
<dependencies>
<dependency>
diff --git a/java_interop/protobuf-triple/java/java-server/run.sh
b/java_interop/protobuf-triple/java/java-server/run.sh
old mode 100644
new mode 100755
