[SCB-736] generate default value to swagger for primitive type:test c…

…ase correction
apache · Aug 14, 2018 · f72bf03 · f72bf03
1 parent c4c2f4f
commit f72bf03
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 28 deletions.
diff --git a/...axrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/JaxrsClient.java b/...axrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/JaxrsClient.java
@@ -38,7 +38,6 @@
 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 @@ private static void testSpringMvcDefaultValuesJavaPrimitive(RestTemplate templat
     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/...xrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/JaxRSDefaultValues.java b/...xrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/JaxRSDefaultValues.java
@@ -88,34 +88,34 @@ public String queryPackages(HttpServletRequest httpRequest,
     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/...vc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java b/...vc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
@@ -32,7 +32,6 @@
 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 @@ private static void testSpringMvcDefaultValues(RestTemplate template, String mic
   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/.../src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java b/.../src/main/java/org/apache/servicecomb/demo/springmvc/server/ProducerTestsAfterBootup.java
@@ -53,9 +53,9 @@ public void testSchemaNotChange() {
             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/...er/src/main/java/org/apache/servicecomb/demo/springmvc/server/SpringMvcDefaultValues.java b/...er/src/main/java/org/apache/servicecomb/demo/springmvc/server/SpringMvcDefaultValues.java
@@ -64,28 +64,28 @@ public String query3(@RequestParam("a") @Min(value = 20) int a, @RequestParam("b
     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";
     }
     return "Hello " + b + a;
 
   }
 
-  @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;
   }
 }