diff --git a/backend-java/src/test/java/com/nanri/aiimage/config/TaskServiceWiringSliceTest.java b/backend-java/src/test/java/com/nanri/aiimage/config/TaskServiceWiringSliceTest.java index 0d4dd0251..a56a8ad6d 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/config/TaskServiceWiringSliceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/config/TaskServiceWiringSliceTest.java @@ -2,6 +2,7 @@ package com.nanri.aiimage.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.nanri.aiimage.common.service.ResultDownloadResolver; +import com.nanri.aiimage.config.InstanceMetadata; import com.nanri.aiimage.modules.file.service.LocalFileStorageService; import com.nanri.aiimage.modules.file.service.oss.OssStorageService; import com.nanri.aiimage.modules.pricetrack.mapper.PriceTrackShopCandidateMapper; @@ -9,6 +10,13 @@ import com.nanri.aiimage.modules.pricetrack.service.PriceTrackExcelAssemblyServi import com.nanri.aiimage.modules.pricetrack.service.PriceTrackLoopRunService; import com.nanri.aiimage.modules.pricetrack.service.PriceTrackTaskCacheService; import com.nanri.aiimage.modules.pricetrack.service.PriceTrackTaskService; +import com.nanri.aiimage.modules.shopdatacrawl.service.ShopDataCrawlDailyFileService; +import com.nanri.aiimage.modules.shopdatacrawl.service.ShopDataCrawlExcelAssemblyService; +import com.nanri.aiimage.modules.shopdatacrawl.service.ShopDataCrawlItemStoreService; +import com.nanri.aiimage.modules.shopdatacrawl.service.ShopDataCrawlResolveService; +import com.nanri.aiimage.modules.shopdatacrawl.service.ShopDataCrawlTaskCacheService; +import com.nanri.aiimage.modules.shopdatacrawl.service.ShopDataCrawlTaskService; +import com.nanri.aiimage.modules.shopdatacrawl.spi.DuplicateCheckRefreshPort; import com.nanri.aiimage.modules.shopkey.mapper.QueryAsinMapper; import com.nanri.aiimage.modules.shopkey.service.SkipPriceAsinService; import com.nanri.aiimage.modules.shopmatch.mapper.ShopMatchShopCandidateMapper; @@ -17,10 +25,16 @@ import com.nanri.aiimage.modules.shopmatch.service.ShopMatchTaskCacheService; import com.nanri.aiimage.modules.shopmatch.service.ShopMatchTaskService; import com.nanri.aiimage.modules.task.mapper.FileResultMapper; import com.nanri.aiimage.modules.task.mapper.FileTaskMapper; +import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper; +import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper; import com.nanri.aiimage.modules.task.service.TaskDistributedLockService; import com.nanri.aiimage.modules.task.service.TaskFileJobService; +import com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService; import com.nanri.aiimage.modules.task.service.TaskProgressLightAssembler; +import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService; +import com.nanri.aiimage.modules.task.service.TaskResultItemService; import com.nanri.aiimage.modules.task.service.TaskResultPayloadService; +import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService; import com.nanri.aiimage.modules.task.service.pipeline.AbstractShopPayloadTaskPipeline; import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService; import org.junit.jupiter.api.Test; @@ -53,7 +67,10 @@ 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 家族层」这条按证据得出的结论——家族层模板会改掉它的准入步序 + * 与收尾闸门,误套上去这里当场红。 * *
为什么不只断言「refresh() 没抛异常」。那是一句会说谎的判据:Spring 6 在没有
* {@code @Autowired} 而存在多枚 public 构造器时,会**静默挑无参那一枚**,容器照样起得来、
@@ -154,6 +171,59 @@ class TaskServiceWiringSliceTest {
@Bean LocalFileStorageService localFileStorageService() {
return mock(LocalFileStorageService.class);
}
+
+ // ---- 3B 迁进来的 ShopDataCrawl 那一支(23 枚依赖=目前最长的一张构造器参数表)----
+ @Bean ShopDataCrawlResolveService shopDataCrawlResolveService() {
+ return mock(ShopDataCrawlResolveService.class);
+ }
+
+ @Bean ShopDataCrawlExcelAssemblyService shopDataCrawlExcelAssemblyService() {
+ return mock(ShopDataCrawlExcelAssemblyService.class);
+ }
+
+ @Bean ShopDataCrawlTaskCacheService shopDataCrawlTaskCacheService() {
+ return mock(ShopDataCrawlTaskCacheService.class);
+ }
+
+ @Bean ShopDataCrawlDailyFileService shopDataCrawlDailyFileService() {
+ return mock(ShopDataCrawlDailyFileService.class);
+ }
+
+ @Bean ShopDataCrawlItemStoreService shopDataCrawlItemStoreService() {
+ return mock(ShopDataCrawlItemStoreService.class);
+ }
+
+ @Bean DuplicateCheckRefreshPort duplicateCheckRefreshPort() {
+ return mock(DuplicateCheckRefreshPort.class);
+ }
+
+ @Bean TaskResultItemService taskResultItemService() {
+ return mock(TaskResultItemService.class);
+ }
+
+ @Bean TaskProgressSnapshotService taskProgressSnapshotService() {
+ return mock(TaskProgressSnapshotService.class);
+ }
+
+ @Bean TaskHeartbeatPositionService taskHeartbeatPositionService() {
+ return mock(TaskHeartbeatPositionService.class);
+ }
+
+ @Bean TransientPayloadStorageService transientPayloadStorageService() {
+ return mock(TransientPayloadStorageService.class);
+ }
+
+ @Bean TaskChunkMapper taskChunkMapper() {
+ return mock(TaskChunkMapper.class);
+ }
+
+ @Bean TaskScopeStateMapper taskScopeStateMapper() {
+ return mock(TaskScopeStateMapper.class);
+ }
+
+ @Bean InstanceMetadata instanceMetadata() {
+ return mock(InstanceMetadata.class);
+ }
}
private static AnnotationConfigApplicationContext context(Class>... services) {
@@ -187,29 +257,37 @@ class TaskServiceWiringSliceTest {
@Test
void migratedServicesInstantiateThroughTheSpringContainer() {
- try (AnnotationConfigApplicationContext ctx =
- context(ShopMatchTaskService.class, PriceTrackTaskService.class)) {
+ try (AnnotationConfigApplicationContext ctx = context(ShopMatchTaskService.class,
+ PriceTrackTaskService.class, ShopDataCrawlTaskService.class)) {
ShopMatchTaskService shopMatch = ctx.getBean(ShopMatchTaskService.class);
PriceTrackTaskService priceTrack = ctx.getBean(PriceTrackTaskService.class);
+ ShopDataCrawlTaskService shopDataCrawl = ctx.getBean(ShopDataCrawlTaskService.class);
assertNotNull(shopMatch, "Lombok 生成枚换成显式枚之后,Spring 仍要能隐式构造注入");
assertNotNull(priceTrack);
+ assertNotNull(shopDataCrawl, "3B 那张 23 枚的参数表也得被容器原样解开");
assertTrue(shopMatch instanceof AbstractShopPayloadTaskPipeline,
"Phase 3 的判据是「真有生产调用方继承底座」,不是只由单测证明契约可用");
assertTrue(priceTrack instanceof AbstractShopPayloadTaskPipeline);
+ // 3B 实测结论:ShopDataCrawl 接得上**底座**、接不上家族层(自建索引+无 changed 闸门+单店合同),
+ // 所以这里断的是它的直接父类就是 AbstractFileTaskPipeline。误套家族层(会改掉它的准入步序与
+ // 收尾闸门)这条断言当场红——注意不能用 !(x instanceof 家族层):静态类型不可能成立时 javac 直接拒。
+ assertEquals(com.nanri.aiimage.modules.task.service.pipeline.AbstractFileTaskPipeline.class,
+ shopDataCrawl.getClass().getSuperclass(), "本支的直接父类必须是底座那一层");
}
}
@Test
void superCallLandsTheFiveBaseDependenciesInOrder() {
- try (AnnotationConfigApplicationContext ctx =
- context(ShopMatchTaskService.class, PriceTrackTaskService.class)) {
+ try (AnnotationConfigApplicationContext ctx = context(ShopMatchTaskService.class,
+ PriceTrackTaskService.class, ShopDataCrawlTaskService.class)) {
ShopMatchTaskService shopMatch = ctx.getBean(ShopMatchTaskService.class);
PriceTrackTaskService priceTrack = ctx.getBean(PriceTrackTaskService.class);
+ ShopDataCrawlTaskService shopDataCrawl = ctx.getBean(ShopDataCrawlTaskService.class);
// 这五枚是交给 super(...) 的那五枚。参数表里它们与其余 12/13 枚同类型不重复,
// 换位会在编译期就被挡住——但「少交一枚」「交 null」不会。逐枚 assertSame 才是硬证。
- for (Object service : List.of(shopMatch, priceTrack)) {
+ for (Object service : List.of(shopMatch, priceTrack, shopDataCrawl)) {
assertSame(ctx.getBean(FileTaskMapper.class), fieldValue(service, "fileTaskMapper"));
assertSame(ctx.getBean(FileResultMapper.class), fieldValue(service, "fileResultMapper"));
assertSame(ctx.getBean(TaskDistributedLockService.class),
@@ -218,11 +296,30 @@ class TaskServiceWiringSliceTest {
assertSame(ctx.getBean(OssStorageService.class), fieldValue(service, "ossStorageService"));
}
- // 两支各自的私有件:绝不能把 A 支的缓存服务注进 B 支(同族两个 bean,最容易串的就是这儿)
+ // 三支各自的私有件:绝不能把 A 支的缓存服务注进 B 支(同族三个 bean,最容易串的就是这儿)
assertSame(ctx.getBean(ShopMatchTaskCacheService.class), fieldValue(shopMatch, "shopMatchTaskCacheService"));
assertSame(ctx.getBean(PriceTrackTaskCacheService.class), fieldValue(priceTrack, "priceTrackTaskCacheService"));
+ assertSame(ctx.getBean(ShopDataCrawlTaskCacheService.class), fieldValue(shopDataCrawl, "taskCacheService"));
assertSame(ctx.getBean(ShopMatchExcelAssemblyService.class), fieldValue(shopMatch, "excelAssemblyService"));
assertSame(ctx.getBean(PriceTrackExcelAssemblyService.class), fieldValue(priceTrack, "excelAssemblyService"));
+ assertSame(ctx.getBean(ShopDataCrawlExcelAssemblyService.class),
+ fieldValue(shopDataCrawl, "excelAssemblyService"));
+ assertSame(ctx.getBean(ShopDataCrawlResolveService.class),
+ fieldValue(shopDataCrawl, "shopDataCrawlResolveService"));
+ // 23 枚里最容易错位的是「三个同族 Mapper bean」与实例身份:逐枚点名
+ assertSame(ctx.getBean(TaskChunkMapper.class), fieldValue(shopDataCrawl, "taskChunkMapper"));
+ assertSame(ctx.getBean(TaskScopeStateMapper.class), fieldValue(shopDataCrawl, "taskScopeStateMapper"));
+ assertSame(ctx.getBean(TransientPayloadStorageService.class),
+ fieldValue(shopDataCrawl, "transientPayloadStorageService"));
+ assertSame(ctx.getBean(InstanceMetadata.class), fieldValue(shopDataCrawl, "instanceMetadata"));
+ assertSame(ctx.getBean(ShopDataCrawlDailyFileService.class), fieldValue(shopDataCrawl, "dailyFileService"));
+ assertSame(ctx.getBean(ShopDataCrawlItemStoreService.class),
+ fieldValue(shopDataCrawl, "shopDataCrawlItemStoreService"));
+ assertSame(ctx.getBean(DuplicateCheckRefreshPort.class),
+ fieldValue(shopDataCrawl, "duplicateCheckRefreshPort"));
+ assertSame(ctx.getBean(TaskHeartbeatPositionService.class),
+ fieldValue(shopDataCrawl, "taskHeartbeatPositionService"));
+ assertSame(ctx.getBean(PlatformTransactionManager.class), fieldValue(shopDataCrawl, "transactionManager"));
assertSame(ctx.getBean(ShopMatchShopCandidateMapper.class), fieldValue(shopMatch, "candidateMapper"));
assertSame(ctx.getBean(PriceTrackShopCandidateMapper.class), fieldValue(priceTrack, "candidateMapper"));
assertSame(ctx.getBean(PriceTrackLoopRunService.class), fieldValue(priceTrack, "priceTrackLoopRunService"));
@@ -235,20 +332,23 @@ class TaskServiceWiringSliceTest {
@Test
void injectedCollaboratorsAreActuallyUsedAndEachBranchReportsItsOwnModuleType() {
- try (AnnotationConfigApplicationContext ctx =
- context(ShopMatchTaskService.class, PriceTrackTaskService.class)) {
+ try (AnnotationConfigApplicationContext ctx = context(ShopMatchTaskService.class,
+ PriceTrackTaskService.class, ShopDataCrawlTaskService.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);
List