From b6d47f0d008bd0ae84dd51bc00d97056dabd1f05 Mon Sep 17 00:00:00 2001 From: ZhouXY108 Date: Sun, 8 Jun 2025 04:49:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=20`MapValidator`?= =?UTF-8?q?=20=E7=9A=84=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plusone/map/validator/MapValidatorTests.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/plusone-validator/src/test/java/xyz/zhouxy/plusone/map/validator/MapValidatorTests.java b/plusone-validator/src/test/java/xyz/zhouxy/plusone/map/validator/MapValidatorTests.java index 8d7890b..0833fa1 100644 --- a/plusone-validator/src/test/java/xyz/zhouxy/plusone/map/validator/MapValidatorTests.java +++ b/plusone-validator/src/test/java/xyz/zhouxy/plusone/map/validator/MapValidatorTests.java @@ -19,6 +19,7 @@ package xyz.zhouxy.plusone.map.validator; import static org.junit.jupiter.api.Assertions.*; import java.time.LocalDateTime; +import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -58,7 +59,7 @@ class MapValidatorTests { params.put(ParamsValidator.STRING_PROPERTY2, "Foo"); assertAll(() -> { Map validatedParams = validator.validateAndCopy(params); - assertEquals(ParamsValidator.keySet(), validatedParams.keySet()); + assertEquals(ImmutableSet.copyOf(ParamsValidator.reservedProperties()), validatedParams.keySet()); assertEquals(true, validatedParams.get(ParamsValidator.BOOL_PROPERTY)); assertEquals(Integer.MAX_VALUE, validatedParams.get(ParamsValidator.INT_PROPERTY)); @@ -103,11 +104,14 @@ class ParamsValidator extends MapValidator { public static final String OBJECT_PROPERTY = "objectProperty"; public static final String STRING_LIST_PROPERTY = "stringListProperty"; + private static final String[] RESERVED_PROPERTIES = { + BOOL_PROPERTY, INT_PROPERTY, LONG_PROPERTY, DOUBLE_PROPERTY, STRING_PROPERTY, + DATE_TIME_PROPERTY, OBJECT_PROPERTY, STRING_LIST_PROPERTY }; + public static final ParamsValidator INSTANCE = new ParamsValidator(); private ParamsValidator() { - super(new String[] { BOOL_PROPERTY, INT_PROPERTY, LONG_PROPERTY, DOUBLE_PROPERTY, STRING_PROPERTY, - DATE_TIME_PROPERTY, OBJECT_PROPERTY, STRING_LIST_PROPERTY }); + super(RESERVED_PROPERTIES); ruleForBool(BOOL_PROPERTY) .notNull(); ruleForInt(INT_PROPERTY) @@ -130,8 +134,7 @@ class ParamsValidator extends MapValidator { "'stringProperty' must be equal to 'stringProperty2'."); } - public static Set keySet() { - return ImmutableSet.of(BOOL_PROPERTY, INT_PROPERTY, LONG_PROPERTY, DOUBLE_PROPERTY, STRING_PROPERTY, - DATE_TIME_PROPERTY, OBJECT_PROPERTY, STRING_LIST_PROPERTY); + public static String[] reservedProperties() { + return Arrays.copyOf(RESERVED_PROPERTIES, RESERVED_PROPERTIES.length); } }