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 2018/08/14 06:13:24 UTC
[incubator-servicecomb-java-chassis] 05/05: [SCB-736] generate
default value to swagger for primitive type:test case correction
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/incubator-servicecomb-java-chassis.git
commit f72bf034b8cc5627ad4f619abd7e55116f8c5e71
Author: maheshrajus <ma...@huawei.com>
AuthorDate: Mon Aug 13 11:10:50 2018 +0530
[SCB-736] generate default value to swagger for primitive type:test case correction
---
.../servicecomb/demo/jaxrs/client/JaxrsClient.java | 9 ++++-----
.../demo/jaxrs/server/JaxRSDefaultValues.java | 16 ++++++++--------
.../demo/springmvc/client/SpringmvcClient.java | 9 ++++-----
.../demo/springmvc/server/ProducerTestsAfterBootup.java | 4 ++--
.../demo/springmvc/server/SpringMvcDefaultValues.java | 16 ++++++++--------
5 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/JaxrsClient.java b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/JaxrsClient.java
index 944c7c0..f285d5f 100644
--- a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/JaxrsClient.java
+++ b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/JaxrsClient.java
@@ -38,7 +38,6 @@ import org.apache.servicecomb.demo.validator.Student;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
import org.apache.servicecomb.foundation.common.utils.Log4jUtils;
import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
-import org.apache.servicecomb.swagger.invocation.exception.ExceptionFactory;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -420,16 +419,16 @@ public class JaxrsClient {
HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(map, headers);
//default values with primitive
- String result = template.postForObject(cseUrlPrefix + "/javaprimitive1", request, String.class);
+ String result = template.postForObject(cseUrlPrefix + "/javaprimitiveint", request, String.class);
TestMgr.check("Hello 0bobo", result);
- result = template.postForObject(cseUrlPrefix + "/javaprimitive2", request, String.class);
+ result = template.postForObject(cseUrlPrefix + "/javaprimitivenumber", request, String.class);
TestMgr.check("Hello 0.0false", result);
- result = template.postForObject(cseUrlPrefix + "/javaprimitive3", request, String.class);
+ result = template.postForObject(cseUrlPrefix + "/javaprimitivestr", request, String.class);
TestMgr.check("Hello", result);
- result = template.postForObject(cseUrlPrefix + "/javaprimitive4", request, String.class);
+ result = template.postForObject(cseUrlPrefix + "/javaprimitivecomb", request, String.class);
TestMgr.check("Hello 00.0", result);
}
}
diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/JaxRSDefaultValues.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/JaxRSDefaultValues.java
index edf2994..aa8f461 100644
--- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/JaxRSDefaultValues.java
+++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/JaxRSDefaultValues.java
@@ -88,34 +88,34 @@ public class JaxRSDefaultValues {
return "" + appType;
}
- @Path("/javaprimitive1")
+ @Path("/javaprimitiveint")
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- public String jaxRsJavaPrim1(@FormParam("a") int a, @DefaultValue("bobo") @FormParam("b") String b) {
+ public String jaxRsJavaPrimitiveInt(@FormParam("a") int a, @DefaultValue("bobo") @FormParam("b") String b) {
return "Hello " + a + b;
}
- @Path("/javaprimitive2")
+ @Path("/javaprimitivenumber")
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- public String jaxRsJavaPrim2(@QueryParam("a") float a, @QueryParam("b") boolean b) {
+ public String jaxRsJavaPrimitiveNumber(@QueryParam("a") float a, @QueryParam("b") boolean b) {
return "Hello " + a + b;
}
- @Path("/javaprimitive3")
+ @Path("/javaprimitivestr")
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- public String jaxRsJavaPrim3(@FormParam("b") int b, @FormParam("a") String a) {
+ public String jaxRsJavaPrimitiveStr(@FormParam("b") int b, @FormParam("a") String a) {
if (a == null || a.equals("")) {
return "Hello";
}
return "Hello " + b + a;
}
- @Path("/javaprimitive4")
+ @Path("/javaprimitivecomb")
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- public String jaxRsJavaPrim4(@QueryParam("a") Integer a, @QueryParam("b") Float b) {
+ public String jaxRsJavaPrimitiveCombnation(@QueryParam("a") Integer a, @QueryParam("b") Float b) {
return "Hello " + a + b;
}
}
diff --git a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
index f410bba..a555fc9 100644
--- a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
+++ b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
@@ -32,7 +32,6 @@ import org.apache.servicecomb.provider.springmvc.reference.CseRestTemplate;
import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
import org.apache.servicecomb.provider.springmvc.reference.UrlWithProviderPrefixClientHttpRequestFactory;
import org.apache.servicecomb.provider.springmvc.reference.UrlWithServiceNameClientHttpRequestFactory;
-import org.apache.servicecomb.swagger.invocation.exception.ExceptionFactory;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -351,16 +350,16 @@ public class SpringmvcClient {
private static void testSpringMvcDefaultValuesJavaPrimitive(RestTemplate template, String microserviceName) {
String cseUrlPrefix = "cse://" + microserviceName + "/SpringMvcDefaultValues/";
//default values with primitive
- String result = template.postForObject(cseUrlPrefix + "/javaprimitive1", null, String.class);
+ String result = template.postForObject(cseUrlPrefix + "/javaprimitiveint", null, String.class);
TestMgr.check("Hello 0bobo", result);
- result = template.postForObject(cseUrlPrefix + "/javaprimitive2", null, String.class);
+ result = template.postForObject(cseUrlPrefix + "/javaprimitivenumber", null, String.class);
TestMgr.check("Hello 0.0false", result);
- result = template.postForObject(cseUrlPrefix + "/javaprimitive3", null, String.class);
+ result = template.postForObject(cseUrlPrefix + "/javaprimitivestr", null, String.class);
TestMgr.check("Hello", result);
- result = template.postForObject(cseUrlPrefix + "/javaprimitive4", null, String.class);
+ result = template.postForObject(cseUrlPrefix + "/javaprimitivecomb", null, String.class);
TestMgr.check("Hello 00.0", result);
}
}
diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java
index 1c12b40..ce80bf8 100644
--- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java
+++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java
@@ -53,9 +53,9 @@ public class ProducerTestsAfterBootup implements BootListener {
CodeFirstSpringmvcForSchema.class,
new CodeFirstSpringmvcForSchema());
String codeFirst = getSwaggerContent(meta.getSwagger());
- TestMgr.check("07a48acef4cc1a7f2387d695923c49e98951a974e4f51cf1356d6878db48888f",
+ TestMgr.check("4d18e9b339136d68c7e5e83f4f302664c91465d9747a36334841e082d336516e",
RegistryUtils.calcSchemaSummary(codeFirst));
- TestMgr.check(codeFirst.length(), 899);
+ TestMgr.check(codeFirst.length(), 896);
}
public void testRegisterPath() {
diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SpringMvcDefaultValues.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SpringMvcDefaultValues.java
index 0e1bc17..1c99505 100644
--- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SpringMvcDefaultValues.java
+++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SpringMvcDefaultValues.java
@@ -64,19 +64,19 @@ public class SpringMvcDefaultValues {
return "Hello " + a + b;
}
- @PostMapping("/javaprimitive1")
- public String springJavaPrim1(@RequestParam(name = "a", required = false) int a,
+ @PostMapping("/javaprimitiveint")
+ public String springJavaPrimitiveInt(@RequestParam(name = "a", required = false) int a,
@RequestParam(name = "b", defaultValue = "bobo") String b) {
return "Hello " + a + b;
}
- @PostMapping("/javaprimitive2")
- public String springJavaPrim2(@RequestParam(name = "a", required = false) float a, @RequestParam(name = "b", required = false) boolean b) {
+ @PostMapping("/javaprimitivenumber")
+ public String springJavaPrimitiveNumber(@RequestParam(name = "a", required = false) float a, @RequestParam(name = "b", required = false) boolean b) {
return "Hello " + a + b;
}
- @PostMapping("/javaprimitive3")
- public String springJavaPrim3(@RequestParam(name = "a", required = false) int a, @RequestParam(name = "b", required = false) String b) {
+ @PostMapping("/javaprimitivestr")
+ public String springJavaPrimitiveStr(@RequestParam(name = "a", required = false) int a, @RequestParam(name = "b", required = false) String b) {
if (b == null || b.equals("")) {
return "Hello";
}
@@ -84,8 +84,8 @@ public class SpringMvcDefaultValues {
}
- @PostMapping("/javaprimitive4")
- public String springJavaPrim4(@RequestParam(name = "a", required = false) Integer a, @RequestParam(name = "b", required = false) Float b) {
+ @PostMapping("/javaprimitivecomb")
+ public String springJavaPrimitiveCombination(@RequestParam(name = "a", required = false) Integer a, @RequestParam(name = "b", required = false) Float b) {
return "Hello " + a + b;
}
}