Browse Source

refactor: WarehouseAccount 用 accountId 取代 credentialRef

原 credentialRef 只是个"密钥引用名",和仓编码是两套标识,理解成本高。
改为:
- 新增 accountId 作账户主键,同时作为 SecretProvider 的取密钥键
- 删除 credentialRef
- accountId 不填时默认等于 warehouseCode,简单场景少写一个字段

对外调用不变:sdk.warehouses(warehouseCode) 仍传仓编码。
SecretProvider.get(accountId) 拿密钥。

同一仓未来挂多个 provider 时,warehouseCode 会有多条记录,但 accountId
仍然唯一,密钥 / 限流 / 水位线按它隔离。

Co-Authored-By: Claude <noreply@anthropic.com>
master
chenchuchuan 18 hours ago
parent
commit
799ac981c7
  1. 12
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/sdk/WarehouseSdk.java
  2. 45
      warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/spi/WarehouseAccount.java
  3. 2
      warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunAdapterTest.java
  4. 4
      warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/sdk/EdayunSdkSmokeTest.java
  5. 2
      warehouse-sdk-hengjian/src/test/java/common/ecommerce/hengjian/adapter/HengjianAdapterTest.java
  6. 2
      warehouse-sdk-hengjian/src/test/java/common/ecommerce/hengjian/adapter/HengjianCreateOrderTest.java
  7. 2
      warehouse-sdk-testkit/src/main/java/common/ecommerce/warehouse/testkit/FakeWarehouseAdapter.java
  8. 8
      warehouse-sdk-testkit/src/test/java/common/ecommerce/warehouse/sdk/WarehouseSdkTest.java

12
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/sdk/WarehouseSdk.java

