Fix compile

apache · Oct 25, 2024 · 3823e7d · 3823e7d
1 parent 7eabbd8
commit 3823e7d
Show file tree

Hide file tree

Showing 41 changed files with 110 additions and 1,757 deletions.
diff --git a/...nerated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/DubboGreeterTriple.java b/...nerated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/DubboGreeterTriple.java
@@ -15,10 +15,10 @@
 * limitations under the License.
 */
 
-    package org.apache.dubbo.samples.tri.unary;
+package org.apache.dubbo.samples.tri.unary;
 
-import org.apache.dubbo.common.stream.StreamObserver;
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.stream.StreamObserver;
 import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.PathResolver;
 import org.apache.dubbo.rpc.RpcException;
@@ -28,20 +28,19 @@
 import org.apache.dubbo.rpc.model.ServiceDescriptor;
 import org.apache.dubbo.rpc.model.StubMethodDescriptor;
 import org.apache.dubbo.rpc.model.StubServiceDescriptor;
-import org.apache.dubbo.rpc.stub.BiStreamMethodHandler;
-import org.apache.dubbo.rpc.stub.ServerStreamMethodHandler;
+import org.apache.dubbo.rpc.service.Destroyable;
 import org.apache.dubbo.rpc.stub.StubInvocationUtil;
 import org.apache.dubbo.rpc.stub.StubInvoker;
 import org.apache.dubbo.rpc.stub.StubMethodHandler;
 import org.apache.dubbo.rpc.stub.StubSuppliers;
 import org.apache.dubbo.rpc.stub.UnaryStubMethodHandler;
 
-import com.google.protobuf.Message;
-
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.BiConsumer;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.BiConsumer;
+
+import com.google.protobuf.Message;
 
 public final class DubboGreeterTriple {
 
@@ -63,31 +62,40 @@ public static Greeter newStub(Invoker<?> invoker) {
     }
 
     private static final StubMethodDescriptor greetMethod = new StubMethodDescriptor("greet",
-    org.apache.dubbo.samples.tri.unary.GreeterRequest.class, org.apache.dubbo.samples.tri.unary.GreeterReply.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY,
+    org.apache.dubbo.samples.tri.unary.GreeterRequest.class, org.apache.dubbo.samples.tri.unary.GreeterReply.class, MethodDescriptor.RpcType.UNARY,
     obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), org.apache.dubbo.samples.tri.unary.GreeterRequest::parseFrom,
     org.apache.dubbo.samples.tri.unary.GreeterReply::parseFrom);
 
     private static final StubMethodDescriptor greetAsyncMethod = new StubMethodDescriptor("greet",
-    org.apache.dubbo.samples.tri.unary.GreeterRequest.class, java.util.concurrent.CompletableFuture.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY,
+    org.apache.dubbo.samples.tri.unary.GreeterRequest.class, java.util.concurrent.CompletableFuture.class, MethodDescriptor.RpcType.UNARY,
     obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), org.apache.dubbo.samples.tri.unary.GreeterRequest::parseFrom,
     org.apache.dubbo.samples.tri.unary.GreeterReply::parseFrom);
 
     private static final StubMethodDescriptor greetProxyAsyncMethod = new StubMethodDescriptor("greetAsync",
-    org.apache.dubbo.samples.tri.unary.GreeterRequest.class, org.apache.dubbo.samples.tri.unary.GreeterReply.class, serviceDescriptor, MethodDescriptor.RpcType.UNARY,
+    org.apache.dubbo.samples.tri.unary.GreeterRequest.class, org.apache.dubbo.samples.tri.unary.GreeterReply.class, MethodDescriptor.RpcType.UNARY,
     obj -> ((Message) obj).toByteArray(), obj -> ((Message) obj).toByteArray(), org.apache.dubbo.samples.tri.unary.GreeterRequest::parseFrom,
     org.apache.dubbo.samples.tri.unary.GreeterReply::parseFrom);
 
 
 
 
+    static{
+        serviceDescriptor.addMethod(greetMethod);
+        serviceDescriptor.addMethod(greetProxyAsyncMethod);
+    }
 
