diff --git a/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationService.java b/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationService.java index 36114d4973c5736337e72da6788f7eb1fc5e4c9c..d031b04a1fedbe255d305eebc4436cb20f81d9b2 100644 --- a/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationService.java +++ b/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationService.java @@ -16,6 +16,7 @@ package com.alibaba.dubbo.config.validation; import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; /** @@ -31,6 +32,6 @@ public interface ValidationService { // 缺省可按服务接口区分验证场 @interface Update{} // 与方法同名接口,首字母大写,用于区分验证场景,如:@NotNull(groups = ValidationService.Update.class),可选 void update(ValidationParameter parameter); - void delete(@Min(1) long id); + void delete(@Min(1) long id, @NotNull String operator); } diff --git a/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationServiceImpl.java b/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationServiceImpl.java index 552d1f7b0493c6cfd50e1586a73ebefba336e3eb..6a47f2d6fff44514f093cb9212bb8d57f9493bd6 100644 --- a/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationServiceImpl.java +++ b/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationServiceImpl.java @@ -28,7 +28,7 @@ public class ValidationServiceImpl implements ValidationService { public void update(ValidationParameter parameter) { } - public void delete(long id) { + public void delete(long id, String operator) { } } diff --git a/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationTest.java b/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationTest.java index 31a9e250eec1281dfb694aadd25b5f5d71a0218b..f1162b20e958ca320278388e08e5d55d34ed5842 100644 --- a/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationTest.java +++ b/dubbo-config/src/test/java/com/alibaba/dubbo/config/validation/ValidationTest.java @@ -55,7 +55,7 @@ public class ValidationTest { ValidationService validationService = reference.get(); try { // Save OK - ValidationParameter parameter = new ValidationParameter(); + /*ValidationParameter parameter = new ValidationParameter(); parameter.setName("liangfei"); parameter.setEmail("liangfei@liang.fei"); parameter.setAge(50); @@ -76,16 +76,35 @@ public class ValidationTest { } // Delete OK - validationService.delete(2); + validationService.delete(2, "abc");*/ // Delete Error try { - validationService.delete(0); + validationService.delete(0, "abc"); Assert.fail(); } catch (RpcException e) { ConstraintViolationException ve = (ConstraintViolationException)e.getCause(); Set> violations = ve.getConstraintViolations(); Assert.assertNotNull(violations); + Assert.assertEquals(1, violations.size()); + } + try { + validationService.delete(2, null); + Assert.fail(); + } catch (RpcException e) { + ConstraintViolationException ve = (ConstraintViolationException)e.getCause(); + Set> violations = ve.getConstraintViolations(); + Assert.assertNotNull(violations); + Assert.assertEquals(1, violations.size()); + } + try { + validationService.delete(0, null); + Assert.fail(); + } catch (RpcException e) { + ConstraintViolationException ve = (ConstraintViolationException)e.getCause(); + Set> violations = ve.getConstraintViolations(); + Assert.assertNotNull(violations); + Assert.assertEquals(2, violations.size()); } } finally { reference.destroy();