From 96f6621bbd84e8be5db2ee9885a5872686dcca4c Mon Sep 17 00:00:00 2001 From: chenchuchuan <13554600537@163.com> Date: Mon, 9 Nov 2026 15:22:43 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=8C=89=20Spec=20W0=20=E6=8B=86?= =?UTF-8?q?=E5=88=86=20sdk-common=20/=20channel-sdk-core=EF=BC=8Chttp=20?= =?UTF-8?q?=E5=B9=B6=E5=85=A5=20sdk-common?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 模块更名与上提(Spec W0 §11): - shared → sdk-common,http 合并进来,channel-sdk-http 取消 - channel → channel-sdk-core,testkit → sdk-testkit - 父 POM 更名为 channel-sdk-parent 共享层为跨域复用做的三处调整: - IdempotencyStore / IdempotencyRecord 的 provider 改为 String, 渠道域与仓库域两套 provider 枚举落同一张幂等表 - 新增 WriteIdentity,WriteScope 实现它;幂等守卫改为面向接口 - CallSupport 从 channel 移到 sdk-common,新增 CallScope; ChannelContext 实现 CallScope,耗时与埋点维度不再绑定渠道域 ChannelProvider 里误加的 YUNQUNA 移除:仓不是渠道,走 WarehouseProvider。 Co-Authored-By: Claude --- {channel => channel-sdk-core}/pom.xml | 6 +- .../capability/AdapterCapabilityReport.java | 0 .../channel/capability/AfterSaleCapable.java | 0 .../ecommerce/channel/capability/AfterSales.java | 2 +- .../channel/capability/AggregatorCapable.java | 0 .../channel/capability/CapabilityReport.java | 0 .../channel/capability/InboundReceiptCapable.java | 0 .../channel/capability/InboundShipmentCapable.java | 0 .../ecommerce/channel/capability/Inbounds.java | 2 +- .../channel/capability/OrderEditCapable.java | 0 .../channel/capability/OutboundCapable.java | 0 .../channel/capability/OutboundOrderCapable.java | 0 .../ecommerce/channel/capability/Outbounds.java | 2 +- .../channel/capability/PlatformAdapter.java | 0 .../channel/capability/ProductCapable.java | 0 .../ecommerce/channel/capability/Products.java | 2 +- .../channel/capability/SalesOrderCapable.java | 0 .../ecommerce/channel/capability/SalesOrders.java | 2 +- .../channel/capability/SettlementCapable.java | 0 .../ecommerce/channel/capability/Settlements.java | 2 +- .../channel/capability/ShipmentReviewCapable.java | 0 .../channel/capability/ShippingLabelCapable.java | 0 .../channel/model/account/AccountKey.java | 0 .../channel/model/account/ChannelAccount.java | 0 .../channel/model/aftersale/AfterSale.java | 0 .../channel/model/aftersale/AfterSaleQuery.java | 0 .../channel/model/aftersale/AfterSaleType.java | 0 .../channel/model/fulfillment/DeclaredItem.java | 0 .../channel/model/fulfillment/LabelQuery.java | 0 .../model/fulfillment/OrderEditRequest.java | 0 .../channel/model/fulfillment/OrderEditResult.java | 0 .../channel/model/fulfillment/OutboundOrder.java | 0 .../model/fulfillment/OutboundOrderLine.java | 0 .../model/fulfillment/OutboundOrderQuery.java | 0 .../channel/model/fulfillment/OutboundPackage.java | 0 .../channel/model/fulfillment/OutboundResult.java | 0 .../model/fulfillment/ShipmentReviewResult.java | 0 .../channel/model/fulfillment/ShippingLabel.java | 0 .../channel/model/inbound/InboundReceipt.java | 0 .../channel/model/inbound/InboundReceiptQuery.java | 0 .../channel/model/inbound/InboundShipment.java | 0 .../channel/model/inbound/InboundShipmentLine.java | 0 .../model/inbound/InboundShipmentQuery.java | 0 .../model/inbound/InboundShipmentTimeType.java | 0 .../channel/model/inbound/InboundShippingRef.java | 0 .../ecommerce/channel/model/order/OrderLine.java | 0 .../ecommerce/channel/model/order/SalesOrder.java | 0 .../channel/model/order/SalesOrderQuery.java | 0 .../channel/model/order/SalesOrderRef.java | 0 .../channel/model/product/ProductListing.java | 0 .../channel/model/product/ProductQuery.java | 0 .../channel/model/product/ProductRef.java | 0 .../channel/model/product/ProductSearchField.java | 0 .../channel/model/product/ProductStatus.java | 0 .../channel/model/product/ProductSyncStrategy.java | 0 .../channel/model/settlement/SettlementQuery.java | 0 .../model/settlement/SettlementTransaction.java | 0 .../ecommerce/channel/sdk/AdapterFactory.java | 0 .../ecommerce/channel/sdk/ChannelConnection.java | 0 .../ecommerce/channel/sdk/ChannelContext.java | 24 ++++- .../common/ecommerce/channel/sdk/ChannelSdk.java | 1 + .../ecommerce/channel/sdk/ProviderResolver.java | 0 .../channel/spi/ChannelAccountRepository.java | 0 .../java/common/ecommerce/channel/spi/Sink.java | 0 .../common/ecommerce/channel/sync/SyncEngine.java | 4 +- .../capability/PartialFailureAuditTest.java | 0 .../ecommerce/channel/sdk/CallObserverTest.java | 2 +- .../ecommerce/channel/sdk/ChannelSdkTest.java | 2 +- .../channel/sdk/RequestIdAndCoverageTest.java | 2 +- http/pom.xml | 48 ---------- lingxing/pom.xml | 12 +-- .../lingxing/adapter/LingxingCallObserverTest.java | 2 +- pom.xml | 30 ++++-- {shared => sdk-common}/pom.xml | 12 ++- .../java/common/ecommerce/http/HttpRequest.java | 0 .../java/common/ecommerce/http/HttpResponse.java | 0 .../java/common/ecommerce/http/HttpTransport.java | 0 .../common/ecommerce/http/JacksonJsonCodec.java | 0 .../main/java/common/ecommerce/http/JsonCodec.java | 0 .../common/ecommerce/http/OkHttpTransport.java | 0 .../main/java/common/ecommerce/http/Responses.java | 0 .../java/common/ecommerce/http/TokenManager.java | 0 .../ecommerce/shared/audit/CallObserver.java | 0 .../common/ecommerce/shared/audit/CallOutcome.java | 0 .../common/ecommerce/shared/audit/CallRecord.java | 21 +++-- .../common/ecommerce/shared/audit/CallScope.java | 29 ++++++ .../ecommerce/shared/audit}/CallSupport.java | 103 +++++++++------------ .../ecommerce/shared/audit/Slf4jCallObserver.java | 0 .../ecommerce/shared/error/AuthException.java | 0 .../ecommerce/shared/error/ChannelException.java | 0 .../error/CrossProviderConflictException.java | 0 .../shared/error/IdempotencyConflictException.java | 0 .../shared/error/PlatformBusinessException.java | 0 .../ecommerce/shared/error/RateLimitException.java | 0 .../ecommerce/shared/error/TransientException.java | 0 .../shared/error/ValidationException.java | 0 .../shared/idempotency/IdempotencyGuard.java | 47 ++++++---- .../ecommerce/shared/idempotency/WriteAudit.java | 25 +++-- .../shared/idempotency/WriteIdentity.java | 36 +++++++ .../ecommerce/shared/idempotency/WriteResult.java | 0 .../ecommerce/shared/idempotency/WriteScope.java | 18 +++- .../common/ecommerce/shared/model/Capability.java | 0 .../ecommerce/shared/model/ChannelProvider.java | 0 .../ecommerce/shared/model/FulfillmentMode.java | 0 .../common/ecommerce/shared/model/Platform.java | 0 .../common/ecommerce/shared/spi/AccessToken.java | 0 .../common/ecommerce/shared/spi/ChannelSecret.java | 0 .../ecommerce/shared/spi/IdempotencyClaim.java | 0 .../ecommerce/shared/spi/IdempotencyRecord.java | 14 ++- .../ecommerce/shared/spi/IdempotencyStatus.java | 0 .../ecommerce/shared/spi/IdempotencyStore.java | 9 +- .../common/ecommerce/shared/spi/LockProvider.java | 0 .../ecommerce/shared/spi/SecretProvider.java | 0 .../ecommerce/shared/spi/SyncCursorStore.java | 11 ++- .../common/ecommerce/shared/spi/TokenStore.java | 0 .../ecommerce/shared/support/CanonicalKeys.java | 0 .../common/ecommerce/shared/support/Money.java | 0 .../java/common/ecommerce/shared/support/Page.java | 0 .../ecommerce/shared/support/PlatformTime.java | 0 .../common/ecommerce/shared/sync/SyncResult.java | 0 .../common/ecommerce/shared/sync/SyncSpec.java | 0 .../java/common/ecommerce/http/ResponsesTest.java | 0 .../common/ecommerce/http/TokenManagerTest.java | 0 .../shared/audit/Slf4jCallObserverTest.java | 0 .../shared/idempotency/WriteAuditTest.java | 14 +-- .../shared/support/CanonicalKeysTest.java | 0 {testkit => sdk-testkit}/pom.xml | 12 +-- .../shared/testkit/FakeDirectAdapter.java | 0 .../ecommerce/shared/testkit/InMemoryAccounts.java | 0 .../shared/testkit/InMemoryCursorStore.java | 15 ++- .../shared/testkit/InMemoryIdempotencyStore.java | 7 +- .../shared/testkit/InMemoryLockProvider.java | 0 .../ecommerce/shared/testkit/InMemorySink.java | 0 .../shared/testkit/InMemoryTokenStore.java | 0 .../ecommerce/shared/testkit/JsonFixture.java | 0 .../ecommerce/shared/testkit/MutableClock.java | 0 .../shared/testkit/RecordingTransport.java | 0 .../common/ecommerce/shared/testkit/Responses.java | 0 .../common/ecommerce/shared/testkit/TestData.java | 2 +- .../shared/idempotency/IdempotencyGuardTest.java | 8 +- .../shared/testkit/FakeDirectAdapterTest.java | 4 +- .../shared/testkit/SdkFacadeCallTest.java | 0 142 files changed, 309 insertions(+), 223 deletions(-) rename {channel => channel-sdk-core}/pom.xml (85%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/AfterSales.java (98%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/Inbounds.java (98%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/OutboundCapable.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/Outbounds.java (99%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/ProductCapable.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/Products.java (98%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/SalesOrders.java (99%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/Settlements.java (98%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/ShipmentReviewCapable.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/capability/ShippingLabelCapable.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/account/AccountKey.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/account/ChannelAccount.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/aftersale/AfterSale.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleQuery.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleType.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/fulfillment/DeclaredItem.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/fulfillment/LabelQuery.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditRequest.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditResult.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrder.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderLine.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderQuery.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundPackage.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundResult.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/fulfillment/ShipmentReviewResult.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/fulfillment/ShippingLabel.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/inbound/InboundReceipt.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/inbound/InboundReceiptQuery.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/inbound/InboundShipment.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentLine.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentQuery.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentTimeType.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/inbound/InboundShippingRef.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/order/OrderLine.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/order/SalesOrder.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/order/SalesOrderQuery.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/order/SalesOrderRef.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/product/ProductListing.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/product/ProductQuery.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/product/ProductRef.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/product/ProductSearchField.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/product/ProductStatus.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/product/ProductSyncStrategy.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/settlement/SettlementQuery.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/model/settlement/SettlementTransaction.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/sdk/AdapterFactory.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/sdk/ChannelConnection.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java (89%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java (99%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/sdk/ProviderResolver.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/spi/ChannelAccountRepository.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/spi/Sink.java (100%) rename {channel => channel-sdk-core}/src/main/java/common/ecommerce/channel/sync/SyncEngine.java (94%) rename {channel => channel-sdk-core}/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java (100%) rename {channel => channel-sdk-core}/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java (98%) rename {channel => channel-sdk-core}/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java (99%) rename {channel => channel-sdk-core}/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java (99%) delete mode 100644 http/pom.xml rename {shared => sdk-common}/pom.xml (71%) rename {http => sdk-common}/src/main/java/common/ecommerce/http/HttpRequest.java (100%) rename {http => sdk-common}/src/main/java/common/ecommerce/http/HttpResponse.java (100%) rename {http => sdk-common}/src/main/java/common/ecommerce/http/HttpTransport.java (100%) rename {http => sdk-common}/src/main/java/common/ecommerce/http/JacksonJsonCodec.java (100%) rename {http => sdk-common}/src/main/java/common/ecommerce/http/JsonCodec.java (100%) rename {http => sdk-common}/src/main/java/common/ecommerce/http/OkHttpTransport.java (100%) rename {http => sdk-common}/src/main/java/common/ecommerce/http/Responses.java (100%) rename {http => sdk-common}/src/main/java/common/ecommerce/http/TokenManager.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/audit/CallObserver.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/audit/CallOutcome.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/audit/CallRecord.java (95%) create mode 100644 sdk-common/src/main/java/common/ecommerce/shared/audit/CallScope.java rename {channel/src/main/java/common/ecommerce/channel/sdk => sdk-common/src/main/java/common/ecommerce/shared/audit}/CallSupport.java (71%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/error/AuthException.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/error/ChannelException.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/error/RateLimitException.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/error/TransientException.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/error/ValidationException.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java (88%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/idempotency/WriteAudit.java (87%) create mode 100644 sdk-common/src/main/java/common/ecommerce/shared/idempotency/WriteIdentity.java rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/idempotency/WriteResult.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/idempotency/WriteScope.java (91%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/model/Capability.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/model/ChannelProvider.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/model/FulfillmentMode.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/model/Platform.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/spi/AccessToken.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/spi/ChannelSecret.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/spi/IdempotencyClaim.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/spi/IdempotencyRecord.java (87%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/spi/IdempotencyStatus.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/spi/IdempotencyStore.java (81%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/spi/LockProvider.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/spi/SecretProvider.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/spi/SyncCursorStore.java (64%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/spi/TokenStore.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/support/CanonicalKeys.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/support/Money.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/support/Page.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/support/PlatformTime.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/sync/SyncResult.java (100%) rename {shared => sdk-common}/src/main/java/common/ecommerce/shared/sync/SyncSpec.java (100%) rename {http => sdk-common}/src/test/java/common/ecommerce/http/ResponsesTest.java (100%) rename {http => sdk-common}/src/test/java/common/ecommerce/http/TokenManagerTest.java (100%) rename {shared => sdk-common}/src/test/java/common/ecommerce/shared/audit/Slf4jCallObserverTest.java (100%) rename {shared => sdk-common}/src/test/java/common/ecommerce/shared/idempotency/WriteAuditTest.java (97%) rename {shared => sdk-common}/src/test/java/common/ecommerce/shared/support/CanonicalKeysTest.java (100%) rename {testkit => sdk-testkit}/pom.xml (74%) rename {testkit => sdk-testkit}/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java (100%) rename {testkit => sdk-testkit}/src/main/java/common/ecommerce/shared/testkit/InMemoryAccounts.java (100%) rename {testkit => sdk-testkit}/src/main/java/common/ecommerce/shared/testkit/InMemoryCursorStore.java (51%) rename {testkit => sdk-testkit}/src/main/java/common/ecommerce/shared/testkit/InMemoryIdempotencyStore.java (96%) rename {testkit => sdk-testkit}/src/main/java/common/ecommerce/shared/testkit/InMemoryLockProvider.java (100%) rename {testkit => sdk-testkit}/src/main/java/common/ecommerce/shared/testkit/InMemorySink.java (100%) rename {testkit => sdk-testkit}/src/main/java/common/ecommerce/shared/testkit/InMemoryTokenStore.java (100%) rename {testkit => sdk-testkit}/src/main/java/common/ecommerce/shared/testkit/JsonFixture.java (100%) rename {testkit => sdk-testkit}/src/main/java/common/ecommerce/shared/testkit/MutableClock.java (100%) rename {testkit => sdk-testkit}/src/main/java/common/ecommerce/shared/testkit/RecordingTransport.java (100%) rename {testkit => sdk-testkit}/src/main/java/common/ecommerce/shared/testkit/Responses.java (100%) rename {testkit => sdk-testkit}/src/main/java/common/ecommerce/shared/testkit/TestData.java (89%) rename {testkit => sdk-testkit}/src/test/java/common/ecommerce/shared/idempotency/IdempotencyGuardTest.java (98%) rename {testkit => sdk-testkit}/src/test/java/common/ecommerce/shared/testkit/FakeDirectAdapterTest.java (97%) rename {testkit => sdk-testkit}/src/test/java/common/ecommerce/shared/testkit/SdkFacadeCallTest.java (100%) diff --git a/channel/pom.xml b/channel-sdk-core/pom.xml similarity index 85% rename from channel/pom.xml rename to channel-sdk-core/pom.xml index 51a861e..a5ed103 100644 --- a/channel/pom.xml +++ b/channel-sdk-core/pom.xml @@ -6,17 +6,17 @@ ecommerce - common-ecommerce + channel-sdk-parent 1.0.0-SNAPSHOT - common-ecommerce-channel + channel-sdk-core 渠道域:领域模型、能力接口、门面、同步管道(无平台代码) ecommerce - common-ecommerce-shared + sdk-common org.slf4j diff --git a/channel/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AdapterCapabilityReport.java diff --git a/channel/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AfterSaleCapable.java diff --git a/channel/src/main/java/common/ecommerce/channel/capability/AfterSales.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AfterSales.java similarity index 98% rename from channel/src/main/java/common/ecommerce/channel/capability/AfterSales.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AfterSales.java index 28be3d6..6a1a634 100644 --- a/channel/src/main/java/common/ecommerce/channel/capability/AfterSales.java +++ b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AfterSales.java @@ -7,7 +7,7 @@ import common.ecommerce.channel.model.account.ChannelAccount; import common.ecommerce.channel.model.aftersale.AfterSale; import common.ecommerce.channel.model.aftersale.AfterSaleQuery; import common.ecommerce.shared.support.Page; -import common.ecommerce.channel.sdk.CallSupport; +import common.ecommerce.shared.audit.CallSupport; import common.ecommerce.channel.sdk.ChannelContext; /** diff --git a/channel/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/AggregatorCapable.java diff --git a/channel/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/CapabilityReport.java diff --git a/channel/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java diff --git a/channel/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java diff --git a/channel/src/main/java/common/ecommerce/channel/capability/Inbounds.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Inbounds.java similarity index 98% rename from channel/src/main/java/common/ecommerce/channel/capability/Inbounds.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Inbounds.java index ea80273..956c882 100644 --- a/channel/src/main/java/common/ecommerce/channel/capability/Inbounds.java +++ b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Inbounds.java @@ -5,7 +5,7 @@ import common.ecommerce.channel.model.inbound.InboundReceipt; import common.ecommerce.channel.model.inbound.InboundReceiptQuery; import common.ecommerce.channel.model.inbound.InboundShipment; import common.ecommerce.channel.model.inbound.InboundShipmentQuery; -import common.ecommerce.channel.sdk.CallSupport; +import common.ecommerce.shared.audit.CallSupport; import common.ecommerce.channel.sdk.ChannelContext; import common.ecommerce.shared.audit.CallObserver; import common.ecommerce.shared.error.ChannelException; diff --git a/channel/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/OrderEditCapable.java diff --git a/channel/src/main/java/common/ecommerce/channel/capability/OutboundCapable.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/OutboundCapable.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/OutboundCapable.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/OutboundCapable.java diff --git a/channel/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/OutboundOrderCapable.java diff --git a/channel/src/main/java/common/ecommerce/channel/capability/Outbounds.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Outbounds.java similarity index 99% rename from channel/src/main/java/common/ecommerce/channel/capability/Outbounds.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Outbounds.java index 52973aa..1534ea9 100644 --- a/channel/src/main/java/common/ecommerce/channel/capability/Outbounds.java +++ b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Outbounds.java @@ -13,7 +13,7 @@ import common.ecommerce.channel.model.fulfillment.OutboundResult; import common.ecommerce.channel.model.fulfillment.ShipmentReviewResult; import common.ecommerce.channel.model.fulfillment.ShippingLabel; import common.ecommerce.shared.support.Page; -import common.ecommerce.channel.sdk.CallSupport; +import common.ecommerce.shared.audit.CallSupport; import common.ecommerce.channel.sdk.ChannelContext; import java.util.List; diff --git a/channel/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/PlatformAdapter.java diff --git a/channel/src/main/java/common/ecommerce/channel/capability/ProductCapable.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/ProductCapable.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/ProductCapable.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/ProductCapable.java diff --git a/channel/src/main/java/common/ecommerce/channel/capability/Products.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Products.java similarity index 98% rename from channel/src/main/java/common/ecommerce/channel/capability/Products.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Products.java index 053f322..5d6c222 100644 --- a/channel/src/main/java/common/ecommerce/channel/capability/Products.java +++ b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Products.java @@ -8,7 +8,7 @@ import common.ecommerce.shared.support.Page; import common.ecommerce.channel.model.product.ProductListing; import common.ecommerce.channel.model.product.ProductQuery; import common.ecommerce.channel.model.product.ProductRef; -import common.ecommerce.channel.sdk.CallSupport; +import common.ecommerce.shared.audit.CallSupport; import common.ecommerce.channel.sdk.ChannelContext; /** 门面持有的商品视图。 */ diff --git a/channel/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/SalesOrderCapable.java diff --git a/channel/src/main/java/common/ecommerce/channel/capability/SalesOrders.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/SalesOrders.java similarity index 99% rename from channel/src/main/java/common/ecommerce/channel/capability/SalesOrders.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/SalesOrders.java index ff0d5fb..e770aca 100644 --- a/channel/src/main/java/common/ecommerce/channel/capability/SalesOrders.java +++ b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/SalesOrders.java @@ -11,7 +11,7 @@ import common.ecommerce.channel.model.order.SalesOrder; import common.ecommerce.channel.model.order.SalesOrderQuery; import common.ecommerce.channel.model.order.SalesOrderRef; import common.ecommerce.shared.support.Page; -import common.ecommerce.channel.sdk.CallSupport; +import common.ecommerce.shared.audit.CallSupport; import common.ecommerce.channel.sdk.ChannelContext; import java.util.List; diff --git a/channel/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/SettlementCapable.java diff --git a/channel/src/main/java/common/ecommerce/channel/capability/Settlements.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Settlements.java similarity index 98% rename from channel/src/main/java/common/ecommerce/channel/capability/Settlements.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Settlements.java index f6e6592..f74206a 100644 --- a/channel/src/main/java/common/ecommerce/channel/capability/Settlements.java +++ b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/Settlements.java @@ -7,7 +7,7 @@ import common.ecommerce.channel.model.account.ChannelAccount; import common.ecommerce.channel.model.settlement.SettlementQuery; import common.ecommerce.channel.model.settlement.SettlementTransaction; import common.ecommerce.shared.support.Page; -import common.ecommerce.channel.sdk.CallSupport; +import common.ecommerce.shared.audit.CallSupport; import common.ecommerce.channel.sdk.ChannelContext; /** diff --git a/channel/src/main/java/common/ecommerce/channel/capability/ShipmentReviewCapable.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/ShipmentReviewCapable.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/ShipmentReviewCapable.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/ShipmentReviewCapable.java diff --git a/channel/src/main/java/common/ecommerce/channel/capability/ShippingLabelCapable.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/capability/ShippingLabelCapable.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/capability/ShippingLabelCapable.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/capability/ShippingLabelCapable.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/account/AccountKey.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/account/AccountKey.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/account/AccountKey.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/account/AccountKey.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/account/ChannelAccount.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/account/ChannelAccount.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/account/ChannelAccount.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/account/ChannelAccount.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSale.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/aftersale/AfterSale.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSale.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/aftersale/AfterSale.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleQuery.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleQuery.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleQuery.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleQuery.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleType.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleType.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleType.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/aftersale/AfterSaleType.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/fulfillment/DeclaredItem.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/DeclaredItem.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/fulfillment/DeclaredItem.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/DeclaredItem.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/fulfillment/LabelQuery.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/LabelQuery.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/fulfillment/LabelQuery.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/LabelQuery.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditRequest.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditRequest.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditRequest.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditRequest.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditResult.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditResult.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditResult.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OrderEditResult.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrder.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrder.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrder.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrder.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderLine.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderLine.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderLine.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderLine.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderQuery.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderQuery.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderQuery.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundOrderQuery.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundPackage.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundPackage.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundPackage.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundPackage.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundResult.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundResult.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundResult.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/OutboundResult.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShipmentReviewResult.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/ShipmentReviewResult.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShipmentReviewResult.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/ShipmentReviewResult.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShippingLabel.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/ShippingLabel.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/fulfillment/ShippingLabel.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/fulfillment/ShippingLabel.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundReceipt.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundReceipt.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/inbound/InboundReceipt.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundReceipt.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundReceiptQuery.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundReceiptQuery.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/inbound/InboundReceiptQuery.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundReceiptQuery.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipment.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipment.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipment.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipment.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentLine.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentLine.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentLine.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentLine.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentQuery.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentQuery.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentQuery.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentQuery.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentTimeType.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentTimeType.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentTimeType.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentTimeType.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShippingRef.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShippingRef.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShippingRef.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/inbound/InboundShippingRef.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/order/OrderLine.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/OrderLine.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/order/OrderLine.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/OrderLine.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/order/SalesOrder.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/SalesOrder.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/order/SalesOrder.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/SalesOrder.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderQuery.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/SalesOrderQuery.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderQuery.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/SalesOrderQuery.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderRef.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/SalesOrderRef.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/order/SalesOrderRef.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/order/SalesOrderRef.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/product/ProductListing.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductListing.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/product/ProductListing.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductListing.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/product/ProductQuery.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductQuery.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/product/ProductQuery.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductQuery.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/product/ProductRef.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductRef.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/product/ProductRef.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductRef.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/product/ProductSearchField.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductSearchField.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/product/ProductSearchField.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductSearchField.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/product/ProductStatus.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductStatus.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/product/ProductStatus.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductStatus.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/product/ProductSyncStrategy.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductSyncStrategy.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/product/ProductSyncStrategy.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/product/ProductSyncStrategy.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementQuery.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/settlement/SettlementQuery.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementQuery.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/settlement/SettlementQuery.java diff --git a/channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementTransaction.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/model/settlement/SettlementTransaction.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/model/settlement/SettlementTransaction.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/model/settlement/SettlementTransaction.java diff --git a/channel/src/main/java/common/ecommerce/channel/sdk/AdapterFactory.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/AdapterFactory.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/sdk/AdapterFactory.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/AdapterFactory.java diff --git a/channel/src/main/java/common/ecommerce/channel/sdk/ChannelConnection.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/ChannelConnection.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/sdk/ChannelConnection.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/ChannelConnection.java diff --git a/channel/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java similarity index 89% rename from channel/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java index c18325f..6339337 100644 --- a/channel/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java +++ b/channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/ChannelContext.java @@ -3,6 +3,7 @@ package common.ecommerce.channel.sdk; import common.ecommerce.channel.model.account.AccountKey; import common.ecommerce.channel.model.account.ChannelAccount; import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.audit.CallScope; import common.ecommerce.shared.model.Platform; import common.ecommerce.shared.spi.ChannelSecret; @@ -14,7 +15,7 @@ import java.util.Objects; * *

连接信息(端点、凭据)由调用方在每次请求时传入,见 {@link ChannelConnection}。

*/ -public final class ChannelContext { +public final class ChannelContext implements CallScope { /** 账户标识;构造时若未显式传入则取自账户。 */ private final AccountKey key; @@ -95,6 +96,7 @@ public final class ChannelContext { } /** OMS 店铺 ID(业务归属),即使账户没查到也有值。 */ + @Override public String omsStoreId() { return key.omsStoreId(); } @@ -131,11 +133,31 @@ public final class ChannelContext { } /** 链路 ID,用于日志与原始报文关联;每次门面调用一个,可用 {@link #withRequestId(String)} 替换。 */ + @Override public String requestId() { return requestId; } + /** 接入通道名,实现 {@link CallScope}。 */ + @Override + public String providerName() { + return key.provider().name(); + } + + /** 业务平台名,实现 {@link CallScope}。 */ + @Override + public String platformName() { + return key.platform().name(); + } + + /** 渠道侧店铺 ID;无账户时为 null。 */ + @Override + public String externalStoreId() { + return account == null ? null : account.externalStoreId(); + } + /** UTC 时钟;测试可注入固定时间。 */ + @Override public Clock clock() { return clock; } diff --git a/channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java similarity index 99% rename from channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java index 20bffb9..9e0b5cf 100644 --- a/channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java +++ b/channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java @@ -2,6 +2,7 @@ package common.ecommerce.channel.sdk; import common.ecommerce.shared.model.Platform; import common.ecommerce.shared.audit.CallObserver; +import common.ecommerce.shared.audit.CallSupport; import common.ecommerce.shared.audit.Slf4jCallObserver; import common.ecommerce.channel.capability.AdapterCapabilityReport; import common.ecommerce.channel.capability.AfterSales; diff --git a/channel/src/main/java/common/ecommerce/channel/sdk/ProviderResolver.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/ProviderResolver.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/sdk/ProviderResolver.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/sdk/ProviderResolver.java diff --git a/channel/src/main/java/common/ecommerce/channel/spi/ChannelAccountRepository.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/spi/ChannelAccountRepository.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/spi/ChannelAccountRepository.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/spi/ChannelAccountRepository.java diff --git a/channel/src/main/java/common/ecommerce/channel/spi/Sink.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/spi/Sink.java similarity index 100% rename from channel/src/main/java/common/ecommerce/channel/spi/Sink.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/spi/Sink.java diff --git a/channel/src/main/java/common/ecommerce/channel/sync/SyncEngine.java b/channel-sdk-core/src/main/java/common/ecommerce/channel/sync/SyncEngine.java similarity index 94% rename from channel/src/main/java/common/ecommerce/channel/sync/SyncEngine.java rename to channel-sdk-core/src/main/java/common/ecommerce/channel/sync/SyncEngine.java index 64114a9..168646f 100644 --- a/channel/src/main/java/common/ecommerce/channel/sync/SyncEngine.java +++ b/channel-sdk-core/src/main/java/common/ecommerce/channel/sync/SyncEngine.java @@ -60,7 +60,7 @@ public final class SyncEngine { */ public SyncResult syncSalesOrders(SyncSpec spec, Instant to, BiFunction> fetch) { - Instant watermark = cursorStore.get(spec.provider(), spec.accountKey(), spec.stream()); + Instant watermark = cursorStore.get(spec.provider().name(), spec.accountKey(), spec.stream()); Instant from = spec.from(watermark); if (from == null) { throw new IllegalStateException("no watermark for " + spec.accountKey() @@ -85,7 +85,7 @@ public final class SyncEngine { } } - cursorStore.advance(spec.provider(), spec.accountKey(), spec.stream(), to); + cursorStore.advance(spec.provider().name(), spec.accountKey(), spec.stream(), to); LOG.debug("sync {} pages={} items={} from={} to={}", spec.stream(), pages, items, from, to); return SyncResult.of(pages, items, true); } diff --git a/channel/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java b/channel-sdk-core/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java similarity index 100% rename from channel/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java rename to channel-sdk-core/src/test/java/common/ecommerce/channel/capability/PartialFailureAuditTest.java diff --git a/channel/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java b/channel-sdk-core/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java similarity index 98% rename from channel/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java rename to channel-sdk-core/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java index 4760f85..2866505 100644 --- a/channel/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java +++ b/channel-sdk-core/src/test/java/common/ecommerce/channel/sdk/CallObserverTest.java @@ -90,7 +90,7 @@ class CallObserverTest { CallRecord record = observer.records.get(0); assertEquals("salesOrders.pull", record.operation()); assertEquals(CallOutcome.SUCCESS, record.outcome()); - assertEquals(ChannelProvider.DIRECT, record.provider()); + assertEquals(ChannelProvider.DIRECT.name(), record.provider()); assertEquals(Platform.WALMART_SC, record.platform()); assertEquals("oms-wm-001", record.omsStoreId()); assertEquals("wm-seller-01", record.externalStoreId()); diff --git a/channel/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java b/channel-sdk-core/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java similarity index 99% rename from channel/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java rename to channel-sdk-core/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java index 6f18381..2c5a4a2 100644 --- a/channel/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java +++ b/channel-sdk-core/src/test/java/common/ecommerce/channel/sdk/ChannelSdkTest.java @@ -204,7 +204,7 @@ class ChannelSdkTest { @Override public common.ecommerce.shared.spi.IdempotencyClaim claim(String key, String owner, - ChannelProvider provider, java.time.Instant now, long ttlSeconds) { + String provider, java.time.Instant now, long ttlSeconds) { common.ecommerce.shared.spi.IdempotencyRecord existing = records.get(key); if (existing != null && existing.status() == common.ecommerce.shared.spi.IdempotencyStatus.SUCCEEDED) { return common.ecommerce.shared.spi.IdempotencyClaim.of( diff --git a/channel/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java b/channel-sdk-core/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java similarity index 99% rename from channel/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java rename to channel-sdk-core/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java index 9b63680..3330190 100644 --- a/channel/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java +++ b/channel-sdk-core/src/test/java/common/ecommerce/channel/sdk/RequestIdAndCoverageTest.java @@ -180,7 +180,7 @@ class RequestIdAndCoverageTest { CallRecord record = observer.records.get(0); assertEquals("capabilities", record.operation()); assertEquals(CallOutcome.SUCCESS, record.outcome()); - assertEquals(ChannelProvider.DIRECT, record.provider()); + assertEquals(ChannelProvider.DIRECT.name(), record.provider()); assertEquals(Platform.WALMART_SC, record.platform()); assertEquals("oms-wm-001", record.omsStoreId()); assertEquals("wm-seller-01", record.externalStoreId()); diff --git a/http/pom.xml b/http/pom.xml deleted file mode 100644 index 16eb6a0..0000000 --- a/http/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - - ecommerce - common-ecommerce - 1.0.0-SNAPSHOT - - - common-ecommerce-http - HTTP 传输、签名、令牌管理、JSON 编解码 - - - - ecommerce - common-ecommerce-shared - - - com.squareup.okhttp3 - okhttp - - - com.fasterxml.jackson.core - jackson-databind - - - org.slf4j - slf4j-api - - - org.junit.jupiter - junit-jupiter - test - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - diff --git a/lingxing/pom.xml b/lingxing/pom.xml index 7a4d298..7e5bd76 100644 --- a/lingxing/pom.xml +++ b/lingxing/pom.xml @@ -6,7 +6,7 @@ ecommerce - common-ecommerce + channel-sdk-parent 1.0.0-SNAPSHOT @@ -16,15 +16,11 @@ ecommerce - common-ecommerce-shared + sdk-common ecommerce - common-ecommerce-channel - - - ecommerce - common-ecommerce-http + channel-sdk-core com.fasterxml.jackson.core @@ -42,7 +38,7 @@ ecommerce - common-ecommerce-testkit + sdk-testkit test diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java index 3f2e434..f554a40 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingCallObserverTest.java @@ -127,7 +127,7 @@ class LingxingCallObserverTest { CallRecord record = observer.records.get(0); assertEquals("salesOrders.pull", record.operation()); assertEquals(CallOutcome.SUCCESS, record.outcome()); - assertEquals(ChannelProvider.LINGXING, record.provider()); + assertEquals(ChannelProvider.LINGXING.name(), record.provider()); assertEquals(Platform.WALMART_SC, record.platform()); assertEquals(account.omsStoreId(), record.omsStoreId()); assertEquals("store-1", record.externalStoreId()); diff --git a/pom.xml b/pom.xml index 7386c9d..0bffe58 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ecommerce - common-ecommerce + channel-sdk-parent 1.0.0-SNAPSHOT pom common-ecommerce @@ -26,33 +26,45 @@ - shared - channel - http - testkit + sdk-common + channel-sdk-core + sdk-testkit lingxing + warehouse-sdk-core + warehouse-sdk-testkit + warehouse-sdk-yqn ecommerce - common-ecommerce-shared + sdk-common ${project.version} ecommerce - common-ecommerce-channel + channel-sdk-core ${project.version} ecommerce - common-ecommerce-http + sdk-testkit ${project.version} ecommerce - common-ecommerce-testkit + warehouse-sdk-core + ${project.version} + + + ecommerce + warehouse-sdk-testkit + ${project.version} + + + ecommerce + warehouse-sdk-yqn ${project.version} diff --git a/shared/pom.xml b/sdk-common/pom.xml similarity index 71% rename from shared/pom.xml rename to sdk-common/pom.xml index d2d6bc8..c417160 100644 --- a/shared/pom.xml +++ b/sdk-common/pom.xml @@ -6,11 +6,11 @@ ecommerce - common-ecommerce + channel-sdk-parent 1.0.0-SNAPSHOT - common-ecommerce-shared + sdk-common 跨域共享层:异常体系、SPI 契约、幂等、审计、水位线、通用值对象。 不依赖任何领域模块,供渠道域(core)与仓库域复用。 @@ -18,6 +18,14 @@ + com.squareup.okhttp3 + okhttp + + + com.fasterxml.jackson.core + jackson-databind + + org.slf4j slf4j-api diff --git a/http/src/main/java/common/ecommerce/http/HttpRequest.java b/sdk-common/src/main/java/common/ecommerce/http/HttpRequest.java similarity index 100% rename from http/src/main/java/common/ecommerce/http/HttpRequest.java rename to sdk-common/src/main/java/common/ecommerce/http/HttpRequest.java diff --git a/http/src/main/java/common/ecommerce/http/HttpResponse.java b/sdk-common/src/main/java/common/ecommerce/http/HttpResponse.java similarity index 100% rename from http/src/main/java/common/ecommerce/http/HttpResponse.java rename to sdk-common/src/main/java/common/ecommerce/http/HttpResponse.java diff --git a/http/src/main/java/common/ecommerce/http/HttpTransport.java b/sdk-common/src/main/java/common/ecommerce/http/HttpTransport.java similarity index 100% rename from http/src/main/java/common/ecommerce/http/HttpTransport.java rename to sdk-common/src/main/java/common/ecommerce/http/HttpTransport.java diff --git a/http/src/main/java/common/ecommerce/http/JacksonJsonCodec.java b/sdk-common/src/main/java/common/ecommerce/http/JacksonJsonCodec.java similarity index 100% rename from http/src/main/java/common/ecommerce/http/JacksonJsonCodec.java rename to sdk-common/src/main/java/common/ecommerce/http/JacksonJsonCodec.java diff --git a/http/src/main/java/common/ecommerce/http/JsonCodec.java b/sdk-common/src/main/java/common/ecommerce/http/JsonCodec.java similarity index 100% rename from http/src/main/java/common/ecommerce/http/JsonCodec.java rename to sdk-common/src/main/java/common/ecommerce/http/JsonCodec.java diff --git a/http/src/main/java/common/ecommerce/http/OkHttpTransport.java b/sdk-common/src/main/java/common/ecommerce/http/OkHttpTransport.java similarity index 100% rename from http/src/main/java/common/ecommerce/http/OkHttpTransport.java rename to sdk-common/src/main/java/common/ecommerce/http/OkHttpTransport.java diff --git a/http/src/main/java/common/ecommerce/http/Responses.java b/sdk-common/src/main/java/common/ecommerce/http/Responses.java similarity index 100% rename from http/src/main/java/common/ecommerce/http/Responses.java rename to sdk-common/src/main/java/common/ecommerce/http/Responses.java diff --git a/http/src/main/java/common/ecommerce/http/TokenManager.java b/sdk-common/src/main/java/common/ecommerce/http/TokenManager.java similarity index 100% rename from http/src/main/java/common/ecommerce/http/TokenManager.java rename to sdk-common/src/main/java/common/ecommerce/http/TokenManager.java diff --git a/shared/src/main/java/common/ecommerce/shared/audit/CallObserver.java b/sdk-common/src/main/java/common/ecommerce/shared/audit/CallObserver.java similarity index 100% rename from shared/src/main/java/common/ecommerce/shared/audit/CallObserver.java rename to sdk-common/src/main/java/common/ecommerce/shared/audit/CallObserver.java diff --git a/shared/src/main/java/common/ecommerce/shared/audit/CallOutcome.java b/sdk-common/src/main/java/common/ecommerce/shared/audit/CallOutcome.java similarity index 100% rename from shared/src/main/java/common/ecommerce/shared/audit/CallOutcome.java rename to sdk-common/src/main/java/common/ecommerce/shared/audit/CallOutcome.java diff --git a/shared/src/main/java/common/ecommerce/shared/audit/CallRecord.java b/sdk-common/src/main/java/common/ecommerce/shared/audit/CallRecord.java similarity index 95% rename from shared/src/main/java/common/ecommerce/shared/audit/CallRecord.java rename to sdk-common/src/main/java/common/ecommerce/shared/audit/CallRecord.java index 59e05c3..aec44f6 100644 --- a/shared/src/main/java/common/ecommerce/shared/audit/CallRecord.java +++ b/sdk-common/src/main/java/common/ecommerce/shared/audit/CallRecord.java @@ -27,8 +27,8 @@ public final class CallRecord { private final Instant occurredAt; /** 我方链路 ID(可注入 traceId),可能为 null;不是平台工单号。 */ private final String requestId; - /** 接入通道;账户/适配器还没解析出来时可能为 null。 */ - private final ChannelProvider provider; + /** 接入通道名({@code ChannelProvider} / {@code WarehouseProvider} 的 name);账户/适配器还没解析出来时可能为 null。 */ + private final String provider; /** 业务平台;账户/适配器还没解析出来时可能为 null。 */ private final Platform platform; /** 宿主侧店铺 ID,业务主键的一部分;可能为 null。 */ @@ -123,8 +123,8 @@ public final class CallRecord { return requestId; } - /** 接入通道;未解析出账户/适配器时为 null。 */ - public ChannelProvider provider() { + /** 接入通道名;未解析出账户/适配器时为 null。 */ + public String provider() { return provider; } @@ -250,8 +250,8 @@ public final class CallRecord { private Instant occurredAt = Instant.EPOCH; /** 我方链路 ID;默认 null。 */ private String requestId; - /** 接入通道;默认 null。 */ - private ChannelProvider provider; + /** 接入通道名;默认 null。 */ + private String provider; /** 业务平台;默认 null。 */ private Platform platform; /** 宿主侧店铺 ID;默认 null。 */ @@ -296,11 +296,18 @@ public final class CallRecord { } /** 接入通道。 */ - public Builder provider(ChannelProvider provider) { + /** 接入通道名。 */ + public Builder provider(String provider) { this.provider = provider; return this; } + /** 接入通道枚举;写入时取 {@link ChannelProvider#name()}。 */ + public Builder provider(ChannelProvider provider) { + this.provider = provider == null ? null : provider.name(); + return this; + } + /** 业务平台。 */ public Builder platform(Platform platform) { this.platform = platform; diff --git a/sdk-common/src/main/java/common/ecommerce/shared/audit/CallScope.java b/sdk-common/src/main/java/common/ecommerce/shared/audit/CallScope.java new file mode 100644 index 0000000..5279ae7 --- /dev/null +++ b/sdk-common/src/main/java/common/ecommerce/shared/audit/CallScope.java @@ -0,0 +1,29 @@ +package common.ecommerce.shared.audit; + +import java.time.Clock; + +/** + * 一次门面调用可供埋点读取的维度。渠道域的 {@code ChannelContext}、 + * 仓库域的 {@code WarehouseContext} 都实现它,因此 {@link CallSupport} 可以放在 + * 共享层,两个域各传自己的上下文。 + */ +public interface CallScope { + + /** 我方链路 ID。 */ + String requestId(); + + /** 接入通道名(渠道 provider / 仓库 provider)。 */ + String providerName(); + + /** 业务平台名;仓库域没有平台概念,返回 null。 */ + String platformName(); + + /** 宿主侧店铺 ID;仓库域返回 null。 */ + String omsStoreId(); + + /** 渠道侧店铺 ID;仓库域返回 null。 */ + String externalStoreId(); + + /** 取调用耗时的时钟。 */ + Clock clock(); +} diff --git a/channel/src/main/java/common/ecommerce/channel/sdk/CallSupport.java b/sdk-common/src/main/java/common/ecommerce/shared/audit/CallSupport.java similarity index 71% rename from channel/src/main/java/common/ecommerce/channel/sdk/CallSupport.java rename to sdk-common/src/main/java/common/ecommerce/shared/audit/CallSupport.java index ba36c52..b80b131 100644 --- a/channel/src/main/java/common/ecommerce/channel/sdk/CallSupport.java +++ b/sdk-common/src/main/java/common/ecommerce/shared/audit/CallSupport.java @@ -1,10 +1,4 @@ -package common.ecommerce.channel.sdk; - -import common.ecommerce.shared.audit.CallObserver; -import common.ecommerce.shared.audit.CallOutcome; -import common.ecommerce.shared.audit.CallRecord; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +package common.ecommerce.shared.audit; import java.time.Instant; import java.util.Collections; @@ -12,18 +6,21 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.function.Supplier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * 门面埋点工具:统计耗时、结果数量与异常,生成 {@link CallRecord} 并回调 - * {@link CallObserver}。 + * {@link CallObserver}。渠道域与仓库域共用,调用方传自己的 {@link CallScope}。 * - *

不是公开 API,只给 core 内部的门面使用。SDK 不写日志目的地, + *

不是公开 API,只给门面内部使用。SDK 不写日志目的地, * 落库 / 发 MQ / 接监控都交给宿主实现的 {@link CallObserver}。

* *

约定:

*
    *
  • 观察者异常一律吞掉并打 WARN,绝不影响业务调用;
  • *
  • 业务异常原样抛出,不包装、不改变类型;
  • - *
  • 耗时用 {@code ChannelContext} 的时钟,测试注入固定时钟时为 0。
  • + *
  • 耗时用 {@link CallScope#clock()},测试注入固定时钟时为 0。
  • *
*/ public final class CallSupport { @@ -33,9 +30,7 @@ public final class CallSupport { /** 结果数量不适用(单对象、写操作等)。 */ public static final int NO_COUNT = -1; - /** - * 门面埋点工具,禁止实例化。 - */ + /** 工具类,禁止实例化。 */ private CallSupport() { } @@ -52,7 +47,7 @@ public final class CallSupport { if (keyValues.length % 2 != 0) { throw new IllegalArgumentException("params must be key/value pairs"); } - Map map = new LinkedHashMap<>(); + Map map = new LinkedHashMap(); for (int i = 0; i < keyValues.length; i += 2) { Object key = keyValues[i]; if (key == null) { @@ -63,11 +58,7 @@ public final class CallSupport { return map; } - /** - * 结果数量提取器;不适用时返回 {@link #NO_COUNT}。 - * - * @param 门面方法的返回类型 - */ + /** 结果数量提取器;不适用时返回 {@link #NO_COUNT}。 */ public interface ResultSize { /** 返回结果条目数;不适用时返回 {@link CallSupport#NO_COUNT}。 */ @@ -77,22 +68,15 @@ public final class CallSupport { /** * 结果摘要:数量 + 失败数 + 业务码 + 结论。 * - *

批处理能力(审核发货、编辑订单)平台会逐单返回成败, - * 只要没有异常,旧实现就会记成 {@code SUCCESS};用本类型可以标出 - * {@link CallOutcome#PARTIAL} 或 {@link CallOutcome#FAILURE}。

+ *

批处理能力平台会逐单返回成败,只要没有异常,旧实现就会记成 + * {@code SUCCESS};用本类型可以标出 {@link CallOutcome#PARTIAL} 或 + * {@link CallOutcome#FAILURE}。

*/ public static final class ResultSummary { - /** 本次调用的结论:成功 / 部分成功 / 失败。 */ private final CallOutcome outcome; - - /** 结果条目数;不适用时为 {@link #NO_COUNT}。 */ private final int resultCount; - - /** 失败条目数;单对象失败时常用 1。 */ private final int failedCount; - - /** 平台返回的业务码,可为 null。 */ private final String resultCode; private ResultSummary(CallOutcome outcome, int resultCount, int failedCount, String resultCode) { @@ -138,11 +122,7 @@ public final class CallSupport { } } - /** - * 结果摘要提取器。 - * - * @param 门面方法的返回类型 - */ + /** 结果摘要提取器。 */ public interface ResultMapper { /** @@ -157,18 +137,17 @@ public final class CallSupport { * 执行一次门面调用并记录日志(只关心数量)。 * * @param observer 观察者;null 等价于 {@link CallObserver#NOOP} - * @param ctx 本次调用上下文(提供账户、链路 ID、时钟) + * @param scope 本次调用维度(链路 ID、provider、时钟等) * @param operation 操作名,如 {@code salesOrders.pull} * @param params 参数摘要,见 {@link #params(Object...)} * @param resultSize 结果数量提取器;不关心数量时传 {@code null} * @param action 真正的适配器调用 */ - public static T observe(CallObserver observer, ChannelContext ctx, String operation, + public static T observe(CallObserver observer, CallScope scope, String operation, Map params, ResultSize resultSize, Supplier action) { - return observeSummary(observer, ctx, operation, params, + return observeSummary(observer, scope, operation, params, new ResultMapper() { - /** 只关心数量:null 结果或未提供提取器时记 NO_COUNT。 */ @Override public ResultSummary summarize(T result) { if (result == null || resultSize == null) { @@ -184,23 +163,20 @@ public final class CallSupport { * 执行一次门面调用并记录日志(可区分成功 / 部分成功 / 失败)。 * *

业务异常原样抛出;观察者异常吞掉并打 WARN。

- * - * @param mapper 结果摘要提取器;抛异常时按 {@code SUCCESS + NO_COUNT} 兜底, - * 不影响业务返回值 */ - public static T observeSummary(CallObserver observer, ChannelContext ctx, String operation, + public static T observeSummary(CallObserver observer, CallScope scope, String operation, Map params, ResultMapper mapper, Supplier action) { CallObserver effective = observer == null ? CallObserver.NOOP : observer; - Instant startedAt = Instant.now(ctx.clock()); - long startedMillis = ctx.clock().millis(); + Instant startedAt = Instant.now(scope.clock()); + long startedMillis = scope.clock().millis(); try { T result = action.get(); - notifyObserver(effective, ctx, operation, params, + notifyObserver(effective, scope, operation, params, summarize(mapper, result), null, startedAt, startedMillis); return result; } catch (RuntimeException e) { - notifyObserver(effective, ctx, operation, params, + notifyObserver(effective, scope, operation, params, null, e, startedAt, startedMillis); throw e; } @@ -215,27 +191,24 @@ public final class CallSupport { ResultSummary summary = mapper.summarize(result); return summary == null ? ResultSummary.success(NO_COUNT) : summary; } catch (RuntimeException e) { - // 摘要提取失败不应该影响业务结果 return ResultSummary.success(NO_COUNT); } } - /** - * 组装 {@link CallRecord} 并回调观察者;回调失败只打 WARN,不影响业务。 - */ - private static void notifyObserver(CallObserver observer, ChannelContext ctx, String operation, + /** 组装 {@link CallRecord} 并回调观察者;回调失败只打 WARN,不影响业务。 */ + private static void notifyObserver(CallObserver observer, CallScope scope, String operation, Map params, ResultSummary summary, RuntimeException error, Instant startedAt, long startedMillis) { CallRecord.Builder record = CallRecord.builder() .occurredAt(startedAt) - .requestId(ctx.requestId()) - .provider(ctx.provider()) - .platform(ctx.platform()) - .omsStoreId(ctx.omsStoreId()) - .externalStoreId(ctx.account() == null ? null : ctx.account().externalStoreId()) + .requestId(scope.requestId()) + .provider(scope.providerName()) + .platform(platformOf(scope)) + .omsStoreId(scope.omsStoreId()) + .externalStoreId(scope.externalStoreId()) .operation(operation) - .durationMillis(Math.max(0L, ctx.clock().millis() - startedMillis)) + .durationMillis(Math.max(0L, scope.clock().millis() - startedMillis)) .params(params); if (error != null) { @@ -252,9 +225,21 @@ public final class CallSupport { try { observer.onCall(record.build()); } catch (RuntimeException e) { - // 观察者自己的问题不能影响业务调用,只在自己的日志里留痕 LOG.warn("sdk call observer failed, record dropped: op={} requestId={}", - operation, ctx.requestId(), e); + operation, scope.requestId(), e); + } + } + + /** 平台名转回枚举;仓库域没有平台概念,返回 null。 */ + private static common.ecommerce.shared.model.Platform platformOf(CallScope scope) { + String name = scope.platformName(); + if (name == null) { + return null; + } + try { + return common.ecommerce.shared.model.Platform.valueOf(name); + } catch (IllegalArgumentException e) { + return null; } } } diff --git a/shared/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java b/sdk-common/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java similarity index 100% rename from shared/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java rename to sdk-common/src/main/java/common/ecommerce/shared/audit/Slf4jCallObserver.java diff --git a/shared/src/main/java/common/ecommerce/shared/error/AuthException.java b/sdk-common/src/main/java/common/ecommerce/shared/error/AuthException.java similarity index 100% rename from shared/src/main/java/common/ecommerce/shared/error/AuthException.java rename to sdk-common/src/main/java/common/ecommerce/shared/error/AuthException.java diff --git a/shared/src/main/java/common/ecommerce/shared/error/ChannelException.java b/sdk-common/src/main/java/common/ecommerce/shared/error/ChannelException.java similarity index 100% rename from shared/src/main/java/common/ecommerce/shared/error/ChannelException.java rename to sdk-common/src/main/java/common/ecommerce/shared/error/ChannelException.java diff --git a/shared/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java b/sdk-common/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java similarity index 100% rename from shared/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java rename to sdk-common/src/main/java/common/ecommerce/shared/error/CrossProviderConflictException.java diff --git a/shared/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java b/sdk-common/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java similarity index 100% rename from shared/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java rename to sdk-common/src/main/java/common/ecommerce/shared/error/IdempotencyConflictException.java diff --git a/shared/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java b/sdk-common/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java similarity index 100% rename from shared/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java rename to sdk-common/src/main/java/common/ecommerce/shared/error/PlatformBusinessException.java diff --git a/shared/src/main/java/common/ecommerce/shared/error/RateLimitException.java b/sdk-common/src/main/java/common/ecommerce/shared/error/RateLimitException.java similarity index 100% rename from shared/src/main/java/common/ecommerce/shared/error/RateLimitException.java rename to sdk-common/src/main/java/common/ecommerce/shared/error/RateLimitException.java diff --git a/shared/src/main/java/common/ecommerce/shared/error/TransientException.java b/sdk-common/src/main/java/common/ecommerce/shared/error/TransientException.java similarity index 100% rename from shared/src/main/java/common/ecommerce/shared/error/TransientException.java rename to sdk-common/src/main/java/common/ecommerce/shared/error/TransientException.java diff --git a/shared/src/main/java/common/ecommerce/shared/error/ValidationException.java b/sdk-common/src/main/java/common/ecommerce/shared/error/ValidationException.java similarity index 100% rename from shared/src/main/java/common/ecommerce/shared/error/ValidationException.java rename to sdk-common/src/main/java/common/ecommerce/shared/error/ValidationException.java diff --git a/shared/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java b/sdk-common/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java similarity index 88% rename from shared/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java rename to sdk-common/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java index e0d737d..50b9462 100644 --- a/shared/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java +++ b/sdk-common/src/main/java/common/ecommerce/shared/idempotency/IdempotencyGuard.java @@ -9,6 +9,7 @@ import common.ecommerce.shared.spi.IdempotencyClaim; import common.ecommerce.shared.spi.IdempotencyRecord; import common.ecommerce.shared.spi.IdempotencyStatus; import common.ecommerce.shared.spi.IdempotencyStore; +import common.ecommerce.shared.model.Platform; import java.time.Clock; import java.time.Instant; @@ -121,7 +122,7 @@ public final class IdempotencyGuard { * @throws CrossProviderConflictException 已由另一个 provider 完成 * @throws ChannelException 业务键 FAILED_FINAL,或 {@code action} 自己抛出 */ - public WriteResult execute(WriteScope scope, Supplier action, Function resultRef) { + public WriteResult execute(WriteIdentity scope, Supplier action, Function resultRef) { Objects.requireNonNull(scope, "scope"); Objects.requireNonNull(action, "action"); Objects.requireNonNull(resultRef, "resultRef"); @@ -131,13 +132,13 @@ public final class IdempotencyGuard { final Instant now = Instant.now(clock); // 1) 业务键:跨 provider 的最终裁决 - IdempotencyClaim business = store.claim(businessKey, owner, scope.provider(), now, claimTtlSeconds); + IdempotencyClaim business = store.claim(businessKey, owner, scope.providerName(), now, claimTtlSeconds); if (!business.acquired()) { return handleNotAcquired(scope, business, businessKey, providerKey); } // 2) provider 键:识别「平台已写、业务键没来得及记成功」的崩溃窗口 - IdempotencyClaim provider = store.claim(providerKey, owner, scope.provider(), now, claimTtlSeconds); + IdempotencyClaim provider = store.claim(providerKey, owner, scope.providerName(), now, claimTtlSeconds); if (!provider.acquired()) { if (provider.outcome() == IdempotencyClaim.Outcome.SUCCEEDED) { store.complete(businessKey, owner, provider.record().resultRef(), Instant.now(clock)); @@ -181,7 +182,7 @@ public final class IdempotencyGuard { *

只处理非 ACQUIRED 的结果;ACQUIRED 走到这里属于实现缺陷,直接抛 * {@link IllegalStateException}。

*/ - private WriteResult handleNotAcquired(WriteScope scope, IdempotencyClaim claim, + private WriteResult handleNotAcquired(WriteIdentity scope, IdempotencyClaim claim, String businessKey, String providerKey) { IdempotencyRecord record = claim.record(); switch (claim.outcome()) { @@ -192,9 +193,9 @@ public final class IdempotencyGuard { IdempotencyConflictException ex = new IdempotencyConflictException(ChannelException.builder() .message("write already in progress: " + providerKey) .operation(scope.action()) - .provider(scope.provider().name()) + .provider(scope.providerName()) .omsStoreId(scope.omsStoreId()) - .platform(scope.platform()), businessKey); + .platform(platformOf(scope)), businessKey); WriteAudit.record(observer, clock, scope, CallOutcome.FAILURE, WriteAudit.Stage.IN_PROGRESS, ex, "owner", record.owner()); throw ex; @@ -203,9 +204,9 @@ public final class IdempotencyGuard { ChannelException ex = ChannelException.builder() .message("previous attempt failed permanently, manual intervention required: " + businessKey) .operation(scope.action()) - .provider(scope.provider().name()) + .provider(scope.providerName()) .omsStoreId(scope.omsStoreId()) - .platform(scope.platform()) + .platform(platformOf(scope)) .retryable(false) .build(); WriteAudit.record(observer, clock, scope, CallOutcome.FAILURE, @@ -221,21 +222,21 @@ public final class IdempotencyGuard { * 回放已成功的结果;若原完成方是另一个 provider,则改抛 * {@link CrossProviderConflictException}(不自动跨 provider 重试)。 */ - private WriteResult replay(WriteScope scope, IdempotencyRecord record, + private WriteResult replay(WriteIdentity scope, IdempotencyRecord record, String businessKey, String providerKey, WriteAudit.Stage stage) { - if (record.provider() != null && record.provider() != scope.provider()) { + if (record.provider() != null && !record.provider().equals(scope.providerName())) { CrossProviderConflictException ex = new CrossProviderConflictException(ChannelException.builder() .message("business action already completed by " + record.provider() - + ", requested via " + scope.provider() + ": " + businessKey) + + ", requested via " + scope.providerName() + ": " + businessKey) .operation(scope.action()) - .provider(scope.provider().name()) + .provider(scope.providerName()) .omsStoreId(scope.omsStoreId()) - .platform(scope.platform()) - .retryable(false), record.provider().name()); + .platform(platformOf(scope)) + .retryable(false), record.provider()); WriteAudit.record(observer, clock, scope, CallOutcome.FAILURE, WriteAudit.Stage.CROSS_PROVIDER_CONFLICT, ex, - "completedByProvider", record.provider().name()); + "completedByProvider", record.provider()); throw ex; } WriteAudit.record(observer, clock, scope, CallOutcome.SUCCESS, stage, null, @@ -263,10 +264,24 @@ public final class IdempotencyGuard { * * @return 无记录时为空 Optional */ - public Optional status(WriteScope scope) { + /** 按业务键查询当前幂等记录,只读查询,供运维排查。 */ + public Optional 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