Skip to content

Commit 4976605

Browse files
Yager-42Yager-42
committed
完善格式以及优化null检查
1 parent 57ac0b1 commit 4976605

File tree

12 files changed

+36
-39
lines changed

12 files changed

+36
-39
lines changed

‎framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-jakarta/src/main/java/modelengine/fitframework/validation/LocaleContextMessageInterpolator.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
package modelengine.fitframework.validation;
88

9+
import jakarta.validation.MessageInterpolator;
10+
import modelengine.fitframework.inspection.Validation;
911
import modelengine.fitframework.util.ObjectUtils;
1012
import modelengine.fitframework.util.i18n.LocaleContextHolder;
1113

1214
import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;
1315

14-
import jakarta.validation.MessageInterpolator;
15-
1616
import java.util.Locale;
1717

1818
/**
@@ -86,9 +86,7 @@ public String interpolate(String messageTemplate, Context context) {
8686

8787
@Override
8888
public String interpolate(String messageTemplate, Context context, Locale locale) {
89-
if (locale == null) {
90-
throw new IllegalArgumentException("locale must not be null");
91-
}
89+
Validation.notNull(locale, "Locale cannot be null.");
9290
return this.targetInterpolator.interpolate(messageTemplate, context, locale);
9391
}
9492
}

‎framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-jakarta/src/test/java/modelengine/fitframework/validation/LocaleValidationControllerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
package modelengine.fitframework.validation;
88

9+
import static org.assertj.core.api.Assertions.assertThat;
10+
911
import modelengine.fit.http.client.HttpClassicClientResponse;
1012
import modelengine.fit.http.entity.Entity;
1113
import modelengine.fit.http.entity.ObjectEntity;
@@ -24,8 +26,6 @@
2426
import java.io.IOException;
2527
import java.util.Map;
2628

27-
import static org.assertj.core.api.Assertions.assertThat;
28-
2929
/**
3030
* 表示评估国际化校验的测试类。
3131
*

‎framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-jakarta/src/test/java/modelengine/fitframework/validation/ValidationHandlerTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,8 @@ class StudentGroupValidationTests {
341341
public void givenParametersThenGroupValidateHappened() {
342342
// 测试学生年龄验证 - 现在会抛出异常，因为使用了学生分组
343343
Method method = ReflectionUtils.getDeclaredMethod(GroupValidateService.StudentValidateService.class,
344-
"validateStudentAge", int.class);
344+
"validateStudentAge",
345+
int.class);
345346
Method handleValidatedMethod = ReflectionUtils.getDeclaredMethod(ValidationHandler.class,
346347
"handle",
347348
JoinPoint.class,

‎framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-jakarta/src/test/java/modelengine/fitframework/validation/data/GroupValidateService.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ public static class StudentValidateService {
3232
* @param age 表示年龄的 {@code int}。
3333
*/
3434
public void validateStudentAge(
35-
@Min(value = 7, message = "范围要在7~20之内", groups = ValidationTestData.StudentGroup.class) @Max(
36-
value = 20, message = "范围要在7~20之内",
37-
groups = ValidationTestData.StudentGroup.class) int age) {
35+
@Min(value = 7, message = "范围要在7~20之内", groups = ValidationTestData.StudentGroup.class)
36+
@Max(value = 20, message = "范围要在7~20之内", groups = ValidationTestData.StudentGroup.class)
37+
int age) {
3838
LOG.debug("Validating student age: {}", age);
3939
}
4040
}
@@ -48,9 +48,9 @@ public static class TeacherValidateService {
4848
* @param age 表示年龄的 {@code int}。
4949
*/
5050
public void validateTeacherAge(
51-
@Min(value = 22, message = "范围要在22~65之内", groups = ValidationTestData.TeacherGroup.class) @Max(
52-
value = 65, message = "范围要在22~65之内",
53-
groups = ValidationTestData.TeacherGroup.class) int age) {
51+
@Min(value = 22, message = "范围要在22~65之内", groups = ValidationTestData.TeacherGroup.class)
52+
@Max(value = 65, message = "范围要在22~65之内", groups = ValidationTestData.TeacherGroup.class)
53+
int age) {
5454
LOG.debug("Validating teacher age: {}", age);
5555
}
5656
}

‎framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-jakarta/src/test/java/modelengine/fitframework/validation/data/LocaleValidationController.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66

77
package modelengine.fitframework.validation.data;
88

9+
import jakarta.validation.Valid;
910
import modelengine.fit.http.annotation.PostMapping;
1011
import modelengine.fit.http.annotation.RequestBody;
1112
import modelengine.fit.http.annotation.RequestMapping;
1213
import modelengine.fitframework.annotation.Component;
1314
import modelengine.fitframework.validation.LocaleContextMessageInterpolator;
1415
import modelengine.fitframework.validation.Validated;
1516
import modelengine.fitframework.validation.ValidationHandler;
16-
import modelengine.fitframework.validation.data.Company;
17-
18-
import jakarta.validation.Valid;
1917

