refactor(phase-3): 3A 接入底座——建单段与一格准入沉下去,回传段其余部分按证据未动

AppearancePatentTaskService 继承 AbstractFileTaskPipeline<AppearancePatentResultRowDto>。
棘轮读数 3458(在册基线)→3381:显式构造器成本 +26,被建单段下沉(-25)与三枚零调用
私有件出仓(-33)对冲掉,本笔自身净减 7 行、较基线净减 77 行。

接得上什么、接不上什么(这次是第四条实测,答案与前三支都不同):
- 接得上底座:newTaskHeader/insertTask/newScopeRow/writeJson/requireUserId/
  requireSubmissionTask/ensureTaskOwnedByCurrentInstance(本支那枚私有同名件签名逐字相同,
  改成 @Override 就接上了)。
- 接不上家族层:本支是 chunk+scope 族(按 submissionId 分片),套 shop-payload 就是把
  「按分片合并」换成「按店铺合并」。装配切片里那条 getSuperclass 断言现在盯住了这一点。
- 接不上缓存钩子:本支的 AppearancePatentTaskCacheService 继承的是同族兄弟
  AbstractPendingRowTaskCacheService,不是 AbstractModuleTaskCacheService ⇒ 底座
  taskCacheService() 钩子对它无类型可套。处置是不覆写那一格(默认 null 已经对),心跳留在
  persistSubmittedChunk 自己那句 touchTaskHeartbeat——不是本支没心跳,是两套抽象接不上。
  底座 javadoc 把 AppearancePatent 列进「4/7 支有模块缓存服务」那格,这条读数不准,
  已在本笔注释里点名更正(蓝图 §5 同步登记)。
- 没动的部分:回传段其余步骤(终态判定用 TaskResultAdmission.rejectNotRunning,比底座
  rejectTerminalSubmission 宽——凡非 RUNNING 皆拒,且 40901 只在真终态那格带)与
  acquireTaskLock 的非阻塞变体(抢不到返回 null 让巡检跳过下一轮,底座只有「抢不到即拒提交」
  两型)。这一段没有 golden,按「先补再动」只做了 prepareSubmittedChunk 那一格
  逐字同形的四行替换,其余一个字节没碰。

捕获账:本支两处序列化 catch(私有 writeJson(Object,String) 与建单那段 try/catch)并进底座
已有的 writeJson ⇒ RETHROW 385→383,按该尺自己写的处置口径逐处记名(出处写在
CatchSilenceRatchetTest 常量上方),用户授权沿用 3B 那一笔的同项拍板。不重抛/只 log/
空体三格未涨,其余判据一格没放宽。

