You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2020/06/22 03:37:10 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2017]fix
invoke with appid and highway throw error
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 5cee981 [SCB-2017]fix invoke with appid and highway throw error
5cee981 is described below
commit 5cee981f8b9657c95241fb3613564e403290dd52
Author: liubao <bi...@qq.com>
AuthorDate: Sat Jun 20 16:00:20 2020 +0800
[SCB-2017]fix invoke with appid and highway throw error
---
.../internal/converter/SwaggerToProtoGenerator.java | 2 +-
.../internal/converter/TestSwaggerToProtoGenerator.java | 1 +
.../demo/springmvc/client/TestWeakSpringmvc.java | 13 ++++++++++++-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java
index c6e1cab..841bab2 100644
--- a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java
+++ b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java
@@ -93,7 +93,7 @@ public class SwaggerToProtoGenerator {
}
public static String escapePackageName(String name) {
- return name.replaceAll("\\-", "_");
+ return name.replaceAll("[\\-\\:]", "_");
}
public static String escapeMessageName(String name) {
diff --git a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSwaggerToProtoGenerator.java b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSwaggerToProtoGenerator.java
index 03bd678..478ca49 100644
--- a/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSwaggerToProtoGenerator.java
+++ b/common/common-protobuf/src/test/java/org/apache/servicecomb/codec/protobuf/internal/converter/TestSwaggerToProtoGenerator.java
@@ -52,6 +52,7 @@ public class TestSwaggerToProtoGenerator {
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/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestWeakSpringmvc.java b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestWeakSpringmvc.java
index 6f92d92..3802ca1 100644
--- a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestWeakSpringmvc.java
+++ b/demo/demo-springmvc/springmvc-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 @@ public class TestWeakSpringmvc implements CategorizedTestCase {
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 @@ public class TestWeakSpringmvc implements CategorizedTestCase {
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));
}
}