2018
/**
2119
* 用于测试 {@link ValidationHandler} 与 {@link LocaleContextMessageInterpolator} 的集成地区验证控制器。

‎framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-javax/src/main/java/modelengine/fitframework/validation/LocaleContextMessageInterpolator.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@
66

77
package modelengine.fitframework.validation;
88

9+
import modelengine.fitframework.inspection.Validation;
910
import modelengine.fitframework.util.ObjectUtils;
1011
import modelengine.fitframework.util.i18n.LocaleContextHolder;
1112

1213
import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;
1314

14-
import javax.validation.MessageInterpolator;
15-
1615
import java.util.Locale;
1716

17+
import javax.validation.MessageInterpolator;
18+
1819
/**
1920
* 检验消息处理的代理类。
2021
* <p>
@@ -86,9 +87,7 @@ public String interpolate(String messageTemplate, Context context) {
8687

8788
@Override
8889
public String interpolate(String messageTemplate, Context context, Locale locale) {
89-
if (locale == null) {
90-
throw new IllegalArgumentException("locale must not be null");
91-
}
90+
Validation.notNull(locale, "Locale cannot be null.");
9291
return this.targetInterpolator.interpolate(messageTemplate, context, locale);
9392
}
9493
}

‎framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-javax/src/main/java/modelengine/fitframework/validation/ValidationHandler.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import javax.validation.ConstraintViolation;
2727
import javax.validation.ConstraintViolationException;
28-
import javax.validation.MessageInterpolator;
2928
import javax.validation.Validation;
3029
import javax.validation.Validator;
3130
import javax.validation.ValidatorFactory;

‎framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-javax/src/test/java/modelengine/fitframework/validation/LocaleValidationControllerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
package modelengine.fitframework.validation;
88

9+
import static org.assertj.core.api.Assertions.assertThat;
10+
911
import modelengine.fit.http.client.HttpClassicClientResponse;
1012
import modelengine.fit.http.entity.Entity;
1113
import modelengine.fit.http.entity.ObjectEntity;
@@ -24,8 +26,6 @@
2426
import java.io.IOException;
2527
import java.util.Map;
2628

27-
import static org.assertj.core.api.Assertions.assertThat;
28-
2929
/**
3030
* 表示评估国际化校验的测试类。
3131
*

‎framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-javax/src/test/java/modelengine/fitframework/validation/data/GroupValidateService.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ public static class StudentValidateService {
3333
* @param age 表示年龄的 {@code int}。
3434
*/
3535
public void validateStudentAge(
36-
@Min(value = 7, message = "范围要在7~20之内", groups = ValidationTestData.StudentGroup.class) @Max(
37-
value = 20, message = "范围要在7~20之内",
38-
groups = ValidationTestData.StudentGroup.class) int age) {
36+
@Min(value = 7, message = "范围要在7~20之内", groups = ValidationTestData.StudentGroup.class)
37+
@Max(value = 20, message = "范围要在7~20之内", groups = ValidationTestData.StudentGroup.class)
38+
int age) {
3939
LOG.debug("Validating student age: {}", age);
4040
}
4141
}
@@ -49,9 +49,9 @@ public static class TeacherValidateService {
4949
* @param age 表示年龄的 {@code int}。
5050
*/
5151
public void validateTeacherAge(
52-
@Min(value = 22, message = "范围要在22~65之内", groups = ValidationTestData.TeacherGroup.class) @Max(
53-
value = 65, message = "范围要在22~65之内",
54-
groups = ValidationTestData.TeacherGroup.class) int age) {
52+
@Min(value = 22, message = "范围要在22~65之内", groups = ValidationTestData.TeacherGroup.class)
53+
@Max(value = 65, message = "范围要在22~65之内", groups = ValidationTestData.TeacherGroup.class)
54+
int age) {
5555
LOG.debug("Validating teacher age: {}", age);
5656
}
5757
}

‎framework/fit/java/fit-builtin/plugins/fit-validation-hibernate-javax/src/test/java/modelengine/fitframework/validation/data/LocaleValidationController.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@
66

77
package modelengine.fitframework.validation.data;
88

9-
import javax.validation.Valid;
10-
9+
import modelengine.fit.http.annotation.PostMapping;
10+
import modelengine.fit.http.annotation.RequestBody;
11+
import modelengine.fit.http.annotation.RequestMapping;
1112
import modelengine.fitframework.annotation.Component;
1213
import modelengine.fitframework.validation.LocaleContextMessageInterpolator;
1314
import modelengine.fitframework.validation.Validated;
1415
import modelengine.fitframework.validation.ValidationHandler;
15-
import modelengine.fitframework.validation.data.Company;
16-
import modelengine.fit.http.annotation.PostMapping;
17-
import modelengine.fit.http.annotation.RequestBody;
18-
import modelengine.fit.http.annotation.RequestMapping;
16+
17+
import javax.validation.Valid;
1918

2019
/**
2120
* 用于测试 {@link ValidationHandler} 与 {@link LocaleContextMessageInterpolator} 的集成地区验证控制器。

0 commit comments

Comments
 (0)