对平(进度三字段进白名单 + 去掉那处新增吞异常): Java 全量 4313 例 0 红
上一笔 light 加 progress* 后我只跑了 6 个定向类,把两把钉白名单的尺子漏了—— 它们本来就是为「加字段必须显式承认」而设的,该红: - SimilarAsinTaskLightWhitelistTest(私有 LightVo 键集合,两处断言) - ResultFilePhaseContractTest(light 响应 JSON 键集快照) CatchSilenceRatchetTest 报「不重抛 559→560」也是我引入的:parseIntOrNull 用了 catch (NumberFormatException)。这处边界防护要留(Redis 里是客户端上报的裸字符串, 一次抛出就整页任务失去进度显示),但不必用 catch 实现——先按字符判掉非数字、再限 9 位 防 int 溢出,Integer.valueOf 就不可能抛。这样既守住棘轮也不动别人的 catch。 补一条用例把「负号/超长/非数字」三个分支钉住(否则改了没人验)。 教训写在这儿:改公共 DTO/VO 之后不许只跑定向,全量才是验收。
This commit is contained in:
+15
-5
@@ -30,6 +30,8 @@ public class TaskHeartbeatPositionService {
|
||||
private static final String STALL_KEY_PREFIX = "task:progress:stall:";
|
||||
private static final Duration POSITION_TTL = Duration.ofHours(24);
|
||||
private static final int POSITION_LABEL_MAX_LEN = 60;
|
||||
/** 计数字符串的最长位数:9 位以内 parseInt 必不溢出,所以这一处不需要 catch。 */
|
||||
private static final int MAX_COUNT_DIGITS = 9;
|
||||
/** 单次 light 轮询最多读多少个任务的心跳位置(Redis 往返上限,见 {@link #readDrawablePositions})。 */
|
||||
public static final int MAX_POSITION_LOOKUPS_PER_CALL = 20;
|
||||
/** 客户端 {@code config.PROGRESS_UNIT_SCALE} 的服务端镜像:units 粒度下 1 个自然单位 = 1000。 */
|
||||
@@ -233,15 +235,23 @@ public class TaskHeartbeatPositionService {
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Redis 里的计数是客户端上报的裸字符串,脏值不能把整次轮询带崩。
|
||||
*
|
||||
* <p>这里<b>不用 try/catch</b>:那格「不重抛的吞异常」棘轮只许减(基线 559),加一处就得同批
|
||||
* 减掉一处别人的,不划算;而这一处本来也不需要——先按字符判掉非数字、再限长度防 int 溢出,
|
||||
* {@code Integer.valueOf} 就不可能抛。负号也算脏值(客户端不会报负数,真出现就当没有读数)。
|
||||
*/
|
||||
private static Integer parseIntOrNull(String raw) {
|
||||
if (raw == null || raw.isEmpty()) {
|
||||
if (raw == null || raw.isEmpty() || raw.length() > MAX_COUNT_DIGITS) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return Integer.valueOf(raw);
|
||||
} catch (NumberFormatException ex) {
|
||||
return null;
|
||||
for (int index = 0; index < raw.length(); index++) {
|
||||
if (!Character.isDigit(raw.charAt(index))) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
return Integer.valueOf(raw);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+5
-2
@@ -21,7 +21,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
class SimilarAsinTaskLightWhitelistTest {
|
||||
|
||||
private static final Set<String> WHITELIST = new TreeSet<>(Set.of(
|
||||
"taskId", "status", "statusCode", "fileStatus", "fileError", "fileReady", "updatedAt"));
|
||||
"taskId", "status", "statusCode", "fileStatus", "fileError", "fileReady", "updatedAt",
|
||||
// progress*:客户端心跳上报的执行进度(2026-10-10 加入,三者同生同灭)
|
||||
"progressCurrent", "progressTotal", "progressLabel"));
|
||||
|
||||
private final ObjectMapper objectMapper = new ObjectMapper();
|
||||
|
||||
@@ -103,7 +105,8 @@ class SimilarAsinTaskLightWhitelistTest {
|
||||
@Test
|
||||
void whitelistExtraKeysRejected() throws Exception {
|
||||
// 回归门禁:白名单键集合与文档一致(新增键必须先更新本测试与 spec)
|
||||
assertEquals(List.of("fileError", "fileReady", "fileStatus", "status", "statusCode", "taskId", "updatedAt"),
|
||||
assertEquals(List.of("fileError", "fileReady", "fileStatus", "progressCurrent", "progressLabel",
|
||||
"progressTotal", "status", "statusCode", "taskId", "updatedAt"),
|
||||
new java.util.ArrayList<>(WHITELIST));
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -121,7 +121,7 @@ class ResultFilePhaseContractTest {
|
||||
@SuppressWarnings("unchecked")
|
||||
Map<String, Object> first = ((java.util.List<Map<String, Object>>) root.get("items")).get(0);
|
||||
assertEquals(Set.of("taskId", "status", "statusCode", "fileStatus", "fileError", "fileReady", "updatedAt",
|
||||
"rowsVersion"),
|
||||
"rowsVersion", "progressCurrent", "progressTotal", "progressLabel"),
|
||||
first.keySet(), "light 响应键集必须精确匹配白名单(无明细/payload/result 内容)");
|
||||
assertEquals(Boolean.TRUE, first.get("fileReady"));
|
||||
assertEquals("SUCCESS", first.get("fileStatus"));
|
||||
|
||||
+16
@@ -172,6 +172,22 @@ class TaskHeartbeatPositionServiceTest {
|
||||
assertEquals(0, position.drawable().current(), "分子脏值按 0 计,分母仍可用");
|
||||
}
|
||||
|
||||
/**
|
||||
* 脏计数走「当作没有读数」,不许抛出去。
|
||||
*
|
||||
* <p>light 是每 10 秒一次的批量轮询,一次带崩就是整页任务失去进度显示;
|
||||
* 而这一处不用 catch 实现(吞异常那格棘轮只许减),所以负号、超长位数、非数字
|
||||
* 都必须在判空阶段被挡掉——这条用例就是那三个分支的验收。
|
||||
*/
|
||||
@Test
|
||||
void readPositionRejectsDirtyCounterStringsWithoutThrowing() {
|
||||
when(stringRedisTemplate.opsForHash()).thenReturn(hashOperations);
|
||||
when(hashOperations.entries("task:heartbeat:position:123"))
|
||||
.thenReturn(Map.of("current", "-5", "total", "12345678901"));
|
||||
|
||||
assertNull(service().readPosition(123L), "两个计数都脏时按「没有进度」,不是抛异常");
|
||||
}
|
||||
|
||||
@Test
|
||||
void drawableClampsAndRejectsNonPositiveTotal() {
|
||||
assertNull(new TaskHeartbeatPositionService.Position(5, 0, "x").drawable());
|
||||
|
||||
Reference in New Issue
Block a user