[SCB-2131]fix review comment
diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/TestQueryParamWithListSchema.java b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/TestQueryParamWithListSchema.java
index 84ab80a..40c9b8d 100644
--- a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/TestQueryParamWithListSchema.java
+++ b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/TestQueryParamWithListSchema.java
@@ -61,16 +61,16 @@
}
private void testCSVRest() {
- TestMgr.check("[]",
+ TestMgr.check("0:[]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListCSV?", String.class));
}
private void testSSV() {
- TestMgr.check("[1, 2]",
+ TestMgr.check("2:[1, 2]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListSSV?queryList=1%202", String.class));
- TestMgr.check("[, ]",
+ TestMgr.check("2:[, ]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListSSV?queryList=%20", String.class));
- TestMgr.check("[]",
+ TestMgr.check("1:[]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListSSV?queryList=", String.class));
}
@@ -80,17 +80,17 @@
}
private void testTSVRest() {
- TestMgr.check("[]",
+ TestMgr.check("0:[]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListTSV?", String.class));
}
private void testTSV() {
- TestMgr.check("[1, 2]",
+ TestMgr.check("2:[1, 2]",
restTemplate
.getForObject("cse://jaxrs/queryList/queryListTSV?queryList={1}", String.class, "1\t2"));
- TestMgr.check("[, ]",
+ TestMgr.check("2:[, ]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListTSV?queryList={1}", String.class, "\t"));
- TestMgr.check("[]",
+ TestMgr.check("1:[]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListTSV?queryList=", String.class));
}
@@ -100,17 +100,17 @@
}
private void testPipesRest() {
- TestMgr.check("[]",
+ TestMgr.check("0:[]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListPIPES?", String.class));
}
private void testPipes() {
- TestMgr.check("[1, 2]",
+ TestMgr.check("2:[1, 2]",
restTemplate
.getForObject("cse://jaxrs/queryList/queryListPIPES?queryList={1}", String.class, "1|2"));
- TestMgr.check("[, ]",
+ TestMgr.check("2:[, ]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListPIPES?queryList={1}", String.class, "|"));
- TestMgr.check("[]",
+ TestMgr.check("1:[]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListPIPES?queryList=", String.class));
}
@@ -120,16 +120,16 @@
}
private void testSSVRest() {
- TestMgr.check("[]",
+ TestMgr.check("0:[]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListSSV?", String.class));
}
private void testCSV() {
- TestMgr.check("[1, 2]",
+ TestMgr.check("2:[1, 2]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListCSV?queryList=1,2", String.class));
- TestMgr.check("[, ]",
+ TestMgr.check("2:[, ]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListCSV?queryList=,", String.class));
- TestMgr.check("[]",
+ TestMgr.check("1:[]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListCSV?queryList=", String.class));
}
@@ -139,16 +139,16 @@
}
private void testMultiRest() {
- TestMgr.check("[]",
+ TestMgr.check("0:[]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListMULTI?", String.class));
}
private void testMulti() {
- TestMgr.check("[1, 2]",
+ TestMgr.check("2:[1, 2]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListMULTI?queryList=1&queryList=2", String.class));
- TestMgr.check("[, ]",
+ TestMgr.check("2:[, ]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListMULTI?queryList=&queryList=", String.class));
- TestMgr.check("[]",
+ TestMgr.check("1:[]",
restTemplate.getForObject("cse://jaxrs/queryList/queryListMULTI?queryList=", String.class));
}
}
diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamWithListSchema.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamWithListSchema.java
index 1f0b10b..c1fcfd9 100644
--- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamWithListSchema.java
+++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamWithListSchema.java
@@ -33,30 +33,30 @@
@Path("queryListCSV")
@GET
public String queryListCSV(@ApiParam(collectionFormat = "csv") @QueryParam("queryList") List<String> queryList) {
- return queryList == null ? "null" : queryList.toString();
+ return queryList == null ? "null" : queryList.size() + ":" + queryList.toString();
}
@Path("queryListSSV")
@GET
public String queryListSSV(@ApiParam(collectionFormat = "ssv") @QueryParam("queryList") List<String> queryList) {
- return queryList == null ? "null" : queryList.toString();
+ return queryList == null ? "null" : queryList.size() + ":" + queryList.toString();
}
@Path("queryListTSV")
@GET
public String queryListTSV(@ApiParam(collectionFormat = "tsv") @QueryParam("queryList") List<String> queryList) {
- return queryList == null ? "null" : queryList.toString();
+ return queryList == null ? "null" : queryList.size() + ":" + queryList.toString();
}
@Path("queryListPIPES")
@GET
public String queryListPIPES(@ApiParam(collectionFormat = "pipes") @QueryParam("queryList") List<String> queryList) {
- return queryList == null ? "null" : queryList.toString();
+ return queryList == null ? "null" : queryList.size() + ":" + queryList.toString();
}
@Path("queryListMULTI")
@GET
public String queryListMULTI(@ApiParam(collectionFormat = "multi") @QueryParam("queryList") List<String> queryList) {
- return queryList == null ? "null" : queryList.toString();
+ return queryList == null ? "null" : queryList.size() + ":" + queryList.toString();
}
}
