refactor(phase-3): 3E 第五支接入底座——接得上七件九点,接不上的六格逐格立账
DeleteBrandRunService extends AbstractFileTaskPipeline<DeleteBrandParsedFileCacheDto>:
@RequiredArgsConstructor 换显式 14 枚构造子,五枚(两支 Mapper+锁+Job+OSS)交 super,
本支不再重复声明那五个字段;moduleType()/loadTaskForSubmission() 两枚钩子落地。
接上并逐点核对的七件九点:requireUserId(:176)、newTaskHeader+insertTask(:180/183)、
newScopeRow 两处(:259/271)、requireSubmissionTask(:1372)、enqueueResultAssembly(:1516)、
listScopeRows 两处(:1609/1717)。
接不上、且都写了实测理由的六格(不是「没做」,是「做了会改行为」):
- requireTaskId:本支 :1361 文案「任务 id 不合法」≠ 底座「taskId 不合法」,且它在取锁之前
- rejectTerminalSubmission:本支 :1384 只说「任务已结束」——同一 ERROR 形内部有两种文案,
底座把文案写死了
- acquireSubmissionLockOrThrow:本支 :2249 抛不带 TASK_BUSY code 的那句,而 :1577 用
message.contains("任务正被占用,请稍后重试") 当收尾跳过的判据 ⇒ 换件=改锁竞争语义
- writeJson:本支建单走 hutool JSONUtil,压根没有 Jackson 序列化失败那一格
- publishResultFile:形状同但本支 :1916-1924 写的是可空 Integer rowCount(缓存 DTO),
底座件收 int ⇒ 套上去要么 NPE 要么把 NULL 洗成 0
- taskCacheService():DeleteBrandTaskCacheService 不继承 AbstractModuleTaskCacheService
(第二例,第一例是 AP 的兄弟抽象)⇒ 心跳那格没有承接件,admitSubmission 整段用不上
另有 :1770 那处 enqueueAssembleResult 因吃掉返回值(按 job.status/retryCount 判组装已终态
失败)也没换。底座 javadoc 的四处出处账按上述实测更正,并把 :1265 那枚会腐烂的行号指针
改成方法名指针。
拆薄同笔抵账(readability 点名基线只许降):删两枚零调用私有件 countCompletedFiles/
inNewTransaction,接走建单 12 行与结果行各 5-7 行;棘轮读数 2305→2300。本支手抄的
「!MODULE_TYPE.equals(」由 8 处降到 7 处(TaskLifecycleDebt 那格方向对)。基线一格未改。
接线:TaskServiceWiringSliceTest 加第五支(3 枚新 @Bean 桩+逐枚 assertSame 本支 9 枚私有件
+「五枚底座字段不许在本支重复声明」那条 NoSuchFieldException 断言+DELETE_BRAND 那对
moduleType 验证);顺手把这篇测试自己两处会撒谎的计数(两支/三支)改成实数。
门禁:后端全量 mvn -o test 4523 例/0 红/0 错/13 skipped,BUILD SUCCESS;两条 deletebrand
golden(run-snapshot+昨日新落 submit-result-snapshot)跑完 git status 一字未动 ⇒ 建单/解析/
载荷/回传四段对外行为零变化;定向 79 例全绿;ops 面 ruff All checks passed、readability 9 passed。
⚠ 真机启动验收(mvn -o spring-boot:run)仍未做,五支都欠着,账在 Phase 8。
This commit is contained in:
+64
-8
@@ -67,10 +67,13 @@ import static org.mockito.Mockito.verifyNoInteractions;
|
||||
* Phase 3 动了 {@code @Service} 的**构造器形状**(Lombok {@code @RequiredArgsConstructor} 生成枚
|
||||
* → 手写的显式枚,还要把 5 枚交给 {@code super})——这正是「装配相邻」的改动,光靠单测说不过去。
|
||||
* 本切片不连数据库,但走的是**真的 Spring 构造器解析**:隐式单构造器注入是否成立、
|
||||
* 底座那 5 枚是否真从 {@code super(...)} 落进来、三支是否各自拿到自己的缓存服务与装配服务。
|
||||
* 底座那 5 枚是否真从 {@code super(...)} 落进来、五支是否各自拿到自己的缓存服务与装配服务。
|
||||
* 3B 把第三支({@code ShopDataCrawlTaskService},23 枚依赖)也接进来时,本切片顺带钉住
|
||||
* 「它继承的是底座、不是 shop-payload 家族层」这条按证据得出的结论——家族层模板会改掉它的准入步序
|
||||
* 与收尾闸门,误套上去这里当场红。
|
||||
* 与收尾闸门,误套上去这里当场红。3A/3E 又各加了第四、第五支,同一格判据沿用;
|
||||
* 其中两支({@code AppearancePatentTaskCacheService}/{@code DeleteBrandTaskCacheService})的缓存服务
|
||||
* <b>不</b>继承 {@code AbstractModuleTaskCacheService},所以 {@code taskCacheService()} 那枚钩子
|
||||
* 在它们身上必须是缺件(底座 javadoc 已按实测更正过),别指望这里出现「心跳接上」的断言。
|
||||
*
|
||||
* <p><b>为什么不只断言「refresh() 没抛异常」。</b>那是一句会说谎的判据:Spring 6 在没有
|
||||
* {@code @Autowired} 而存在多枚 public 构造器时,会**静默挑无参那一枚**,容器照样起得来、
|
||||
@@ -249,6 +252,19 @@ class TaskServiceWiringSliceTest {
|
||||
@Bean com.nanri.aiimage.modules.usersecret.service.UserApiSecretService userApiSecretService() {
|
||||
return mock(com.nanri.aiimage.modules.usersecret.service.UserApiSecretService.class);
|
||||
}
|
||||
|
||||
// ---- 3E 迁进来的 DeleteBrand 那一支(14 枚依赖;「缓存服务不继承底座抽象」的第二例)----
|
||||
@Bean com.nanri.aiimage.modules.deletebrand.service.DeleteBrandTaskCacheService deleteBrandTaskCacheService() {
|
||||
return mock(com.nanri.aiimage.modules.deletebrand.service.DeleteBrandTaskCacheService.class);
|
||||
}
|
||||
|
||||
@Bean com.nanri.aiimage.modules.deletebrand.service.DeleteBrandTaskStorageService deleteBrandTaskStorageService() {
|
||||
return mock(com.nanri.aiimage.modules.deletebrand.service.DeleteBrandTaskStorageService.class);
|
||||
}
|
||||
|
||||
@Bean com.nanri.aiimage.config.DeleteBrandProgressProperties deleteBrandProgressProperties() {
|
||||
return mock(com.nanri.aiimage.config.DeleteBrandProgressProperties.class);
|
||||
}
|
||||
}
|
||||
|
||||
private static AnnotationConfigApplicationContext context(Class<?>... services) {
|
||||
@@ -277,24 +293,28 @@ class TaskServiceWiringSliceTest {
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
// 正判:真实容器把两支建起来,且每一枚依赖都落在它该落的位置
|
||||
// 正判:真实容器把五支建起来,且每一枚依赖都落在它该落的位置
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
@Test
|
||||
void migratedServicesInstantiateThroughTheSpringContainer() {
|
||||
try (AnnotationConfigApplicationContext ctx = context(ShopMatchTaskService.class,
|
||||
PriceTrackTaskService.class, ShopDataCrawlTaskService.class,
|
||||
com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService.class)) {
|
||||
com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService.class,
|
||||
com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService.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);
|
||||
com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService deleteBrand =
|
||||
ctx.getBean(com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService.class);
|
||||
|
||||
assertNotNull(shopMatch, "Lombok 生成枚换成显式枚之后,Spring 仍要能隐式构造注入");
|
||||
assertNotNull(priceTrack);
|
||||
assertNotNull(shopDataCrawl, "3B 那张 23 枚的参数表也得被容器原样解开");
|
||||
assertNotNull(appearancePatent, "3A 这张 22 枚的参数表同理——它比 3B 少一枚,风险一样");
|
||||
assertNotNull(deleteBrand, "3E 这张 14 枚:本支是全族唯一 taskMode=IMMEDIATE 的一支");
|
||||
assertTrue(shopMatch instanceof AbstractShopPayloadTaskPipeline,
|
||||
"Phase 3 的判据是「真有生产调用方继承底座」,不是只由单测证明契约可用");
|
||||
assertTrue(priceTrack instanceof AbstractShopPayloadTaskPipeline);
|
||||
@@ -307,6 +327,10 @@ class TaskServiceWiringSliceTest {
|
||||
// 「按 submissionId 分片」当成「按店铺分片」,那是一整段合并语义的替换。
|
||||
assertEquals(com.nanri.aiimage.modules.task.service.pipeline.AbstractFileTaskPipeline.class,
|
||||
appearancePatent.getClass().getSuperclass(), "外观专利的直接父类必须是底座那一层");
|
||||
// 3E:删除品牌是「自有分片存储」第三族(chunk 存 DeleteBrandTaskStorageService,
|
||||
// 按 fileIdentity 分scope),既不是 shop-payload 也不是 AP 那族;接错层的代价同上。
|
||||
assertEquals(com.nanri.aiimage.modules.task.service.pipeline.AbstractFileTaskPipeline.class,
|
||||
deleteBrand.getClass().getSuperclass(), "删除品牌的直接父类必须是底座那一层");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -314,16 +338,19 @@ class TaskServiceWiringSliceTest {
|
||||
void superCallLandsTheFiveBaseDependenciesInOrder() {
|
||||
try (AnnotationConfigApplicationContext ctx = context(ShopMatchTaskService.class,
|
||||
PriceTrackTaskService.class, ShopDataCrawlTaskService.class,
|
||||
com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService.class)) {
|
||||
com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService.class,
|
||||
com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService.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);
|
||||
com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService deleteBrand =
|
||||
ctx.getBean(com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService.class);
|
||||
|
||||
// 这五枚是交给 super(...) 的那五枚。参数表里它们与其余 12/13 枚同类型不重复,
|
||||
// 换位会在编译期就被挡住——但「少交一枚」「交 null」不会。逐枚 assertSame 才是硬证。
|
||||
for (Object service : List.of(shopMatch, priceTrack, shopDataCrawl, appearancePatent)) {
|
||||
for (Object service : List.of(shopMatch, priceTrack, shopDataCrawl, appearancePatent, deleteBrand)) {
|
||||
assertSame(ctx.getBean(FileTaskMapper.class), fieldValue(service, "fileTaskMapper"));
|
||||
assertSame(ctx.getBean(FileResultMapper.class), fieldValue(service, "fileResultMapper"));
|
||||
assertSame(ctx.getBean(TaskDistributedLockService.class),
|
||||
@@ -351,6 +378,28 @@ class TaskServiceWiringSliceTest {
|
||||
assertSame(ctx.getBean(com.nanri.aiimage.modules.usersecret.service.UserApiSecretService.class),
|
||||
fieldValue(appearancePatent, "userApiSecretService"));
|
||||
|
||||
// 3E 的 9 枚私有件逐枚点名。本支最容易串的是「两支同族 Redis 缓存服务」与
|
||||
// 「两支同名 taskStorage/localFileStorage」:注错一支不会编译报错,只会把分片写到别人的键域里。
|
||||
assertSame(ctx.getBean(com.nanri.aiimage.modules.deletebrand.service.DeleteBrandTaskCacheService.class),
|
||||
fieldValue(deleteBrand, "deleteBrandTaskCacheService"));
|
||||
assertSame(ctx.getBean(com.nanri.aiimage.modules.deletebrand.service.DeleteBrandTaskStorageService.class),
|
||||
fieldValue(deleteBrand, "deleteBrandTaskStorageService"));
|
||||
assertSame(ctx.getBean(com.nanri.aiimage.config.DeleteBrandProgressProperties.class),
|
||||
fieldValue(deleteBrand, "deleteBrandProgressProperties"));
|
||||
assertSame(ctx.getBean(ZiniaoShopSwitchService.class), fieldValue(deleteBrand, "ziniaoShopSwitchService"));
|
||||
assertSame(ctx.getBean(LocalFileStorageService.class), fieldValue(deleteBrand, "localFileStorageService"));
|
||||
assertSame(ctx.getBean(TaskProgressLightAssembler.class),
|
||||
fieldValue(deleteBrand, "taskProgressLightAssembler"));
|
||||
assertSame(ctx.getBean(PlatformTransactionManager.class), fieldValue(deleteBrand, "transactionManager"));
|
||||
assertSame(ctx.getBean(ObjectMapper.class), fieldValue(deleteBrand, "objectMapper"));
|
||||
assertSame(ctx.getBean(com.nanri.aiimage.config.TaskPressureProperties.class),
|
||||
fieldValue(deleteBrand, "taskPressureProperties"));
|
||||
// 交出去的那五枚在本支不许留同名私有字段:留了两份,读到的就是本支那枚(没人赋值,永远 null)
|
||||
assertThrows(NoSuchFieldException.class,
|
||||
() -> com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService.class
|
||||
.getDeclaredField("fileTaskMapper"),
|
||||
"底座那五枚只能有一份,本支不该再声明 fileTaskMapper");
|
||||
|
||||
// 三支各自的私有件:绝不能把 A 支的缓存服务注进 B 支(同族三个 bean,最容易串的就是这儿)
|
||||
assertSame(ctx.getBean(ShopMatchTaskCacheService.class), fieldValue(shopMatch, "shopMatchTaskCacheService"));
|
||||
assertSame(ctx.getBean(PriceTrackTaskCacheService.class), fieldValue(priceTrack, "priceTrackTaskCacheService"));
|
||||
@@ -388,22 +437,29 @@ class TaskServiceWiringSliceTest {
|
||||
@Test
|
||||
void injectedCollaboratorsAreActuallyUsedAndEachBranchReportsItsOwnModuleType() {
|
||||
try (AnnotationConfigApplicationContext ctx = context(ShopMatchTaskService.class,
|
||||
PriceTrackTaskService.class, ShopDataCrawlTaskService.class)) {
|
||||
PriceTrackTaskService.class, ShopDataCrawlTaskService.class,
|
||||
com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService.class)) {
|
||||
TaskProgressLightAssembler assembler = ctx.getBean(TaskProgressLightAssembler.class);
|
||||
ShopMatchTaskService shopMatch = ctx.getBean(ShopMatchTaskService.class);
|
||||
PriceTrackTaskService priceTrack = ctx.getBean(PriceTrackTaskService.class);
|
||||
ShopDataCrawlTaskService shopDataCrawl = ctx.getBean(ShopDataCrawlTaskService.class);
|
||||
com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService deleteBrand =
|
||||
ctx.getBean(com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService.class);
|
||||
List<Long> taskIds = List.of(1L);
|
||||
|
||||
shopMatch.progressLight(taskIds, 7L);
|
||||
priceTrack.progressLight(taskIds, 7L);
|
||||
shopDataCrawl.progressLight(taskIds, 7L);
|
||||
deleteBrand.progressLight(taskIds, 7L);
|
||||
|
||||
// moduleType() 是迁移新加的钩子:回错一支,心跳、结果行与组装 Job 全挂到别人模块上,
|
||||
// 而建单照样成功——那种错只有在这里才看得见。三支三个枚举形,串一支就少一对。
|
||||
// 而建单照样成功——那种错只有在这里才看得见。四支四个字符串,串一支就少一对。
|
||||
verify(assembler, times(1)).assemble(eq("SHOP_MATCH"), eq(7L), eq(taskIds));
|
||||
verify(assembler, times(1)).assemble(eq("PRICE_TRACK"), eq(7L), eq(taskIds));
|
||||
verify(assembler, times(1)).assemble(eq("SHOP_DATA_CRAWL"), eq(7L), eq(taskIds));
|
||||
// 3E:这一对同时是「底座钩子真在被迁支用到」的生产侧证据——moduleType() 由本支交出,
|
||||
// 而 progressLight 走的是自家 assembler,不是底座件,所以它证明的是钩子本身接对了。
|
||||
verify(assembler, times(1)).assemble(eq("DELETE_BRAND"), eq(7L), eq(taskIds));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user