-    public static class GreeterStub implements Greeter{
+    public static class GreeterStub implements Greeter, Destroyable {
         private final Invoker<Greeter> invoker;
 
         public GreeterStub(Invoker<Greeter> invoker) {
             this.invoker = invoker;
         }
 
+        @Override
+        public void $destroy() {
+              invoker.destroy();
+         }
+
         @Override
         public org.apache.dubbo.samples.tri.unary.GreeterReply greet(org.apache.dubbo.samples.tri.unary.GreeterRequest request){
             return StubInvocationUtil.unaryCall(invoker, greetMethod, request);
@@ -97,7 +105,6 @@ public CompletableFuture<org.apache.dubbo.samples.tri.unary.GreeterReply> greetA
             return StubInvocationUtil.unaryCall(invoker, greetAsyncMethod, request);
         }
 
-        @Override
         public void greet(org.apache.dubbo.samples.tri.unary.GreeterRequest request, StreamObserver<org.apache.dubbo.samples.tri.unary.GreeterReply> responseObserver){
             StubInvocationUtil.unaryCall(invoker, greetMethod , request, responseObserver);
         }
@@ -123,15 +130,39 @@ public void accept(T t, StreamObserver<R> observer) {
             };
         }
 
+        @Override
+        public CompletableFuture<org.apache.dubbo.samples.tri.unary.GreeterReply> greetAsync(org.apache.dubbo.samples.tri.unary.GreeterRequest request){
+                return CompletableFuture.completedFuture(greet(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 greet(org.apache.dubbo.samples.tri.unary.GreeterRequest request, StreamObserver<org.apache.dubbo.samples.tri.unary.GreeterReply> responseObserver){
+            greetAsync(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()
             .getExtensionLoader(PathResolver.class)
             .getDefaultExtension();
             Map<String,StubMethodHandler<?, ?>> handlers = new HashMap<>();
 
-            pathResolver.addNativeStub( "/" + SERVICE_NAME + "/greet" );
-            pathResolver.addNativeStub( "/" + SERVICE_NAME + "/greetAsync" );
+            pathResolver.addNativeStub( "/" + SERVICE_NAME + "/greet");
+            pathResolver.addNativeStub( "/" + SERVICE_NAME + "/greetAsync");
+            // for compatibility
+            pathResolver.addNativeStub( "/" + JAVA_SERVICE_NAME + "/greet");
+            pathResolver.addNativeStub( "/" + JAVA_SERVICE_NAME + "/greetAsync");
+
 
             BiConsumer<org.apache.dubbo.samples.tri.unary.GreeterRequest, StreamObserver<org.apache.dubbo.samples.tri.unary.GreeterReply>> greetFunc = this::greet;
             handlers.put(greetMethod.getMethodName(), new UnaryStubMethodHandler<>(greetFunc));

diff --git a/...dl/build/generated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/Greeter.java b/...dl/build/generated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/Greeter.java
@@ -15,41 +15,19 @@
 * limitations under the License.
 */
 
-    package org.apache.dubbo.samples.tri.unary;
+package org.apache.dubbo.samples.tri.unary;
 
-import org.apache.dubbo.common.stream.StreamObserver;
-import com.google.protobuf.Message;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.BiConsumer;
 import java.util.concurrent.CompletableFuture;
 
 public interface Greeter extends org.apache.dubbo.rpc.model.DubboStub {
 
     String JAVA_SERVICE_NAME = "org.apache.dubbo.samples.tri.unary.Greeter";
     String SERVICE_NAME = "org.apache.dubbo.samples.tri.unary.Greeter";
-
     org.apache.dubbo.samples.tri.unary.GreeterReply greet(org.apache.dubbo.samples.tri.unary.GreeterRequest request);
 
-    default CompletableFuture<org.apache.dubbo.samples.tri.unary.GreeterReply> greetAsync(org.apache.dubbo.samples.tri.unary.GreeterRequest request){
-        return CompletableFuture.completedFuture(greet(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 greet(org.apache.dubbo.samples.tri.unary.GreeterRequest request, StreamObserver<org.apache.dubbo.samples.tri.unary.GreeterReply> responseObserver){
-        greetAsync(request).whenComplete((r, t) -> {
-            if (t != null) {
-                responseObserver.onError(t);
-            } else {
-                responseObserver.onNext(r);
-                responseObserver.onCompleted();
-            }
-        });
-    }
+    CompletableFuture<org.apache.dubbo.samples.tri.unary.GreeterReply> greetAsync(org.apache.dubbo.samples.tri.unary.GreeterRequest request);
+
+
 
 
 

diff --git a/...enerated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/GreeterOuterClass.java b/...enerated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/GreeterOuterClass.java
diff --git a/...ild/generated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/GreeterReply.java b/...ild/generated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/GreeterReply.java
diff --git a/...d/generated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/GreeterRequest.java b/...d/generated/source/proto/main/java/org/apache/dubbo/samples/tri/unary/GreeterRequest.java
diff --git a/...rated/source/proto/main/java/org/apache/dubbo/springboot/demo/idl/DubboGreeterTriple.java b/...rated/source/proto/main/java/org/apache/dubbo/springboot/demo/idl/DubboGreeterTriple.java
@@ -17,8 +17,8 @@
 
 package org.apache.dubbo.springboot.demo.idl;
 
-import org.apache.dubbo.common.stream.StreamObserver;
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.stream.StreamObserver;
 import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.PathResolver;
 import org.apache.dubbo.rpc.RpcException;
@@ -28,20 +28,19 @@
 import org.apache.dubbo.rpc.model.ServiceDescriptor;
 import org.apache.dubbo.rpc.model.StubMethodDescriptor;
 import org.apache.dubbo.rpc.model.StubServiceDescriptor;
-import org.apache.dubbo.rpc.stub.BiStreamMethodHandler;
-import org.apache.dubbo.rpc.stub.ServerStreamMethodHandler;
+import org.apache.dubbo.rpc.service.Destroyable;
 import org.apache.dubbo.rpc.stub.StubInvocationUtil;
 import org.apache.dubbo.rpc.stub.StubInvoker;
 import org.apache.dubbo.rpc.stub.StubMethodHandler;
 import org.apache.dubbo.rpc.stub.StubSuppliers;
 import org.apache.dubbo.rpc.stub.UnaryStubMethodHandler;
 
-import com.google.protobuf.Message;
-
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.BiConsumer;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.BiConsumer;
+
+import com.google.protobuf.Message;
 
 public final class DubboGreeterTriple {
 
@@ -85,13 +84,18 @@ public static Greeter newStub(Invoker<?> invoker) {
         serviceDescriptor.addMethod(greetProxyAsyncMethod);
     }
 
-    public static class GreeterStub implements Greeter{
+    public static class GreeterStub implements Greeter, Destroyable {
         private final Invoker<Greeter> invoker;
 
         public GreeterStub(Invoker<Greeter> invoker) {
             this.invoker = invoker;
         }
 
+        @Override
+        public void $destroy() {
+              invoker.destroy();
+         }
+
         @Override
         public org.apache.dubbo.springboot.demo.idl.GreeterReply greet(org.apache.dubbo.springboot.demo.idl.GreeterRequest request){
             return StubInvocationUtil.unaryCall(invoker, greetMethod, request);

diff --git a/...rated/source/proto/main/java/org/apache/dubbo/springboot/demo/idl/DubboGreeterTriple.java b/...rated/source/proto/main/java/org/apache/dubbo/springboot/demo/idl/DubboGreeterTriple.java
@@ -17,8 +17,8 @@
 
 package org.apache.dubbo.springboot.demo.idl;
 
-import org.apache.dubbo.common.stream.StreamObserver;
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.stream.StreamObserver;
 import org.apache.dubbo.rpc.Invoker;
 import org.apache.dubbo.rpc.PathResolver;
 import org.apache.dubbo.rpc.RpcException;
@@ -28,20 +28,19 @@
 import org.apache.dubbo.rpc.model.ServiceDescriptor;
 import org.apache.dubbo.rpc.model.StubMethodDescriptor;
 import org.apache.dubbo.rpc.model.StubServiceDescriptor;
-import org.apache.dubbo.rpc.stub.BiStreamMethodHandler;
-import org.apache.dubbo.rpc.stub.ServerStreamMethodHandler;
+import org.apache.dubbo.rpc.service.Destroyable;
 import org.apache.dubbo.rpc.stub.StubInvocationUtil;
 import org.apache.dubbo.rpc.stub.StubInvoker;
 import org.apache.dubbo.rpc.stub.StubMethodHandler;
 import org.apache.dubbo.rpc.stub.StubSuppliers;
 import org.apache.dubbo.rpc.stub.UnaryStubMethodHandler;
 
-import com.google.protobuf.Message;
-
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.BiConsumer;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.BiConsumer;
+
+import com.google.protobuf.Message;
 
 public final class DubboGreeterTriple {
 
@@ -85,13 +84,18 @@ public static Greeter newStub(Invoker<?> invoker) {
         serviceDescriptor.addMethod(greetProxyAsyncMethod);
     }
 
-    public static class GreeterStub implements Greeter{
+    public static class GreeterStub implements Greeter, Destroyable {
         private final Invoker<Greeter> invoker;
 
         public GreeterStub(Invoker<Greeter> invoker) {
             this.invoker = invoker;
         }
 
+        @Override
+        public void $destroy() {
+              invoker.destroy();
+         }
+
         @Override
         public org.apache.dubbo.springboot.demo.idl.GreeterReply greet(org.apache.dubbo.springboot.demo.idl.GreeterRequest request){
             return StubInvocationUtil.unaryCall(invoker, greetMethod, request);

diff --git a/10-task/dubbo-samples-benchmark/dubbo-samples-benchmark-consumer/pom.xml b/10-task/dubbo-samples-benchmark/dubbo-samples-benchmark-consumer/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-dependencies-zookeeper</artifactId>
+            <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
             <type>pom</type>
             <exclusions>
                 <exclusion>

diff --git a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v1/pom.xml b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v1/pom.xml
@@ -64,12 +64,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-observability-autoconfigure</artifactId>
+            <artifactId>dubbo-observability-spring-boot-starter</artifactId>
             <version>${dubbo.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-tracing-otel-zipkin-starter</artifactId>
+            <artifactId>dubbo-tracing-otel-zipkin-spring-boot-starter</artifactId>
             <version>${dubbo.version}</version>
         </dependency>
 

diff --git a/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v2/pom.xml b/10-task/dubbo-samples-metrics-demo/dubbo-samples-metrics-demo-comment-v2/pom.xml
@@ -64,12 +64,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-observability-autoconfigure</artifactId>
+            <artifactId>dubbo-observability-spring-boot-starter</artifactId>
             <version>${dubbo.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-tracing-otel-zipkin-starter</artifactId>
+            <artifactId>dubbo-tracing-otel-zipkin-spring-boot-starter</artifactId>
             <version>${dubbo.version}</version>
         </dependency>