fix:when proto miss package config bug (apache#13373)

Co-authored-by: pengxiaoyu <[email protected]> Co-authored-by: earthchen <[email protected]>
oxsean · Nov 20, 2023 · 650ee3b · 650ee3b
1 parent f441e79
commit 650ee3b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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}}}