status(WriteIdentity scope) {
return store.get(scope.businessKey());
}
+ /** 平台名转回枚举;仓库域没有平台概念,返回 null。 */
+ private static Platform platformOf(WriteIdentity scope) {
+ String name = scope.platformName();
+ if (name == null) {
+ return null;
+ }
+ try {
+ return Platform.valueOf(name);
+ } catch (IllegalArgumentException e) {
+ return null;
+ }
+ }
+
/** 该状态是否可安全重跑;只有 FAILED_RETRYABLE 返回 true。 */
public static boolean isRetryableStatus(IdempotencyStatus status) {
return status == IdempotencyStatus.FAILED_RETRYABLE;
diff --git a/shared/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java b/sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java
similarity index 87%
rename from shared/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java
rename to sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java
index 907db57..61dd145 100644
--- a/shared/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java
+++ b/sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java
@@ -15,7 +15,7 @@ import java.util.Map;
* 幂等守卫的埋点:把「抢占结果 + 平台写结果」拼成一条 {@link CallRecord}。
*
* 幂等层没有 {@code ChannelContext}(写操作可能先于取视图发生,也不一定绑定连接),
- * 所以这里只用 {@link WriteScope} 拼出 provider / platform / omsStoreId,
+ * 所以这里只用 {@link WriteIdentity} 拼出 provider / platform / omsStoreId,
* 不含 externalStoreId 与链路 requestId。
*
* 约定:观察者异常一律吞掉并打 WARN,绝不影响写操作本身;
@@ -38,7 +38,7 @@ final class WriteAudit {
}
/** 操作名:{@code writes.}。 */
- static String operation(WriteScope scope) {
+ static String operation(WriteIdentity scope) {
return OPERATION_PREFIX + scope.action();
}
@@ -63,7 +63,7 @@ final class WriteAudit {
* @param extraKey 额外摘要的键(如 {@code resultRef} / {@code retryable}),可为 null
* @param extraValue 额外摘要的值
*/
- static void record(CallObserver observer, Clock clock, WriteScope scope, CallOutcome outcome,
+ static void record(CallObserver observer, Clock clock, WriteIdentity scope, CallOutcome outcome,
Stage stage, RuntimeException error, String extraKey, Object extraValue) {
Map auditParams = base(scope, stage);
if (extraKey != null) {
@@ -81,8 +81,8 @@ final class WriteAudit {
Instant now = Instant.now(clock);
CallRecord.Builder record = CallRecord.builder()
.occurredAt(now)
- .provider(scope.provider())
- .platform(scope.platform())
+ .provider(scope.providerName())
+ .platform(platformOf(scope))
.omsStoreId(scope.omsStoreId())
.operation(operation(scope))
.outcome(outcome)
@@ -97,7 +97,7 @@ final class WriteAudit {
}
/** 三个固定字段:业务键、provider 键、守卫阶段。 */
- private static Map base(WriteScope scope, Stage stage) {
+ private static Map base(WriteIdentity scope, Stage stage) {
Map map = new LinkedHashMap();
map.put("businessKey", scope.businessKey());
map.put("providerKey", scope.providerKey());
@@ -105,6 +105,19 @@ final class WriteAudit {
return map;
}
+ /** 平台名转回枚举;仓库域没有平台概念,返回 null。 */
+ private static common.ecommerce.shared.model.Platform platformOf(WriteIdentity scope) {
+ String name = scope.platformName();
+ if (name == null) {
+ return null;
+ }
+ try {
+ return common.ecommerce.shared.model.Platform.valueOf(name);
+ } catch (IllegalArgumentException e) {
+ return null;
+ }
+ }
+
/** 守卫阶段:从抢占到落库的每一步都有名字,便于按 stage 聚合。 */
enum Stage {
/** 业务键已抢占,即将执行平台写。 */
diff --git a/sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteIdentity.java b/sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteIdentity.java
new file mode 100644
index 0000000..74a133f
--- /dev/null
+++ b/sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteIdentity.java
@@ -0,0 +1,36 @@
+package common.ecommerce.shared.idempotency;
+
+/**
+ * 一次写操作的标识维度。渠道域与仓库域各自实现:两边的主键模型不同
+ * (渠道域是 {@code platform + omsStoreId},仓库域是 {@code warehouseCode}),
+ * 但幂等状态机共用。
+ *
+ * 实现方负责算出两个键:
+ * {@link #businessKey()} 跨 provider 共用,{@link #providerKey()} 只在本 provider 内去重。
+ */
+public interface WriteIdentity {
+
+ /** 接入通道名,用于幂等记录与跨 provider 冲突判定;非 null。 */
+ String providerName();
+
+ /** 业务平台名,无平台概念时返回 null。 */
+ String platformName();
+
+ /** 宿主侧店铺 ID;仓库域无此概念,返回 null。 */
+ String omsStoreId();
+
+ /** 渠道侧店铺 ID;仓库域无此概念,返回 null。 */
+ String externalStoreId();
+
+ /** 业务动作名,如 {@code create} / {@code cancel};非 null。 */
+ String action();
+
+ /** 业务自然键,如 {@code PO-1:pkg-1} 或 {@code OB-20261028-000123};非 null。 */
+ String businessRef();
+
+ /** 跨 provider 的业务幂等键;非 null。 */
+ String businessKey();
+
+ /** 单 provider 内的请求幂等键;非 null。 */
+ String providerKey();
+}
diff --git a/shared/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java b/sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java
rename to sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java
diff --git a/shared/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java b/sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java
similarity index 91%
rename from shared/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java
rename to sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java
index ebd151d..0dbef01 100644
--- a/shared/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java
+++ b/sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java
@@ -16,7 +16,7 @@ import java.util.Objects;
* 只防单 provider 内的重复请求/重试
*
*/
-public final class WriteScope {
+public final class WriteScope implements WriteIdentity {
/** 接入通道;非 null,参与 {@link #providerKey()} 但不参与 {@link #businessKey()}。 */
private final ChannelProvider provider;
@@ -57,27 +57,43 @@ public final class WriteScope {
return provider;
}
+ /** 接入通道名,实现 {@link WriteIdentity}。 */
+ @Override
+ public String providerName() {
+ return provider.name();
+ }
+
+ /** 业务平台名,实现 {@link WriteIdentity}。 */
+ @Override
+ public String platformName() {
+ return platform == null ? null : platform.name();
+ }
+
/** 业务平台。 */
public Platform platform() {
return platform;
}
/** 宿主侧店铺 ID。 */
+ @Override
public String omsStoreId() {
return omsStoreId;
}
/** 渠道侧店铺 ID;只进 provider 键,切换 provider 时允许不同。 */
+ @Override
public String externalStoreId() {
return externalStoreId;
}
/** 业务动作名。 */
+ @Override
public String action() {
return action;
}
/** 业务自然键。 */
+ @Override
public String businessRef() {
return businessRef;
}
diff --git a/shared/src/main/java/common/ecommerce/shared/model/Capability.java b/sdk-common/src/main/java/common/ecommerce/shared/model/Capability.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/model/Capability.java
rename to sdk-common/src/main/java/common/ecommerce/shared/model/Capability.java
diff --git a/shared/src/main/java/common/ecommerce/shared/model/ChannelProvider.java b/sdk-common/src/main/java/common/ecommerce/shared/model/ChannelProvider.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/model/ChannelProvider.java
rename to sdk-common/src/main/java/common/ecommerce/shared/model/ChannelProvider.java
diff --git a/shared/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java b/sdk-common/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java
rename to sdk-common/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java
diff --git a/shared/src/main/java/common/ecommerce/shared/model/Platform.java b/sdk-common/src/main/java/common/ecommerce/shared/model/Platform.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/model/Platform.java
rename to sdk-common/src/main/java/common/ecommerce/shared/model/Platform.java
diff --git a/shared/src/main/java/common/ecommerce/shared/spi/AccessToken.java b/sdk-common/src/main/java/common/ecommerce/shared/spi/AccessToken.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/spi/AccessToken.java
rename to sdk-common/src/main/java/common/ecommerce/shared/spi/AccessToken.java
diff --git a/shared/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java b/sdk-common/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java
rename to sdk-common/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java
diff --git a/shared/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java b/sdk-common/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java
rename to sdk-common/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java
diff --git a/shared/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java b/sdk-common/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java
similarity index 87%
rename from shared/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java
rename to sdk-common/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java
index d3a444b..018c602 100644
--- a/shared/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java
+++ b/sdk-common/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java
@@ -1,7 +1,5 @@
package common.ecommerce.shared.spi;
-import common.ecommerce.shared.model.ChannelProvider;
-
import java.time.Instant;
import java.util.Objects;
@@ -19,8 +17,8 @@ public final class IdempotencyRecord {
/** 当前状态。 */
private final IdempotencyStatus status;
- /** 完成/抢占该动作的接入通道。 */
- private final ChannelProvider provider;
+ /** 完成/抢占该动作的接入通道名({@code ChannelProvider} / {@code WarehouseProvider} 的 name)。 */
+ private final String provider;
/** 抢占方实例标识。 */
private final String owner;
@@ -31,7 +29,7 @@ public final class IdempotencyRecord {
/** 最后更新时间(UTC)。 */
private final Instant updatedAt;
- private IdempotencyRecord(String key, IdempotencyStatus status, ChannelProvider provider,
+ private IdempotencyRecord(String key, IdempotencyStatus status, String provider,
String owner, String resultRef, Instant updatedAt) {
this.key = Objects.requireNonNull(key, "key");
this.status = Objects.requireNonNull(status, "status");
@@ -46,7 +44,7 @@ public final class IdempotencyRecord {
*
* @throws NullPointerException key、status 或 updatedAt 为 null
*/
- public static IdempotencyRecord of(String key, IdempotencyStatus status, ChannelProvider provider,
+ public static IdempotencyRecord of(String key, IdempotencyStatus status, String provider,
String owner, String resultRef, Instant updatedAt) {
return new IdempotencyRecord(key, status, provider, owner, resultRef, updatedAt);
}
@@ -61,8 +59,8 @@ public final class IdempotencyRecord {
return status;
}
- /** 完成该动作的 provider;IN_PROGRESS 时为抢占方。 */
- public ChannelProvider provider() {
+ /** 完成该动作的 provider 名;IN_PROGRESS 时为抢占方。 */
+ public String provider() {
return provider;
}
diff --git a/shared/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java b/sdk-common/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java
rename to sdk-common/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java
diff --git a/shared/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java b/sdk-common/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java
similarity index 81%
rename from shared/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java
rename to sdk-common/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java
index 23e7d01..43f9988 100644
--- a/shared/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java
+++ b/sdk-common/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java
@@ -1,7 +1,5 @@
package common.ecommerce.shared.spi;
-import common.ecommerce.shared.model.ChannelProvider;
-
import java.time.Instant;
import java.util.Optional;
@@ -10,6 +8,9 @@ import java.util.Optional;
*
* 实现必须保证 {@link #claim} 的原子性(唯一索引或 Redis SETNX):并发抢占同一键时
* 只有一个调用能得到 {@link IdempotencyClaim.Outcome#ACQUIRED}。
+ *
+ * provider 用字符串表示({@code ChannelProvider.name()} / {@code WarehouseProvider.name()}),
+ * 渠道域与仓库域共用同一套状态机与同一张表。
*/
public interface IdempotencyStore {
@@ -20,12 +21,12 @@ public interface IdempotencyStore {
*
* @param key 幂等键(业务键或 provider 请求键)
* @param owner 抢占方实例标识
- * @param provider 接入通道,写入记录用于识别跨 provider 重复
+ * @param provider 接入通道名,写入记录用于识别跨 provider 重复
* @param now 当前时间(UTC)
* @param ttlSeconds 抢占后无结果的最长保留时间,过期视为可重新抢占
* @return 抢占结果;ACQUIRED 时 record 为 null 或历史记录
*/
- IdempotencyClaim claim(String key, String owner, ChannelProvider provider, Instant now, long ttlSeconds);
+ IdempotencyClaim claim(String key, String owner, String provider, Instant now, long ttlSeconds);
/**
* 执行成功,记录结果引用。只有当前 owner 可以写入。
diff --git a/shared/src/main/java/common/ecommerce/shared/spi/LockProvider.java b/sdk-common/src/main/java/common/ecommerce/shared/spi/LockProvider.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/spi/LockProvider.java
rename to sdk-common/src/main/java/common/ecommerce/shared/spi/LockProvider.java
diff --git a/shared/src/main/java/common/ecommerce/shared/spi/SecretProvider.java b/sdk-common/src/main/java/common/ecommerce/shared/spi/SecretProvider.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/spi/SecretProvider.java
rename to sdk-common/src/main/java/common/ecommerce/shared/spi/SecretProvider.java
diff --git a/shared/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java b/sdk-common/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java
similarity index 64%
rename from shared/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java
rename to sdk-common/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java
index 8213d1f..fa26e62 100644
--- a/shared/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java
+++ b/sdk-common/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java
@@ -1,25 +1,26 @@
package common.ecommerce.shared.spi;
-import common.ecommerce.shared.model.ChannelProvider;
-
import java.time.Instant;
/**
* 增量水位线 SPI。
*
* 按 {@code provider + account + stream} 分开维护;只在整个批次成功后推进。
+ *
+ * provider 用字符串表示({@code ChannelProvider.name()} / {@code WarehouseProvider.name()}),
+ * 渠道域与仓库域共用同一张水位线表。
*/
public interface SyncCursorStore {
/**
* 读取水位线。
*
- * @param provider 接入通道,与 accountKey、stream 一起构成维度
+ * @param provider 接入通道名,与 accountKey、stream 一起构成维度
* @param accountKey 宿主定义的账户标识
* @param stream 同步流名称,如 orders / products
* @return 水位线;null 表示还没有水位线,需要首次全量建底
*/
- Instant get(ChannelProvider provider, String accountKey, String stream);
+ Instant get(String provider, String accountKey, String stream);
/**
* 推进水位线。
@@ -28,5 +29,5 @@ public interface SyncCursorStore {
*
* @param watermark 新水位线(UTC),不会为 null
*/
- void advance(ChannelProvider provider, String accountKey, String stream, Instant watermark);
+ void advance(String provider, String accountKey, String stream, Instant watermark);
}
diff --git a/shared/src/main/java/common/ecommerce/shared/spi/TokenStore.java b/sdk-common/src/main/java/common/ecommerce/shared/spi/TokenStore.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/spi/TokenStore.java
rename to sdk-common/src/main/java/common/ecommerce/shared/spi/TokenStore.java
diff --git a/shared/src/main/java/common/ecommerce/shared/support/CanonicalKeys.java b/sdk-common/src/main/java/common/ecommerce/shared/support/CanonicalKeys.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/support/CanonicalKeys.java
rename to sdk-common/src/main/java/common/ecommerce/shared/support/CanonicalKeys.java
diff --git a/shared/src/main/java/common/ecommerce/shared/support/Money.java b/sdk-common/src/main/java/common/ecommerce/shared/support/Money.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/support/Money.java
rename to sdk-common/src/main/java/common/ecommerce/shared/support/Money.java
diff --git a/shared/src/main/java/common/ecommerce/shared/support/Page.java b/sdk-common/src/main/java/common/ecommerce/shared/support/Page.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/support/Page.java
rename to sdk-common/src/main/java/common/ecommerce/shared/support/Page.java
diff --git a/shared/src/main/java/common/ecommerce/shared/support/PlatformTime.java b/sdk-common/src/main/java/common/ecommerce/shared/support/PlatformTime.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/support/PlatformTime.java
rename to sdk-common/src/main/java/common/ecommerce/shared/support/PlatformTime.java
diff --git a/shared/src/main/java/common/ecommerce/shared/sync/SyncResult.java b/sdk-common/src/main/java/common/ecommerce/shared/sync/SyncResult.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/sync/SyncResult.java
rename to sdk-common/src/main/java/common/ecommerce/shared/sync/SyncResult.java
diff --git a/shared/src/main/java/common/ecommerce/shared/sync/SyncSpec.java b/sdk-common/src/main/java/common/ecommerce/shared/sync/SyncSpec.java
similarity index 100%
rename from shared/src/main/java/common/ecommerce/shared/sync/SyncSpec.java
rename to sdk-common/src/main/java/common/ecommerce/shared/sync/SyncSpec.java
diff --git a/http/src/test/java/common/ecommerce/http/ResponsesTest.java b/sdk-common/src/test/java/common/ecommerce/http/ResponsesTest.java
similarity index 100%
rename from http/src/test/java/common/ecommerce/http/ResponsesTest.java
rename to sdk-common/src/test/java/common/ecommerce/http/ResponsesTest.java
diff --git a/http/src/test/java/common/ecommerce/http/TokenManagerTest.java b/sdk-common/src/test/java/common/ecommerce/http/TokenManagerTest.java
similarity index 100%
rename from http/src/test/java/common/ecommerce/http/TokenManagerTest.java
rename to sdk-common/src/test/java/common/ecommerce/http/TokenManagerTest.java
diff --git a/shared/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java b/sdk-common/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java
similarity index 100%
rename from shared/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java
rename to sdk-common/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java
diff --git a/shared/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java b/sdk-common/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java
similarity index 97%
rename from shared/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java
rename to sdk-common/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java
index 9186ce3..35f6372 100644
--- a/shared/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java
+++ b/sdk-common/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java
@@ -67,7 +67,7 @@ class WriteAuditTest {
private final Map records = new LinkedHashMap();
@Override
- public IdempotencyClaim claim(String key, String owner, ChannelProvider provider,
+ public IdempotencyClaim claim(String key, String owner, String provider,
Instant now, long ttlSeconds) {
IdempotencyRecord existing = records.get(key);
if (existing != null) {
@@ -107,12 +107,12 @@ class WriteAuditTest {
return Optional.ofNullable(records.get(key));
}
- void seedSucceeded(String key, ChannelProvider provider, String resultRef) {
+ void seedSucceeded(String key, String provider, String resultRef) {
records.put(key, IdempotencyRecord.of(key, IdempotencyStatus.SUCCEEDED, provider,
"other-worker", resultRef, T0));
}
- void seedInProgress(String key, ChannelProvider provider, String owner) {
+ void seedInProgress(String key, String provider, String owner) {
records.put(key, IdempotencyRecord.of(key, IdempotencyStatus.IN_PROGRESS, provider,
owner, null, T0));
}
@@ -141,7 +141,7 @@ class WriteAuditTest {
CallRecord record = observer.only();
assertEquals("writes.markShipped", record.operation(), "操作名要带 writes. 前缀");
assertEquals(CallOutcome.SUCCESS, record.outcome());
- assertEquals(ChannelProvider.LINGXING, record.provider());
+ assertEquals(ChannelProvider.LINGXING.name(), record.provider());
assertEquals(Platform.WALMART_SC, record.platform());
assertEquals("oms-wm-001", record.omsStoreId());
assertEquals(SCOPE.businessKey(), record.params().get("businessKey"));
@@ -170,7 +170,7 @@ class WriteAuditTest {
@Test
void crashWindowRepairIsRecordedWithItsOwnStage() {
// provider 键已成功、业务键没记上
- store.seedSucceeded(SCOPE.providerKey(), ChannelProvider.LINGXING, "SHIP-9");
+ store.seedSucceeded(SCOPE.providerKey(), ChannelProvider.LINGXING.name(), "SHIP-9");
AtomicInteger calls = new AtomicInteger();
WriteResult result = guard.execute(SCOPE, () -> {
@@ -192,7 +192,7 @@ class WriteAuditTest {
@Test
void inProgressConflictIsRecordedAsFailure() {
- store.seedInProgress(SCOPE.businessKey(), ChannelProvider.LINGXING, "worker-2");
+ store.seedInProgress(SCOPE.businessKey(), ChannelProvider.LINGXING.name(), "worker-2");
assertThrows(IdempotencyConflictException.class,
() -> guard.execute(SCOPE, () -> "SHIP-1", v -> v));
@@ -242,7 +242,7 @@ class WriteAuditTest {
assertEquals(CallOutcome.FAILURE, last.outcome());
assertEquals("CROSS_PROVIDER_CONFLICT", last.params().get("stage"));
assertEquals("LINGXING", last.params().get("completedByProvider"));
- assertEquals(ChannelProvider.DIRECT, last.provider(), "记录的是本次请求的 provider");
+ assertEquals(ChannelProvider.DIRECT.name(), last.provider(), "记录的是本次请求的 provider");
}
@Test
diff --git a/shared/src/test/java/common/ecommerce/shared/support/CanonicalKeysTest.java b/sdk-common/src/test/java/common/ecommerce/shared/support/CanonicalKeysTest.java
similarity index 100%
rename from shared/src/test/java/common/ecommerce/shared/support/CanonicalKeysTest.java
rename to sdk-common/src/test/java/common/ecommerce/shared/support/CanonicalKeysTest.java
diff --git a/testkit/pom.xml b/sdk-testkit/pom.xml
similarity index 74%
rename from testkit/pom.xml
rename to sdk-testkit/pom.xml
index eed9411..81640ec 100644
--- a/testkit/pom.xml
+++ b/sdk-testkit/pom.xml
@@ -6,25 +6,21 @@
ecommerce
- common-ecommerce
+ channel-sdk-parent
1.0.0-SNAPSHOT
- common-ecommerce-testkit
+ sdk-testkit
测试口子:InMemory SPI、FakeTransport、夹具加载、断言工具
ecommerce
- common-ecommerce-shared
+ sdk-common
ecommerce
- common-ecommerce-channel
-
-
- ecommerce
- common-ecommerce-http
+ channel-sdk-core
com.fasterxml.jackson.core
diff --git a/testkit/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java
similarity index 100%
rename from testkit/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java
rename to sdk-testkit/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java
diff --git a/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryAccounts.java b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryAccounts.java
similarity index 100%
rename from testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryAccounts.java
rename to sdk-testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryAccounts.java
diff --git a/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryCursorStore.java b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryCursorStore.java
similarity index 51%
rename from testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryCursorStore.java
rename to sdk-testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryCursorStore.java
index 8d4fe9b..c54bcb6 100644
--- a/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryCursorStore.java
+++ b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryCursorStore.java
@@ -1,37 +1,36 @@
package common.ecommerce.shared.testkit;
-import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.spi.SyncCursorStore;
import java.time.Instant;
import java.util.HashMap;
import java.util.Map;
-/** 内存版水位线存储。 */
+/** 内存版水位线存储。provider 用字符串,渠道域与仓库域共用。 */
public final class InMemoryCursorStore implements SyncCursorStore {
private final Map cursors = new HashMap();
@Override
- public Instant get(ChannelProvider provider, String accountKey, String stream) {
+ public Instant get(String provider, String accountKey, String stream) {
return cursors.get(id(provider, accountKey, stream));
}
@Override
- public void advance(ChannelProvider provider, String accountKey, String stream, Instant watermark) {
+ public void advance(String provider, String accountKey, String stream, Instant watermark) {
cursors.put(id(provider, accountKey, stream), watermark);
}
- public void seed(ChannelProvider provider, String accountKey, String stream, Instant watermark) {
+ public void seed(String provider, String accountKey, String stream, Instant watermark) {
advance(provider, accountKey, stream, watermark);
}
/** 断言用:读取当前水位线。 */
- public Instant watermark(ChannelProvider provider, String accountKey, String stream) {
+ public Instant watermark(String provider, String accountKey, String stream) {
return get(provider, accountKey, stream);
}
- private static String id(ChannelProvider provider, String accountKey, String stream) {
- return provider.name() + '|' + accountKey + '|' + stream;
+ private static String id(String provider, String accountKey, String stream) {
+ return provider + '|' + accountKey + '|' + stream;
}
}
diff --git a/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryIdempotencyStore.java b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryIdempotencyStore.java
similarity index 96%
rename from testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryIdempotencyStore.java
rename to sdk-testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryIdempotencyStore.java
index eaa5587..ef0d239 100644
--- a/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryIdempotencyStore.java
+++ b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryIdempotencyStore.java
@@ -1,6 +1,5 @@
package common.ecommerce.shared.testkit;
-import common.ecommerce.shared.model.ChannelProvider;
import common.ecommerce.shared.spi.IdempotencyClaim;
import common.ecommerce.shared.spi.IdempotencyRecord;
import common.ecommerce.shared.spi.IdempotencyStatus;
@@ -30,7 +29,7 @@ public final class InMemoryIdempotencyStore implements IdempotencyStore {
private int claimRejected;
@Override
- public synchronized IdempotencyClaim claim(String key, String owner, ChannelProvider provider,
+ public synchronized IdempotencyClaim claim(String key, String owner, String provider,
Instant now, long ttlSeconds) {
IdempotencyRecord existing = records.get(key);
if (existing == null || isReclaimable(existing, now, ttlSeconds)) {
@@ -70,14 +69,14 @@ public final class InMemoryIdempotencyStore implements IdempotencyStore {
}
/** 测试辅助:直接写入一条已完成记录,模拟「另一个 provider 早就做过」。 */
- public synchronized InMemoryIdempotencyStore seedSucceeded(String key, ChannelProvider provider,
+ public synchronized InMemoryIdempotencyStore seedSucceeded(String key, String provider,
String resultRef, Instant at) {
records.put(key, IdempotencyRecord.of(key, IdempotencyStatus.SUCCEEDED, provider, "seed", resultRef, at));
return this;
}
/** 测试辅助:直接写入 IN_PROGRESS 记录,模拟并发执行中。 */
- public synchronized InMemoryIdempotencyStore seedInProgress(String key, ChannelProvider provider,
+ public synchronized InMemoryIdempotencyStore seedInProgress(String key, String provider,
String owner, Instant at) {
records.put(key, IdempotencyRecord.of(key, IdempotencyStatus.IN_PROGRESS, provider, owner, null, at));
return this;
diff --git a/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryLockProvider.java b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryLockProvider.java
similarity index 100%
rename from testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryLockProvider.java
rename to sdk-testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryLockProvider.java
diff --git a/testkit/src/main/java/common/ecommerce/shared/testkit/InMemorySink.java b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/InMemorySink.java
similarity index 100%
rename from testkit/src/main/java/common/ecommerce/shared/testkit/InMemorySink.java
rename to sdk-testkit/src/main/java/common/ecommerce/shared/testkit/InMemorySink.java
diff --git a/testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryTokenStore.java b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryTokenStore.java
similarity index 100%
rename from testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryTokenStore.java
rename to sdk-testkit/src/main/java/common/ecommerce/shared/testkit/InMemoryTokenStore.java
diff --git a/testkit/src/main/java/common/ecommerce/shared/testkit/JsonFixture.java b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/JsonFixture.java
similarity index 100%
rename from testkit/src/main/java/common/ecommerce/shared/testkit/JsonFixture.java
rename to sdk-testkit/src/main/java/common/ecommerce/shared/testkit/JsonFixture.java
diff --git a/testkit/src/main/java/common/ecommerce/shared/testkit/MutableClock.java b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/MutableClock.java
similarity index 100%
rename from testkit/src/main/java/common/ecommerce/shared/testkit/MutableClock.java
rename to sdk-testkit/src/main/java/common/ecommerce/shared/testkit/MutableClock.java
diff --git a/testkit/src/main/java/common/ecommerce/shared/testkit/RecordingTransport.java b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/RecordingTransport.java
similarity index 100%
rename from testkit/src/main/java/common/ecommerce/shared/testkit/RecordingTransport.java
rename to sdk-testkit/src/main/java/common/ecommerce/shared/testkit/RecordingTransport.java
diff --git a/testkit/src/main/java/common/ecommerce/shared/testkit/Responses.java b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/Responses.java
similarity index 100%
rename from testkit/src/main/java/common/ecommerce/shared/testkit/Responses.java
rename to sdk-testkit/src/main/java/common/ecommerce/shared/testkit/Responses.java
diff --git a/testkit/src/main/java/common/ecommerce/shared/testkit/TestData.java b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/TestData.java
similarity index 89%
rename from testkit/src/main/java/common/ecommerce/shared/testkit/TestData.java
rename to sdk-testkit/src/main/java/common/ecommerce/shared/testkit/TestData.java
index 4433d65..d6e4183 100644
--- a/testkit/src/main/java/common/ecommerce/shared/testkit/TestData.java
+++ b/sdk-testkit/src/main/java/common/ecommerce/shared/testkit/TestData.java
@@ -23,7 +23,7 @@ public final class TestData {
/** 已推进过的水位线,避免测试里每次走全量。 */
public static void seedWatermark(SyncCursorStore store, common.ecommerce.shared.sync.SyncSpec spec, String iso) {
- store.advance(spec.provider(), spec.accountKey(), spec.stream(), Instant.parse(iso));
+ store.advance(spec.provider().name(), spec.accountKey(), spec.stream(), Instant.parse(iso));
}
public static Page pageOf(SalesOrder... orders) {
diff --git a/testkit/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java b/sdk-testkit/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java
similarity index 98%
rename from testkit/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java
rename to sdk-testkit/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java
index 373de7e..8270e31 100644
--- a/testkit/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java
+++ b/sdk-testkit/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java
@@ -75,7 +75,7 @@ class IdempotencyGuardTest {
store.get(MARK_SHIPPED.businessKey()).get().status());
assertEquals(IdempotencyStatus.SUCCEEDED,
store.get(MARK_SHIPPED.providerKey()).get().status());
- assertEquals(ChannelProvider.LINGXING,
+ assertEquals(ChannelProvider.LINGXING.name(),
store.get(MARK_SHIPPED.businessKey()).get().provider());
assertTrue(MARK_SHIPPED.providerKey().startsWith("LINGXING:WALMART_SC:1108413237731:markShipped:"));
assertTrue(MARK_SHIPPED.businessKey().startsWith("WALMART_SC:oms-wm-001:PO-1:pkg-1:"));
@@ -97,7 +97,7 @@ class IdempotencyGuardTest {
@Test
void concurrentAttemptRejectedWhileInProgress() {
- store.seedInProgress(MARK_SHIPPED.businessKey(), ChannelProvider.LINGXING, "worker-2", T0);
+ store.seedInProgress(MARK_SHIPPED.businessKey(), ChannelProvider.LINGXING.name(), "worker-2", T0);
IdempotencyConflictException ex = assertThrows(IdempotencyConflictException.class,
() -> guard.execute(MARK_SHIPPED, () -> "SHIP-1", v -> v));
@@ -149,7 +149,7 @@ class IdempotencyGuardTest {
@Test
void staleInProgressCanBeReclaimedAfterTtl() {
- store.seedInProgress(MARK_SHIPPED.businessKey(), ChannelProvider.LINGXING, "dead-worker", T0);
+ store.seedInProgress(MARK_SHIPPED.businessKey(), ChannelProvider.LINGXING.name(), "dead-worker", T0);
clock.advance(Duration.ofSeconds(61));
WriteResult result = guard.execute(MARK_SHIPPED, () -> "SHIP-1", v -> v);
@@ -162,7 +162,7 @@ class IdempotencyGuardTest {
@Test
void providerKeyRecoversCrashWindowWithoutRewriting() {
// 模拟:平台已写入、provider 键已记成功,但业务键没来得及写
- store.seedSucceeded(MARK_SHIPPED.providerKey(), ChannelProvider.LINGXING, "SHIP-1", T0);
+ store.seedSucceeded(MARK_SHIPPED.providerKey(), ChannelProvider.LINGXING.name(), "SHIP-1", T0);
AtomicInteger calls = new AtomicInteger();
WriteResult result = guard.execute(MARK_SHIPPED, () -> {
diff --git a/testkit/src/test/java/common/ecommerce/shared/testkit/FakeDirectAdapterTest.java b/sdk-testkit/src/test/java/common/ecommerce/shared/testkit/FakeDirectAdapterTest.java
similarity index 97%
rename from testkit/src/test/java/common/ecommerce/shared/testkit/FakeDirectAdapterTest.java
rename to sdk-testkit/src/test/java/common/ecommerce/shared/testkit/FakeDirectAdapterTest.java
index 3e21cc1..bd29dfb 100644
--- a/testkit/src/test/java/common/ecommerce/shared/testkit/FakeDirectAdapterTest.java
+++ b/sdk-testkit/src/test/java/common/ecommerce/shared/testkit/FakeDirectAdapterTest.java
@@ -78,7 +78,7 @@ class FakeDirectAdapterTest {
InMemoryCursorStore cursors = new InMemoryCursorStore();
InMemorySink sink = new InMemorySink();
String stream = SyncSpec.STREAM_SALES_ORDERS;
- cursors.seed(ChannelProvider.DIRECT, "oms-test-001", stream, Instant.parse("2026-10-28T00:00:00Z"));
+ cursors.seed(ChannelProvider.DIRECT.name(), "oms-test-001", stream, Instant.parse("2026-10-28T00:00:00Z"));
SyncSpec spec = SyncSpec.of(ChannelProvider.DIRECT, "oms-test-001", stream, Duration.ofMinutes(15));
Instant to = Instant.parse("2026-10-29T00:00:00Z");
@@ -89,7 +89,7 @@ class FakeDirectAdapterTest {
assertEquals(3, result.pages());
assertEquals(5, result.items());
assertTrue(result.watermarkAdvanced());
- assertEquals(to, cursors.watermark(ChannelProvider.DIRECT, "oms-test-001", stream));
+ assertEquals(to, cursors.watermark(ChannelProvider.DIRECT.name(), "oms-test-001", stream));
assertEquals(3, sink.salesOrderUpsertCalls());
assertEquals(5, sink.salesOrders().size());
// 起点回退了重叠窗口
diff --git a/testkit/src/test/java/common/ecommerce/shared/testkit/SdkFacadeCallTest.java b/sdk-testkit/src/test/java/common/ecommerce/shared/testkit/SdkFacadeCallTest.java
similarity index 100%
rename from testkit/src/test/java/common/ecommerce/shared/testkit/SdkFacadeCallTest.java
rename to sdk-testkit/src/test/java/common/ecommerce/shared/testkit/SdkFacadeCallTest.java