门禁:定向批 452 例/0 红/0 错/5 skipped(五格是 golden 生成器,未设环境变量时如实 skip),
BUILD SUCCESS 取码走无管道写法。八条 golden 逐字节相等——git status -- src/test/resources
一字未动(本支新建单那条 + 前三支那六条都在跑)。装配切片接进第四支:22 枚参数逐枚点名,
含「五枚交 super 之后本支不再持有同名字段」那格 assertSame。
真机启动验收仍没做(要 MySQL+Redis),这条账继续挂在 Phase 8。
This commit is contained in:
2026-10-19 09:36:48 +08:00
parent 7b7d22cbb4
commit f0c672025d
3 changed files with 151 additions and 95 deletions
@@ -94,7 +94,15 @@ class CatchSilenceRatchetTest {
// 四份逐字同名件并成一份 ⇒ 树里少了一处「异常会往外走」的**实例**,不是少了一种会外走的异常;
// 本笔只从树上摘掉这一处 RETHROW 形状的 catch,不重抛侧一个字节没动:同批实测 notRethrow 562、
// logOnly 173、empty 55 三格仍在上限内(未涨)=> 没有任何一处出口被改回吞掉。
static final int RETHROW_FLOOR = 385;
// 10-19 再下调 385 -> 383,出处点名(同一项用户授权「逐处记名调这一格」的第二笔,形状与上一笔逐字相同):
// Phase 3 的 3A 迁移把 AppearancePatentTaskService 的两处同名序列化 catch 并进底座
// `AbstractFileTaskPipeline.writeJson(ObjectMapper, Object, String)`——① 私有
// `writeJson(Object, String)`(体是 `throw new BusinessException(message)`,7 个调用点的文案逐字
// 带到调用点);② 建单里那段 `try { setRequestJson(writeValueAsString(request)) … } catch (Exception ex)
// { throw new BusinessException("序列化解析结果失败") }`,失败形状与线协议一字未动。
// 本笔另摘的三枚零调用私有件(abbreviate/resultLookupKeysForResultRows/isHistoryFileBuilding)
// 里没有 catch,所以 RETHROW 只降这两格;不重抛/只 log/空体三格同批复跑未涨(三格判据一条没放宽)。
static final int RETHROW_FLOOR = 383;
/**
* 10-17 抬 559 -> 561,逐处记名(两处都是新增的 fail-open 证据读写,不是把已有出口改回吞掉):
* 1){@code TaskHeartbeatLivenessService.stamp()}:心跳证据写失败只 WARN——心跳接口不许因为
@@ -224,6 +224,31 @@ class TaskServiceWiringSliceTest {
@Bean InstanceMetadata instanceMetadata() {
return mock(InstanceMetadata.class);
}
// ---- 3A 迁进来的 AppearancePatent 那一支(22 枚依赖;家族里第一个「缓存服务不接底座抽象」的形状)----
@Bean com.nanri.aiimage.modules.appearancepatent.client.AppearancePatentLlmClient appearancePatentLlmClient() {
return mock(com.nanri.aiimage.modules.appearancepatent.client.AppearancePatentLlmClient.class);
}
@Bean com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskCacheService appearancePatentTaskCacheService() {
return mock(com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskCacheService.class);
}
@Bean com.nanri.aiimage.config.AppearancePatentProperties appearancePatentProperties() {
return mock(com.nanri.aiimage.config.AppearancePatentProperties.class);
}
@Bean com.nanri.aiimage.config.StorageProperties storageProperties() {
return mock(com.nanri.aiimage.config.StorageProperties.class);
}
@Bean com.nanri.aiimage.common.service.DistributedJobLockService distributedJobLockService() {
return mock(com.nanri.aiimage.common.service.DistributedJobLockService.class);
}
@Bean com.nanri.aiimage.modules.usersecret.service.UserApiSecretService userApiSecretService() {
return mock(com.nanri.aiimage.modules.usersecret.service.UserApiSecretService.class);
}
}
private static AnnotationConfigApplicationContext context(Class<?>... services) {
@@ -258,14 +283,18 @@ class TaskServiceWiringSliceTest {
@Test
void migratedServicesInstantiateThroughTheSpringContainer() {
try (AnnotationConfigApplicationContext ctx = context(ShopMatchTaskService.class,
PriceTrackTaskService.class, ShopDataCrawlTaskService.class)) {
PriceTrackTaskService.class, ShopDataCrawlTaskService.class,
com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService.class)) {
ShopMatchTaskService shopMatch = ctx.getBean(ShopMatchTaskService.class);
PriceTrackTaskService priceTrack = ctx.getBean(PriceTrackTaskService.class);
ShopDataCrawlTaskService shopDataCrawl = ctx.getBean(ShopDataCrawlTaskService.class);
com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService appearancePatent =
ctx.getBean(com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService.class);
assertNotNull(shopMatch, "Lombok 生成枚换成显式枚之后,Spring 仍要能隐式构造注入");
assertNotNull(priceTrack);
assertNotNull(shopDataCrawl, "3B 那张 23 枚的参数表也得被容器原样解开");
assertNotNull(appearancePatent, "3A 这张 22 枚的参数表同理——它比 3B 少一枚,风险一样");
assertTrue(shopMatch instanceof AbstractShopPayloadTaskPipeline,
"Phase 3 的判据是「真有生产调用方继承底座」,不是只由单测证明契约可用");
assertTrue(priceTrack instanceof AbstractShopPayloadTaskPipeline);
@@ -274,20 +303,27 @@ class TaskServiceWiringSliceTest {
// 收尾闸门)这条断言当场红——注意不能用 !(x instanceof 家族层):静态类型不可能成立时 javac 直接拒。
assertEquals(com.nanri.aiimage.modules.task.service.pipeline.AbstractFileTaskPipeline.class,
shopDataCrawl.getClass().getSuperclass(), "本支的直接父类必须是底座那一层");
// 3A 同一条:外观专利是 chunk+scope 族,与 shop-payload 家族层无关;接错层就会把它的
// 「按 submissionId 分片」当成「按店铺分片」,那是一整段合并语义的替换。
assertEquals(com.nanri.aiimage.modules.task.service.pipeline.AbstractFileTaskPipeline.class,
appearancePatent.getClass().getSuperclass(), "外观专利的直接父类必须是底座那一层");
}
}
@Test
void superCallLandsTheFiveBaseDependenciesInOrder() {
try (AnnotationConfigApplicationContext ctx = context(ShopMatchTaskService.class,
PriceTrackTaskService.class, ShopDataCrawlTaskService.class)) {
PriceTrackTaskService.class, ShopDataCrawlTaskService.class,
com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService.class)) {
ShopMatchTaskService shopMatch = ctx.getBean(ShopMatchTaskService.class);
PriceTrackTaskService priceTrack = ctx.getBean(PriceTrackTaskService.class);
ShopDataCrawlTaskService shopDataCrawl = ctx.getBean(ShopDataCrawlTaskService.class);
com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService appearancePatent =
ctx.getBean(com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService.class);
// 这五枚是交给 super(...) 的那五枚。参数表里它们与其余 12/13 枚同类型不重复,
// 换位会在编译期就被挡住——但「少交一枚」「交 null」不会。逐枚 assertSame 才是硬证。
for (Object service : List.of(shopMatch, priceTrack, shopDataCrawl)) {
for (Object service : List.of(shopMatch, priceTrack, shopDataCrawl, appearancePatent)) {
assertSame(ctx.getBean(FileTaskMapper.class), fieldValue(service, "fileTaskMapper"));
assertSame(ctx.getBean(FileResultMapper.class), fieldValue(service, "fileResultMapper"));
assertSame(ctx.getBean(TaskDistributedLockService.class),
@@ -296,6 +332,25 @@ class TaskServiceWiringSliceTest {
assertSame(ctx.getBean(OssStorageService.class), fieldValue(service, "ossStorageService"));
}
// 3A 的私有件:本支把 fileTaskMapper 等五枚交出去后自己不再持有同名字段,
// 所以这里断的是它**自己那 17 枚**里最容易被同族串位的三枚。
assertSame(ctx.getBean(com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskCacheService.class),
fieldValue(appearancePatent, "taskCacheService"));
assertSame(ctx.getBean(com.nanri.aiimage.modules.appearancepatent.client.AppearancePatentLlmClient.class),
fieldValue(appearancePatent, "llmClient"));
assertSame(ctx.getBean(com.nanri.aiimage.config.AppearancePatentProperties.class),
fieldValue(appearancePatent, "properties"));
assertSame(ctx.getBean(TaskChunkMapper.class), fieldValue(appearancePatent, "taskChunkMapper"));
assertSame(ctx.getBean(TaskScopeStateMapper.class), fieldValue(appearancePatent, "taskScopeStateMapper"));
assertSame(ctx.getBean(TransientPayloadStorageService.class),
fieldValue(appearancePatent, "transientPayloadStorageService"));
assertSame(ctx.getBean(PlatformTransactionManager.class), fieldValue(appearancePatent, "transactionManager"));
assertSame(ctx.getBean(com.nanri.aiimage.common.service.DistributedJobLockService.class),
fieldValue(appearancePatent, "distributedJobLockService"));
assertSame(ctx.getBean(InstanceMetadata.class), fieldValue(appearancePatent, "instanceMetadata"));
assertSame(ctx.getBean(com.nanri.aiimage.modules.usersecret.service.UserApiSecretService.class),
fieldValue(appearancePatent, "userApiSecretService"));
// 三支各自的私有件:绝不能把 A 支的缓存服务注进 B 支(同族三个 bean,最容易串的就是这儿)
assertSame(ctx.getBean(ShopMatchTaskCacheService.class), fieldValue(shopMatch, "shopMatchTaskCacheService"));
assertSame(ctx.getBean(PriceTrackTaskCacheService.class), fieldValue(priceTrack, "priceTrackTaskCacheService"));