[servicecomb-java-chassis] branch master updated: [#3354 ]add a test case for not null (#3439)

[liubao]

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 18b3febf4 [#3354 ]add a test case for not null (#3439)
18b3febf4 is described below

commit 18b3febf42e51868b17e1e7aa85e1f9f9ab9b82a
Author: liubao68 <bi...@qq.com>
AuthorDate: Sun Oct 30 20:05:33 2022 +0800

    [#3354 ]add a test case for not null (#3439)
---
 .../client/validation/ValidationServiceClient.java | 28 +++++++++++++---------
 .../jaxrs/server/validation/ValidationService.java |  3 ++-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git 
a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/validation/ValidationServiceClient.java
 
b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/validation/ValidationServiceClient.java
index d3d383a52..c0170f2be 100644
--- 
a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/validation/ValidationServiceClient.java
+++ 
b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/validation/ValidationServiceClient.java
@@ -71,6 +71,15 @@ public class ValidationServiceClient {
       
TestMgr.check(e.getErrorData().toString().contains("propertyPath=errorCode.request.members"),
 true);
     }
 
+    try {
+      template.postForObject(urlPrefix + "/validate", null, 
ValidationModel.class);
+      TestMgr.check(false, true);
+    } catch (InvocationException e) {
+      TestMgr.check(400, e.getStatus().getStatusCode());
+      TestMgr.check(Status.BAD_REQUEST, e.getReasonPhrase());
+      
TestMgr.check(e.getErrorData().toString().contains("propertyPath=errorCode.request"),
 true);
+    }
+
     String strResult = template.getForObject(urlPrefix + 
"/validateQuery?name=a", String.class);
     TestMgr.check(strResult, "a");
 
@@ -83,19 +92,14 @@ public class ValidationServiceClient {
       TestMgr.check(e.getErrorData().toString().contains("Parameter is not 
valid for operation"), true);
     }
 
-    try {
-      Teacher teacher = new Teacher();
-      teacher.setName("teacher");
-      teacher.setAge("20");
-      Teacher response = template.postForObject(urlPrefix + "/sayTeacherInfo", 
teacher, Teacher.class);
-      TestMgr.check(response.getName(), "teacher");
-    } catch (InvocationException e) {
-      TestMgr.check(400, e.getStatus().getStatusCode());
-      TestMgr.check(e.getErrorData().toString().contains("must not be blank"), 
true);
-    }
+    Teacher teacher = new Teacher();
+    teacher.setName("teacher");
+    teacher.setAge("20");
+    Teacher response = template.postForObject(urlPrefix + "/sayTeacherInfo", 
teacher, Teacher.class);
+    TestMgr.check(response.getName(), "teacher");
 
     try {
-      Teacher teacher = new Teacher();
+      teacher = new Teacher();
       teacher.setAge("20");
       template.postForObject(urlPrefix + "/sayTeacherInfo", teacher, 
Teacher.class);
       TestMgr.fail("Name should not empty");
@@ -104,5 +108,7 @@ public class ValidationServiceClient {
       TestMgr.check(e.getErrorData().toString().contains("must not be blank"), 
true);
     }
 
+    response = template.postForObject(urlPrefix + "/sayTeacherInfo", null, 
Teacher.class);
+    TestMgr.check(null, response);
   }
 }
diff --git 
a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/validation/ValidationService.java
 
b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/validation/ValidationService.java
index df79b4266..90b14d043 100644
--- 
a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/validation/ValidationService.java
+++ 
b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/validation/ValidationService.java
@@ -19,6 +19,7 @@ package org.apache.servicecomb.demo.jaxrs.server.validation;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -33,7 +34,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 public class ValidationService {
   @Path("/validate")
   @POST
-  public ValidationModel errorCode(@Valid ValidationModel request) {
+  public ValidationModel errorCode(@NotNull @Valid ValidationModel request) {
     return request;
   }