[SCB-2017]fix invoke with appid and highway throw error

apache · Jun 22, 2020 · 5cee981 · 5cee981
1 parent 1d1225e
commit 5cee981
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/...ava/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java b/...ava/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java
@@ -93,7 +93,7 @@ public Proto convert() {
   }
 
   public static String escapePackageName(String name) {
-    return name.replaceAll("\\-", "_");
+    return name.replaceAll("[\\-\\:]", "_");
   }
 
   public static String escapeMessageName(String name) {

diff --git a/...org/apache/servicecomb/codec/protobuf/internal/converter/TestSwaggerToProtoGenerator.java b/...org/apache/servicecomb/codec/protobuf/internal/converter/TestSwaggerToProtoGenerator.java
@@ -52,6 +52,7 @@ public void testEscape() {
     Assert.assertEquals("hello_my_service", SwaggerToProtoGenerator.escapeMessageName("hello_my_service"));
     Assert.assertEquals("hello.my_service", SwaggerToProtoGenerator.escapePackageName("hello.my-service"));
     Assert.assertEquals("hello.test.test", SwaggerToProtoGenerator.escapePackageName("hello.test.test"));
+    Assert.assertEquals("hello_my.test.test", SwaggerToProtoGenerator.escapePackageName("hello:my.test.test"));
     Assert.assertEquals(false, SwaggerToProtoGenerator.isValidEnum("hello.test.test"));
     Assert.assertEquals(false, SwaggerToProtoGenerator.isValidEnum("hello.my-service"));
     Assert.assertEquals(true, SwaggerToProtoGenerator.isValidEnum("My_ENum"));

diff --git a/...-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestWeakSpringmvc.java b/...-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestWeakSpringmvc.java
@@ -111,6 +111,9 @@ public class TestWeakSpringmvc implements CategorizedTestCase {
   @RpcReference(microserviceName = "springmvc", schemaId = "weakSpringmvc")
   private SpecialNameModelInf specialNameModelInf;
 
+  @RpcReference(microserviceName = "springmvctest:springmvc", schemaId = "weakSpringmvc")
+  private SpecialNameModelInf specialNameModelInfWithAppId;
+
   private RestTemplate restTemplate = RestTemplateBuilder.create();
 
   @Override
@@ -139,6 +142,8 @@ private void testSpecailNameModel() {
     model.setaIntName(30);
     SpecialNameModel result = specialNameModelInf.specialNameModel(0, model);
     TestMgr.check(30, result.getaIntName());
+    result = specialNameModelInfWithAppId.specialNameModel(0, model);
+    TestMgr.check(30, result.getaIntName());
   }
 
   private void testGenericsModel() throws JsonProcessingException {
@@ -176,9 +181,15 @@ private void testDiffName() {
     TestMgr.check(7, diffNames.differentName(2, 3));
     TestMgr.check(8, diffNames2.differentName(2, 3));
     TestMgr.check(7, restTemplate.getForObject("cse://springmvc/weakSpringmvc/diffNames?x=2&y=3", Integer.class));
+    TestMgr.check(7, restTemplate
+        .getForObject("cse://springmvctest:springmvc/weakSpringmvc/diffNames?x=2&y=3",
+            Integer.class));
     Map<String, Object> args = new HashMap<>();
     args.put("x", 2);
     args.put("y", 3);
-    TestMgr.check(7, InvokerUtils.syncInvoke("springmvc", "weakSpringmvc", "differentName", args));
+    TestMgr.check(7, InvokerUtils.syncInvoke("springmvc",
+        "weakSpringmvc", "differentName", args));
+    TestMgr.check(7, InvokerUtils.syncInvoke("springmvctest:springmvc",
+        "weakSpringmvc", "differentName", args));
   }
 }