@ -83,7 +83,7 @@ public final class WarehouseSdk { @@ -83,7 +83,7 @@ public final class WarehouseSdk {
private final Supplier<String> requestIdSupplier;
/**
* 凭据解析器;把账户的 {@code credentialRef} 换成真实密钥。
* 凭据解析器;把账户的 {@code accountId} 换成真实密钥。
*
* <p>未注入时为 {@code null},此时只能用带 {@code WarehouseConnection} 的入口;
* 注入后可使用 {@link #warehouses(String)} 免连接重载。</p>
@ -109,7 +109,7 @@ public final class WarehouseSdk { @@ -109,7 +109,7 @@ public final class WarehouseSdk {
/**
* 取某个仓的接入视图(免连接)。
*
* <p>密钥与地址一起由 {@link SecretProvider} 按 {@code credentialRef} 提供:
* <p>密钥与地址一起由 {@link SecretProvider} 按 {@code accountId} 提供:
* 地址取 {@code ChannelSecret.endpointBaseUrl()},为空时退回适配器默认地址;
* 辅助基址取 {@code ChannelSecret.auxEndpointBaseUrl()}(如运去哪的轨迹主机)。</p>
*
@ -272,10 +272,10 @@ public final class WarehouseSdk { @@ -272,10 +272,10 @@ public final class WarehouseSdk {
"WarehouseSdk requires a secretProvider for connection-less calls; "
+ "either inject secretProvider(...) or pass a WarehouseConnection");
}
ChannelSecret secret = secretProvider.get(account.credentialRef());
ChannelSecret secret = secretProvider.get(account.accountId());
if (secret == null) {
throw new IllegalStateException("secretProvider returned null for credentialRef="
+ account.credentialRef());
throw new IllegalStateException("secretProvider returned null for accountId="
+ account.accountId());
}
String endpoint = secret.endpointBaseUrl();
if (endpoint == null || endpoint.trim().isEmpty()) {
@ -314,7 +314,7 @@ public final class WarehouseSdk { @@ -314,7 +314,7 @@ public final class WarehouseSdk {
* 注入凭据解析器。
*
* <p>注入后可使用 {@code warehouses(warehouseCode)} 免连接入口:SDK 按
* {@code credentialRef} 取到的 {@code ChannelSecret} 里同时含密钥与地址,
* {@code accountId} 取到的 {@code ChannelSecret} 里同时含密钥与地址,
* 据此组装连接(地址为空时退回适配器默认地址)。
* 密钥只在内存中出现,SDK 不保存、不落盘。</p>
*/

45
warehouse-sdk-core/src/main/java/common/ecommerce/warehouse/spi/WarehouseAccount.java

@ -11,7 +11,16 @@ import java.util.Objects; @@ -11,7 +11,16 @@ import java.util.Objects;
*/
public final class WarehouseAccount {
/** OMS 仓编码,本域主键。 */
/**
* 账户主键,同时是取密钥的键。
*
* <p>由 OMS 自己定(自增 ID / 业务编号均可),一个账户一条。
* {@code SecretProvider} 拿它去取对应的 {@code ChannelSecret}。
* 同一账户下挂多个仓时,这些仓共用这一套密钥。</p>
*/
private final String accountId;
/** OMS 仓编码,业务主键;{@code sdk.warehouses()} 传的就是它。 */
private final String warehouseCode;
/** 接入通道名({@code WarehouseProvider.name()})。 */
@ -20,21 +29,23 @@ public final class WarehouseAccount { @@ -20,21 +29,23 @@ public final class WarehouseAccount {
/** 仓方仓编码,如 {@code RF_NY_US};下发与回传时使用。 */
private final String providerWarehouseId;
/** 凭证引用,不是凭证本体。 */
private final String credentialRef;
private WarehouseAccount(Builder b) {
this.accountId = require(b.accountId, "accountId");
this.warehouseCode = require(b.warehouseCode, "warehouseCode");
this.provider = require(b.provider, "provider");
this.providerWarehouseId = b.providerWarehouseId;
this.credentialRef = require(b.credentialRef, "credentialRef");
}
public static Builder builder() {
return new Builder();
}
/** OMS 下发的仓编码,本域主键。 */
/** 账户主键,同时作为 {@code SecretProvider} 的取密钥键。 */
public String accountId() {
return accountId;
}
/** OMS 下发的仓编码,本域业务主键。 */
public String warehouseCode() {
return warehouseCode;
}
@ -49,11 +60,6 @@ public final class WarehouseAccount { @@ -49,11 +60,6 @@ public final class WarehouseAccount {
return providerWarehouseId;
}
/** 凭证引用,不是凭证本体;由 {@code SecretProvider} 解析成密钥与端点。 */
public String credentialRef() {
return credentialRef;
}
private static String require(String v, String n) {
if (v == null || v.trim().isEmpty()) {
throw new IllegalArgumentException(n + " must not be blank");
@ -62,10 +68,16 @@ public final class WarehouseAccount { @@ -62,10 +68,16 @@ public final class WarehouseAccount {
}
public static final class Builder {
private String accountId;
private String warehouseCode;
private String provider;
private String providerWarehouseId;
private String credentialRef;
/** 账户主键;不填时默认等于 {@code warehouseCode}。 */
public Builder accountId(String v) {
this.accountId = v;
return this;
}
public Builder warehouseCode(String v) {
this.warehouseCode = v;
@ -82,12 +94,11 @@ public final class WarehouseAccount { @@ -82,12 +94,11 @@ public final class WarehouseAccount {
return this;
}
public Builder credentialRef(String v) {
this.credentialRef = v;
return this;
}
/** 构建账户;{@code accountId} 未设置时取 {@code warehouseCode}。 */
public WarehouseAccount build() {
if (accountId == null || accountId.trim().isEmpty()) {
accountId = warehouseCode;
}
return new WarehouseAccount(this);
}
}

2
warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/adapter/EdayunAdapterTest.java

@ -37,7 +37,7 @@ class EdayunAdapterTest { @@ -37,7 +37,7 @@ class EdayunAdapterTest {
.warehouseCode(WH)
.provider(WarehouseProvider.EDAYUN.name())
.providerWarehouseId("EDY-WH-1")
.credentialRef("kms://test/edayun")
.accountId("acc-edayun")
.build();
}

4
warehouse-sdk-edayun/src/test/java/common/ecommerce/edayun/sdk/EdayunSdkSmokeTest.java

@ -83,7 +83,7 @@ class EdayunSdkSmokeTest { @@ -83,7 +83,7 @@ class EdayunSdkSmokeTest {
.warehouseCode(WH)
.provider(WarehouseProvider.EDAYUN.name())
.providerWarehouseId("2")
.credentialRef("kms://test/edayun")
.accountId("acc-edayun")
.build());
// 直接注册适配器实例:把传输层换成假的,其余装配(token 缓存 / 锁 / 时钟)与
// 生产走同一套构造参数。工厂路径由 factoryAssemblesAdapter 单独验证。
@ -190,7 +190,7 @@ class EdayunSdkSmokeTest { @@ -190,7 +190,7 @@ class EdayunSdkSmokeTest {
.warehouseCode(WH)
.provider(WarehouseProvider.EDAYUN.name())
.providerWarehouseId("2")
.credentialRef("kms://test/edayun")
.accountId("acc-edayun")
.build());
WarehouseSdk built = WarehouseSdk.builder()
.warehouseRepository(repo)

2
warehouse-sdk-hengjian/src/test/java/common/ecommerce/hengjian/adapter/HengjianAdapterTest.java

@ -34,7 +34,7 @@ class HengjianAdapterTest { @@ -34,7 +34,7 @@ class HengjianAdapterTest {
.warehouseCode(WH)
.provider(WarehouseProvider.HENGJIAN.name())
.providerWarehouseId("EFCA")
.credentialRef("kms://test/hengjian")
.accountId("acc-hengjian")
.build();
}

2
warehouse-sdk-hengjian/src/test/java/common/ecommerce/hengjian/adapter/HengjianCreateOrderTest.java

@ -492,7 +492,7 @@ class HengjianCreateOrderTest { @@ -492,7 +492,7 @@ class HengjianCreateOrderTest {
.warehouseCode("HJ-EFCA")
.provider(WarehouseProvider.HENGJIAN.name())
.providerWarehouseId("EFCA")
.credentialRef("kms://test")
.accountId("acc-test")
.build()))
.clock(CLOCK)
.register(new HengjianAdapterFactory())

2
warehouse-sdk-testkit/src/main/java/common/ecommerce/warehouse/testkit/FakeWarehouseAdapter.java

@ -55,7 +55,7 @@ public final class FakeWarehouseAdapter implements OutboundCapable { @@ -55,7 +55,7 @@ public final class FakeWarehouseAdapter implements OutboundCapable {
.warehouseCode(warehouseCode)
.provider(provider.name())
.providerWarehouseId("WH-" + warehouseCode)
.credentialRef("kms://test/fake-warehouse")
.accountId("acc-" + warehouseCode)
.build();
}

8
warehouse-sdk-testkit/src/test/java/common/ecommerce/warehouse/sdk/WarehouseSdkTest.java

@ -175,7 +175,7 @@ class WarehouseSdkTest { @@ -175,7 +175,7 @@ class WarehouseSdkTest {
InMemoryWarehouses repo = new InMemoryWarehouses()
.put(FakeWarehouseAdapter.account(WH, WarehouseProvider.CUSTOM));
common.ecommerce.shared.spi.SecretProvider secrets =
credentialRef -> common.ecommerce.shared.spi.ChannelSecret.builder()
accountId -> common.ecommerce.shared.spi.ChannelSecret.builder()
.appSecret("fake-token").build();
return WarehouseSdk.builder()
.warehouseRepository(repo)
@ -190,7 +190,7 @@ class WarehouseSdkTest { @@ -190,7 +190,7 @@ class WarehouseSdkTest {
void connectionlessCallUsesAdapterDefaultEndpoint() {
WarehouseSdk withSecret = sdkWithSecret();
// 账户未配端点 → 走适配器默认地址;密钥由解析器按 credentialRef 取
// 账户未配端点 → 走适配器默认地址;密钥由解析器按 accountId 取
assertNotNull(withSecret.warehouses(WH));
withSecret.warehouses(WH).outbound().create(cmd("OB-CC-1"));
}
@ -200,7 +200,7 @@ class WarehouseSdkTest { @@ -200,7 +200,7 @@ class WarehouseSdkTest {
InMemoryWarehouses repo = new InMemoryWarehouses()
.put(FakeWarehouseAdapter.account(WH, WarehouseProvider.CUSTOM));
common.ecommerce.shared.spi.SecretProvider secrets =
credentialRef -> common.ecommerce.shared.spi.ChannelSecret.builder()
accountId -> common.ecommerce.shared.spi.ChannelSecret.builder()
.appSecret("fake-token")
.endpointBaseUrl("https://custom.endpoint.example.com")
.build();
@ -230,7 +230,7 @@ class WarehouseSdkTest { @@ -230,7 +230,7 @@ class WarehouseSdkTest {
.put(FakeWarehouseAdapter.account(WH, WarehouseProvider.CUSTOM));
WarehouseSdk withSecret = WarehouseSdk.builder()
.warehouseRepository(repo)
.secretProvider(credentialRef -> null)
.secretProvider(accountId -> null)
.idempotencyStore(idempotency)
.clock(CLOCK)
.register(new FakeWarehouseAdapter())

Loading…
Cancel
Save