This is an automated email from the ASF dual-hosted git repository.
earthchen pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.3 by this push:
new 650ee3b9d4 fix:when proto miss package config bug (#13373)
650ee3b9d4 is described below
commit 650ee3b9d4904e8c696744dff5079efd528ed6c0
Author: XiaoyuPeng <[email protected]>
AuthorDate: Mon Nov 20 21:57:02 2023 +0800
fix:when proto miss package config bug (#13373)
Co-authored-by: pengxiaoyu <[email protected]>
Co-authored-by: earthchen <[email protected]>
---
.../dubbo-compiler/src/main/resources/Dubbo3InterfaceStub.mustache | 5 +++++
.../src/main/resources/Dubbo3TripleInterfaceStub.mustache | 6 +++++-
.../src/main/resources/ReactorDubbo3TripleInterfaceStub.mustache | 7 +++++--
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git
a/dubbo-plugin/dubbo-compiler/src/main/resources/Dubbo3InterfaceStub.mustache
b/dubbo-plugin/dubbo-compiler/src/main/resources/Dubbo3InterfaceStub.mustache
index ebbaad9f7d..2764d63e83 100644
---
a/dubbo-plugin/dubbo-compiler/src/main/resources/Dubbo3InterfaceStub.mustache
+++
b/dubbo-plugin/dubbo-compiler/src/main/resources/Dubbo3InterfaceStub.mustache
@@ -28,7 +28,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
public interface {{interfaceClassName}} extends
org.apache.dubbo.rpc.model.DubboStub {
static final String JAVA_SERVICE_NAME = "{{packageName}}.{{serviceName}}";
+{{#commonPackageName}}
static final String SERVICE_NAME = "{{commonPackageName}}.{{serviceName}}";
+{{/commonPackageName}}
+{{^commonPackageName}}
+ static final String SERVICE_NAME = "{{serviceName}}";
+{{/commonPackageName}}
// FIXME, initialize Dubbo3 stub when interface loaded, thinking of new
ways doing this.
static final boolean inited = {{className}}.init();
diff --git
a/dubbo-plugin/dubbo-compiler/src/main/resources/Dubbo3TripleInterfaceStub.mustache
b/dubbo-plugin/dubbo-compiler/src/main/resources/Dubbo3TripleInterfaceStub.mustache
index 72b68c3d67..d4ca6653f9 100644
---
a/dubbo-plugin/dubbo-compiler/src/main/resources/Dubbo3TripleInterfaceStub.mustache
+++
b/dubbo-plugin/dubbo-compiler/src/main/resources/Dubbo3TripleInterfaceStub.mustache
@@ -30,8 +30,12 @@ import java.util.concurrent.CompletableFuture;
public interface {{interfaceClassName}} extends
org.apache.dubbo.rpc.model.DubboStub {
String JAVA_SERVICE_NAME = "{{packageName}}.{{serviceName}}";
+{{#commonPackageName}}
String SERVICE_NAME = "{{commonPackageName}}.{{serviceName}}";
-
+{{/commonPackageName}}
+{{^commonPackageName}}
+ String SERVICE_NAME = "{{serviceName}}";
+{{/commonPackageName}}
{{#unaryMethods}}
{{#javaDoc}}
{{{javaDoc}}}
diff --git
a/dubbo-plugin/dubbo-compiler/src/main/resources/ReactorDubbo3TripleInterfaceStub.mustache
b/dubbo-plugin/dubbo-compiler/src/main/resources/ReactorDubbo3TripleInterfaceStub.mustache
index 43e427f9f3..59114929e5 100644
---
a/dubbo-plugin/dubbo-compiler/src/main/resources/ReactorDubbo3TripleInterfaceStub.mustache
+++
b/dubbo-plugin/dubbo-compiler/src/main/resources/ReactorDubbo3TripleInterfaceStub.mustache
@@ -25,9 +25,12 @@ import reactor.core.publisher.Mono;
public interface {{interfaceClassName}} extends
org.apache.dubbo.rpc.model.DubboStub {
String JAVA_SERVICE_NAME = "{{packageName}}.{{serviceName}}";
-
+{{#commonPackageName}}
String SERVICE_NAME = "{{commonPackageName}}.{{serviceName}}";
-
+{{/commonPackageName}}
+{{^commonPackageName}}
+ String SERVICE_NAME = "{{commonPackageName}}.{{serviceName}}";
+{{/commonPackageName}}
{{#methods}}
{{#javaDoc}}
{{{javaDoc}}}
