refactor(boundary): 跨模块循环依赖清零(8 对 → 0),task→业务 依赖归零
共享内核下沉(跨模块共享的"身份/组织/安全"类型进 common) - AdminUserEntity/AdminUserMapper、ShopManageGroupEntity/ShopManageGroupMapper → common - AdminAuthSupport(33 文件 17 模块引用)、JwtService、AuthProperties、DeviceSessionPolicy → common/security(原先放在 admin/auth 里,任何模块用一次就多一条跨模块边) 端口化(消费方声明接口、数据方实现) - task/spi:ResultFileJobHandler 新增 resolveResultFileUrl 钩子(BRAND 特例从 Worker 收回); Worker 改为调用 handler.onSuccess(该钩子历史上从未被调用,withdraw 的收尾靠 Worker 里的 WITHDRAW 特判硬编码——现两者都归位,task 侧不再 import withdraw/brand) - admin/spi/UserSecretCleanupPort(删除用户级联清理密钥)、notification/spi/ProxyBalancePort (代理余额探测)、shopdatacrawl/spi/ManagedShopNamesPort(可管店铺名) - shopkey/spi/GroupDeletionGuardPort:分组删除守卫改由各业务模块实现(invalidasin/dedupe 两个实现), shopkey 不再直连它们的 Mapper 棘轮与量化(2026-09-14 实测) - ArchitectureBoundaryTest:task→业务 119 → **0**(基线钉死为 0,新增跨模块动作必须走 task/spi) - 跨模块 import 行数 650 → 605;双向依赖对 8 → **0**(usersecret/permission/shopkey 三向环、 task↔withdraw、task↔brand、admin↔permission、admin↔usersecret、dedup↔shopkey、 invalidasin↔shopkey、notification↔usersecret、shopdatacrawl↔shopduplicatecheck 全部拆解) 测试同步:接口契约 8→9、品牌 Handler 钩子契约、worker 的 10 个测试构造实参、通知/管理测试端口化。 mvn test 2881 全绿。
This commit is contained in:
+21
-13
@@ -12,16 +12,19 @@ import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* BrandResultFileJobHandler 测试(任务 71)。
|
||||
* BRAND 的 resolveResultObjectKey 特例(无 resultId 也走)保留在 Worker 公共路径 resolveResultFileUrl,
|
||||
* Handler 不接管 URL 解析;cleanup 为空(原 cleanupAfterSuccess 无 BRAND 分支,不走 payload.deleteLatest)。
|
||||
* BrandResultFileJobHandler 测试(任务 71 / 2026-09 边界收敛)。
|
||||
* BRAND 的 resolveResultObjectKey 特例(无 resultId 也走)由本 Handler 的 resolveResultFileUrl 钩子承担
|
||||
* (原实现的 Worker 直连品牌模块构成 task → 业务依赖,已翻转为 SPI 钩子);
|
||||
* cleanup 为空(原 cleanupAfterSuccess 无 BRAND 分支,不走 payload.deleteLatest)。
|
||||
*/
|
||||
class BrandResultFileJobHandlerTest {
|
||||
|
||||
@@ -49,18 +52,23 @@ class BrandResultFileJobHandlerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
void resultUrlBrandSpecial() throws IOException {
|
||||
// Handler 不接管 URL 解析:无 resolveResultObjectKey / resolveResultFileUrl 方法
|
||||
for (java.lang.reflect.Method method : handler.getClass().getDeclaredMethods()) {
|
||||
assertFalse(method.getName().contains("resolve"),
|
||||
"Handler 不接管 URL 解析:" + method.getName());
|
||||
}
|
||||
// 特例仍留在 Worker 公共路径 resolveResultFileUrl(含 BRAND 分支,无 resultId 也走)
|
||||
void resultUrlBrandSpecialResolvedByHandlerHook() throws IOException {
|
||||
// 2026-09:URL 解析特例改由本 Handler 的 resolveResultFileUrl 钩子承担,Worker 不再 import 品牌模块
|
||||
TaskFileJobEntity job = new TaskFileJobEntity();
|
||||
job.setTaskId(33L);
|
||||
when(brandTaskService.resolveResultObjectKey(33L)).thenReturn("oss/brand/33.json");
|
||||
|
||||
assertEquals("oss/brand/33.json", handler.resolveResultFileUrl(job));
|
||||
assertNull(handler.resolveResultFileUrl(null), "空 job 返回 null 交回默认路径");
|
||||
assertNull(handler.resolveResultFileUrl(new TaskFileJobEntity()), "无 taskId 返回 null 交回默认路径");
|
||||
|
||||
String source = workerSource();
|
||||
assertTrue(source.contains("resolveResultFileUrl"), "Worker 保留 resolveResultFileUrl 公共路径");
|
||||
assertTrue(source.contains("resolveResultObjectKey"), "Worker 保留 BRAND 的 resolveResultObjectKey 特例");
|
||||
assertTrue(source.contains("\"BRAND\"") || source.contains("BRAND"),
|
||||
"Worker resolveResultFileUrl 含 BRAND 分支");
|
||||
assertTrue(source.contains("handler.resolveResultFileUrl")
|
||||
|| source.contains("resolveResultFileUrl(job)"),
|
||||
"Worker 通过 Handler 钩子解析模块自定义 URL");
|
||||
assertFalse(source.contains("resolveResultObjectKey"), "Worker 不再直连品牌模块");
|
||||
assertFalse(source.contains("modules.brand"), "Worker 不再 import 品牌模块");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
+6
-5
@@ -38,16 +38,17 @@ class ResultFileJobHandlerTest {
|
||||
|
||||
@Test
|
||||
void interfaceMethodsPresent() throws Exception {
|
||||
// 2026-09:新增 fallbackAssembleOnFailure(job 重试耗尽时用部分数据兜底生成结果文件),
|
||||
// 接口方法从 7 个增到 8 个,同步更新契约断言。
|
||||
assertEquals(8, ResultFileJobHandler.class.getDeclaredMethods().length,
|
||||
"接口方法数量为 8(moduleType/process/onSuccess/cleanup/onFailure/"
|
||||
+ "fallbackAssembleOnFailure/supportsAsyncOffload/isOwnerScoped)");
|
||||
// 2026-09:新增 resolveResultFileUrl(模块自定义结果对象 key 解析,BRAND 用),
|
||||
// 接口方法从 8 个增到 9 个,同步更新契约断言。
|
||||
assertEquals(9, ResultFileJobHandler.class.getDeclaredMethods().length,
|
||||
"接口方法数量为 9(moduleType/process/onSuccess/cleanup/onFailure/"
|
||||
+ "fallbackAssembleOnFailure/resolveResultFileUrl/supportsAsyncOffload/isOwnerScoped)");
|
||||
assertNotNull(methodOf(ResultFileJobHandler.class, "moduleType"));
|
||||
assertNotNull(methodOf(ResultFileJobHandler.class, "process", TaskFileJobEntity.class));
|
||||
assertNotNull(methodOf(ResultFileJobHandler.class, "onSuccess", TaskFileJobEntity.class));
|
||||
assertNotNull(methodOf(ResultFileJobHandler.class, "cleanup", TaskFileJobEntity.class));
|
||||
assertNotNull(methodOf(ResultFileJobHandler.class, "onFailure", TaskFileJobEntity.class, String.class));
|
||||
assertNotNull(methodOf(ResultFileJobHandler.class, "resolveResultFileUrl", TaskFileJobEntity.class));
|
||||
assertNotNull(methodOf(ResultFileJobHandler.class, "supportsAsyncOffload"));
|
||||
assertNotNull(methodOf(ResultFileJobHandler.class, "isOwnerScoped"));
|
||||
}
|
||||
|
||||
-1
@@ -89,7 +89,6 @@ class TaskResultFileJobWorkerCleanupTest {
|
||||
mock(FileResultMapper.class),
|
||||
mock(TaskFileJobLocalDispatcher.class),
|
||||
mock(InstanceMetadata.class),
|
||||
withdraw, brand,
|
||||
registry);
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -92,7 +92,6 @@ class TaskResultFileJobWorkerDispatchTest {
|
||||
mock(FileResultMapper.class),
|
||||
mock(TaskFileJobLocalDispatcher.class),
|
||||
mock(InstanceMetadata.class),
|
||||
withdraw, brand,
|
||||
registry);
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -100,7 +100,6 @@ class TaskResultFileJobWorkerEquivalenceTest {
|
||||
fileResultMapper,
|
||||
mock(TaskFileJobLocalDispatcher.class),
|
||||
instanceMetadata,
|
||||
withdraw, brand,
|
||||
registry);
|
||||
Field executorField = TaskResultFileJobWorker.class.getDeclaredField("taskQueueExecutor");
|
||||
executorField.setAccessible(true);
|
||||
|
||||
-1
@@ -99,7 +99,6 @@ class TaskResultFileJobWorkerFailureNotifyTest {
|
||||
mock(FileResultMapper.class),
|
||||
mock(TaskFileJobLocalDispatcher.class),
|
||||
instanceMetadata,
|
||||
withdraw, brand,
|
||||
registry);
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -102,7 +102,6 @@ class TaskResultFileJobWorkerOffloadTest {
|
||||
mock(FileResultMapper.class),
|
||||
mock(TaskFileJobLocalDispatcher.class),
|
||||
instanceMetadata,
|
||||
withdraw, brand,
|
||||
registry);
|
||||
setTaskQueueExecutor(worker, taskQueueExecutor);
|
||||
return worker;
|
||||
|
||||
-1
@@ -96,7 +96,6 @@ class TaskResultFileJobWorkerOrphanTest {
|
||||
mock(FileResultMapper.class),
|
||||
mock(TaskFileJobLocalDispatcher.class),
|
||||
instanceMetadata,
|
||||
withdraw, brand,
|
||||
registry);
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -93,7 +93,6 @@ class TaskResultFileJobWorkerOwnerRoutingTest {
|
||||
mock(FileResultMapper.class),
|
||||
localDispatcher,
|
||||
instanceMetadata,
|
||||
withdraw, brand,
|
||||
new ResultFileJobHandlerRegistry(handlers));
|
||||
set(worker, "taskQueueExecutor", (org.springframework.core.task.TaskExecutor) Runnable::run);
|
||||
set(worker, "localWorkerEnabled", true);
|
||||
|
||||
-1
@@ -96,7 +96,6 @@ class TaskResultFileJobWorkerOwnerScopedTest {
|
||||
mock(FileResultMapper.class),
|
||||
mock(TaskFileJobLocalDispatcher.class),
|
||||
instanceMetadata,
|
||||
withdraw, brand,
|
||||
registry);
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -72,7 +72,6 @@ class TaskResultFileJobWorkerSpecialRuleTest {
|
||||
fileResultMapper,
|
||||
mock(TaskFileJobLocalDispatcher.class),
|
||||
instanceMetadata,
|
||||
withdraw, brand,
|
||||
handlerRegistry);
|
||||
java.lang.reflect.Field executorField =
|
||||
TaskResultFileJobWorker.class.getDeclaredField("taskQueueExecutor");
|
||||
|
||||
-1
@@ -96,7 +96,6 @@ class TaskResultFileJobWorkerStuckScanTest {
|
||||
mock(FileResultMapper.class),
|
||||
mock(TaskFileJobLocalDispatcher.class),
|
||||
instanceMetadata,
|
||||
withdraw, brand,
|
||||
registry);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user