diff --git a/channel/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java b/channel/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java index 2ad59e9..17c8ae5 100644 --- a/channel/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/InboundReceiptCapable.java @@ -1,9 +1,9 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.model.inbound.InboundReceipt; -import common.ecommerce.model.inbound.InboundReceiptQuery; -import common.ecommerce.model.support.Page; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.channel.model.inbound.InboundReceipt; +import common.ecommerce.channel.model.inbound.InboundReceiptQuery; +import common.ecommerce.channel.sdk.ChannelContext; +import common.ecommerce.shared.support.Page; /** * FBA 到货接收明细能力。 diff --git a/channel/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java b/channel/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java index bea1e3f..efff239 100644 --- a/channel/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/InboundShipmentCapable.java @@ -1,9 +1,9 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.support.Page; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.channel.model.inbound.InboundShipment; +import common.ecommerce.channel.model.inbound.InboundShipmentQuery; +import common.ecommerce.channel.sdk.ChannelContext; +import common.ecommerce.shared.support.Page; /** * 平台仓入库货件能力(FBT / WFS / AWD)。 diff --git a/channel/src/main/java/common/ecommerce/channel/capability/Inbounds.java b/channel/src/main/java/common/ecommerce/channel/capability/Inbounds.java index 34ab172..ea80273 100644 --- a/channel/src/main/java/common/ecommerce/channel/capability/Inbounds.java +++ b/channel/src/main/java/common/ecommerce/channel/capability/Inbounds.java @@ -1,16 +1,16 @@ -package common.ecommerce.capability; +package common.ecommerce.channel.capability; -import common.ecommerce.audit.CallObserver; -import common.ecommerce.error.ChannelException; -import common.ecommerce.model.Capability; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.inbound.InboundReceipt; -import common.ecommerce.model.inbound.InboundReceiptQuery; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.support.Page; -import common.ecommerce.sdk.CallSupport; -import common.ecommerce.sdk.ChannelContext; +import common.ecommerce.channel.model.account.ChannelAccount; +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.channel.sdk.ChannelContext; +import common.ecommerce.shared.audit.CallObserver; +import common.ecommerce.shared.error.ChannelException; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.shared.support.Page; /** * 门面持有的入库视图:平台仓入库货件(FBT / WFS / AWD)与 FBA 到货接收明细。 diff --git a/core/src/main/java/common/ecommerce/model/inbound/InboundReceipt.java b/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundReceipt.java similarity index 97% rename from core/src/main/java/common/ecommerce/model/inbound/InboundReceipt.java rename to channel/src/main/java/common/ecommerce/channel/model/inbound/InboundReceipt.java index 9e36eea..64c355d 100644 --- a/core/src/main/java/common/ecommerce/model/inbound/InboundReceipt.java +++ b/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundReceipt.java @@ -1,7 +1,7 @@ -package common.ecommerce.model.inbound; +package common.ecommerce.channel.model.inbound; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.support.PlatformTime; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.support.PlatformTime; import java.util.Objects; diff --git a/core/src/main/java/common/ecommerce/model/inbound/InboundReceiptQuery.java b/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundReceiptQuery.java similarity index 98% rename from core/src/main/java/common/ecommerce/model/inbound/InboundReceiptQuery.java rename to channel/src/main/java/common/ecommerce/channel/model/inbound/InboundReceiptQuery.java index 44c87c6..290a8c2 100644 --- a/core/src/main/java/common/ecommerce/model/inbound/InboundReceiptQuery.java +++ b/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundReceiptQuery.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.inbound; +package common.ecommerce.channel.model.inbound; import java.time.LocalDate; import java.util.ArrayList; diff --git a/core/src/main/java/common/ecommerce/model/inbound/InboundShipment.java b/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipment.java similarity index 98% rename from core/src/main/java/common/ecommerce/model/inbound/InboundShipment.java rename to channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipment.java index 5cf2f52..401fb43 100644 --- a/core/src/main/java/common/ecommerce/model/inbound/InboundShipment.java +++ b/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipment.java @@ -1,7 +1,7 @@ -package common.ecommerce.model.inbound; +package common.ecommerce.channel.model.inbound; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.support.PlatformTime; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.support.PlatformTime; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/main/java/common/ecommerce/model/inbound/InboundShipmentLine.java b/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentLine.java similarity index 99% rename from core/src/main/java/common/ecommerce/model/inbound/InboundShipmentLine.java rename to channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentLine.java index 73b66a6..76ca01b 100644 --- a/core/src/main/java/common/ecommerce/model/inbound/InboundShipmentLine.java +++ b/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentLine.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.inbound; +package common.ecommerce.channel.model.inbound; /** * 入库货件商品行。 diff --git a/core/src/main/java/common/ecommerce/model/inbound/InboundShipmentQuery.java b/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentQuery.java similarity index 99% rename from core/src/main/java/common/ecommerce/model/inbound/InboundShipmentQuery.java rename to channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentQuery.java index 30f4014..48b5397 100644 --- a/core/src/main/java/common/ecommerce/model/inbound/InboundShipmentQuery.java +++ b/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentQuery.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.inbound; +package common.ecommerce.channel.model.inbound; import java.time.Instant; import java.util.ArrayList; diff --git a/core/src/main/java/common/ecommerce/model/inbound/InboundShipmentTimeType.java b/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentTimeType.java similarity index 90% rename from core/src/main/java/common/ecommerce/model/inbound/InboundShipmentTimeType.java rename to channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentTimeType.java index b9dd8be..033b385 100644 --- a/core/src/main/java/common/ecommerce/model/inbound/InboundShipmentTimeType.java +++ b/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShipmentTimeType.java @@ -1,4 +1,4 @@ -package common.ecommerce.model.inbound; +package common.ecommerce.channel.model.inbound; /** * 入库货件查询使用的时间字段。 diff --git a/core/src/main/java/common/ecommerce/model/inbound/InboundShippingRef.java b/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShippingRef.java similarity index 96% rename from core/src/main/java/common/ecommerce/model/inbound/InboundShippingRef.java rename to channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShippingRef.java index d69568e..538a1a4 100644 --- a/core/src/main/java/common/ecommerce/model/inbound/InboundShippingRef.java +++ b/channel/src/main/java/common/ecommerce/channel/model/inbound/InboundShippingRef.java @@ -1,6 +1,6 @@ -package common.ecommerce.model.inbound; +package common.ecommerce.channel.model.inbound; -import common.ecommerce.model.support.PlatformTime; +import common.ecommerce.shared.support.PlatformTime; /** * 入库货件关联的发货单摘要。 diff --git a/channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java b/channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java index cc7e411..20bffb9 100644 --- a/channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java +++ b/channel/src/main/java/common/ecommerce/channel/sdk/ChannelSdk.java @@ -6,6 +6,7 @@ import common.ecommerce.shared.audit.Slf4jCallObserver; import common.ecommerce.channel.capability.AdapterCapabilityReport; import common.ecommerce.channel.capability.AfterSales; import common.ecommerce.channel.capability.AggregatorCapable; +import common.ecommerce.channel.capability.Inbounds; import common.ecommerce.shared.error.ChannelException; import common.ecommerce.shared.model.Capability; import common.ecommerce.channel.capability.CapabilityReport; @@ -202,6 +203,18 @@ public final class ChannelSdk implements ProviderResolver { } /** + * 入库视图:平台仓入库货件(FBT / WFS / AWD)与 FBA 到货接收明细(只读)。 + * + *
能力检查发生在 {@code shipments()} / {@code receipts()} 调用时; + * 适配器未实现对应接口或未声明能力时抛 + * {@code UnsupportedCapabilityException}。
+ */ + public Inbounds inbounds(AccountKey key, ChannelConnection connection) { + ChannelAccount account = requireAccount(key); + return new Inbounds(resolve(key), account, newContext(account, connection), callObserver); + } + + /** * 聚合器的子店铺列表(如领星下已授权的亚马逊 / 沃尔玛店铺)。 * *典型用途是首次接入:把 platformCode + externalStoreId 拉下来, diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java b/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java index 0ff714f..aa50bff 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java @@ -12,20 +12,8 @@ import common.ecommerce.channel.capability.ShipmentReviewCapable; import common.ecommerce.channel.capability.ShippingLabelCapable; import common.ecommerce.shared.error.AuthException; import common.ecommerce.shared.error.ChannelException; -import common.ecommerce.capability.AfterSaleCapable; -import common.ecommerce.capability.AggregatorCapable; -import common.ecommerce.capability.InboundReceiptCapable; -import common.ecommerce.capability.InboundShipmentCapable; -import common.ecommerce.capability.OrderEditCapable; -import common.ecommerce.capability.OutboundCapable; -import common.ecommerce.capability.OutboundOrderCapable; -import common.ecommerce.capability.ProductCapable; -import common.ecommerce.capability.SalesOrderCapable; -import common.ecommerce.capability.SettlementCapable; -import common.ecommerce.capability.ShipmentReviewCapable; -import common.ecommerce.capability.ShippingLabelCapable; -import common.ecommerce.error.AuthException; -import common.ecommerce.error.ChannelException; +import common.ecommerce.channel.capability.InboundReceiptCapable; +import common.ecommerce.channel.capability.InboundShipmentCapable; import common.ecommerce.http.HttpTransport; import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.http.TokenManager; @@ -56,6 +44,10 @@ import common.ecommerce.channel.model.order.SalesOrderQuery; import common.ecommerce.channel.model.order.SalesOrderRef; import common.ecommerce.channel.model.aftersale.AfterSale; import common.ecommerce.channel.model.aftersale.AfterSaleQuery; +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.model.fulfillment.LabelQuery; import common.ecommerce.channel.model.fulfillment.OrderEditRequest; import common.ecommerce.channel.model.fulfillment.OrderEditResult; @@ -65,10 +57,6 @@ import common.ecommerce.channel.model.fulfillment.OutboundPackage; import common.ecommerce.channel.model.fulfillment.OutboundResult; import common.ecommerce.channel.model.fulfillment.ShipmentReviewResult; import common.ecommerce.channel.model.fulfillment.ShippingLabel; -import common.ecommerce.model.inbound.InboundReceipt; -import common.ecommerce.model.inbound.InboundReceiptQuery; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentQuery; import common.ecommerce.channel.model.product.ProductListing; import common.ecommerce.channel.model.product.ProductQuery; import common.ecommerce.channel.model.product.ProductRef; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingInboundReceiptSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingInboundReceiptSource.java index 73386cd..ec41b95 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingInboundReceiptSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingInboundReceiptSource.java @@ -1,8 +1,8 @@ package common.ecommerce.lingxing.platform; -import common.ecommerce.model.inbound.InboundReceipt; -import common.ecommerce.model.inbound.InboundReceiptQuery; -import common.ecommerce.model.support.Page; +import common.ecommerce.channel.model.inbound.InboundReceipt; +import common.ecommerce.channel.model.inbound.InboundReceiptQuery; +import common.ecommerce.shared.support.Page; /** * 子平台的 FBA 到货接收明细能力。 diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingInboundShipmentSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingInboundShipmentSource.java index f1be73d..42bec01 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingInboundShipmentSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/LingxingInboundShipmentSource.java @@ -1,8 +1,8 @@ package common.ecommerce.lingxing.platform; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.support.Page; +import common.ecommerce.channel.model.inbound.InboundShipment; +import common.ecommerce.channel.model.inbound.InboundShipmentQuery; +import common.ecommerce.shared.support.Page; /** * 子平台的平台仓入库货件能力(FBT / WFS / AWD)。 diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/AwdCargoSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/AwdCargoSource.java index dad516f..3e547a5 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/AwdCargoSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/AwdCargoSource.java @@ -9,13 +9,13 @@ import common.ecommerce.lingxing.platform.LingxingInboundShipmentSource; import common.ecommerce.lingxing.platform.inbound.dto.AwdAddressDto; import common.ecommerce.lingxing.platform.inbound.dto.AwdGoodsItemDto; import common.ecommerce.lingxing.platform.inbound.dto.AwdShipmentDto; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentLine; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.inbound.InboundShipmentTimeType; -import common.ecommerce.model.support.Page; -import common.ecommerce.model.support.PlatformTime; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.channel.model.inbound.InboundShipment; +import common.ecommerce.channel.model.inbound.InboundShipmentLine; +import common.ecommerce.channel.model.inbound.InboundShipmentQuery; +import common.ecommerce.channel.model.inbound.InboundShipmentTimeType; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.support.PlatformTime; import java.time.Instant; import java.time.ZoneId; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/FbaReceivedInventorySource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/FbaReceivedInventorySource.java index b970196..ab4fd86 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/FbaReceivedInventorySource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/FbaReceivedInventorySource.java @@ -7,11 +7,11 @@ import common.ecommerce.lingxing.http.LingxingEnvelope; import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.lingxing.platform.LingxingInboundReceiptSource; import common.ecommerce.lingxing.platform.inbound.dto.FbaReceivedInventoryDto; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.inbound.InboundReceipt; -import common.ecommerce.model.inbound.InboundReceiptQuery; -import common.ecommerce.model.support.Page; -import common.ecommerce.model.support.PlatformTime; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.channel.model.inbound.InboundReceipt; +import common.ecommerce.channel.model.inbound.InboundReceiptQuery; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.support.PlatformTime; import java.time.Instant; import java.time.ZoneId; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/FbtCargoSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/FbtCargoSource.java index 8c4829d..974adf6 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/FbtCargoSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/FbtCargoSource.java @@ -9,14 +9,14 @@ import common.ecommerce.lingxing.platform.LingxingInboundShipmentSource; import common.ecommerce.lingxing.platform.inbound.dto.FbtCargoDto; import common.ecommerce.lingxing.platform.inbound.dto.FbtCargoGoodDto; import common.ecommerce.lingxing.platform.inbound.dto.FbtShippingInfoDto; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentLine; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.inbound.InboundShipmentTimeType; -import common.ecommerce.model.inbound.InboundShippingRef; -import common.ecommerce.model.support.Page; -import common.ecommerce.model.support.PlatformTime; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.channel.model.inbound.InboundShipment; +import common.ecommerce.channel.model.inbound.InboundShipmentLine; +import common.ecommerce.channel.model.inbound.InboundShipmentQuery; +import common.ecommerce.channel.model.inbound.InboundShipmentTimeType; +import common.ecommerce.channel.model.inbound.InboundShippingRef; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.support.PlatformTime; import java.time.Instant; import java.time.LocalDateTime; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/InboundSupport.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/InboundSupport.java index 1b2e15d..ff8d9ce 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/InboundSupport.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/InboundSupport.java @@ -1,12 +1,12 @@ package common.ecommerce.lingxing.platform.inbound; -import common.ecommerce.error.ChannelException; -import common.ecommerce.error.ValidationException; +import common.ecommerce.shared.error.ChannelException; +import common.ecommerce.shared.error.ValidationException; import common.ecommerce.lingxing.http.LingxingEnvelope; import common.ecommerce.lingxing.platform.LingxingCall; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.support.PlatformTime; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.channel.model.inbound.InboundShipmentQuery; +import common.ecommerce.shared.support.PlatformTime; import java.time.Instant; import java.time.LocalDate; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/WfsCargoSource.java b/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/WfsCargoSource.java index 59c0426..9547c68 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/WfsCargoSource.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/platform/inbound/WfsCargoSource.java @@ -8,14 +8,14 @@ import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.lingxing.platform.LingxingInboundShipmentSource; import common.ecommerce.lingxing.platform.inbound.dto.WfsCargoDto; import common.ecommerce.lingxing.platform.inbound.dto.WfsCargoGoodDto; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentLine; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.inbound.InboundShipmentTimeType; -import common.ecommerce.model.inbound.InboundShippingRef; -import common.ecommerce.model.support.Page; -import common.ecommerce.model.support.PlatformTime; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.channel.model.inbound.InboundShipment; +import common.ecommerce.channel.model.inbound.InboundShipmentLine; +import common.ecommerce.channel.model.inbound.InboundShipmentQuery; +import common.ecommerce.channel.model.inbound.InboundShipmentTimeType; +import common.ecommerce.channel.model.inbound.InboundShippingRef; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.support.PlatformTime; import java.time.Instant; import java.time.LocalDateTime; diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingInboundCapabilityTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingInboundCapabilityTest.java index c2429f0..1bea84d 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingInboundCapabilityTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingInboundCapabilityTest.java @@ -1,29 +1,29 @@ package common.ecommerce.lingxing.adapter; -import common.ecommerce.audit.CallObserver; -import common.ecommerce.audit.CallOutcome; -import common.ecommerce.audit.CallRecord; -import common.ecommerce.error.ChannelException; +import common.ecommerce.shared.audit.CallObserver; +import common.ecommerce.shared.audit.CallOutcome; +import common.ecommerce.shared.audit.CallRecord; +import common.ecommerce.shared.error.ChannelException; import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.lingxing.LingxingApi; import common.ecommerce.lingxing.support.LingxingTestSupport; -import common.ecommerce.model.Capability; -import common.ecommerce.model.Platform; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.inbound.InboundReceipt; -import common.ecommerce.model.inbound.InboundReceiptQuery; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.support.Page; -import common.ecommerce.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelSdk; -import common.ecommerce.spi.ChannelSecret; -import common.ecommerce.testkit.InMemoryAccounts; -import common.ecommerce.testkit.InMemoryLockProvider; -import common.ecommerce.testkit.InMemoryTokenStore; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.ChannelAccount; +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.shared.support.Page; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelSdk; +import common.ecommerce.shared.spi.ChannelSecret; +import common.ecommerce.shared.testkit.InMemoryAccounts; +import common.ecommerce.shared.testkit.InMemoryLockProvider; +import common.ecommerce.shared.testkit.InMemoryTokenStore; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import java.time.Instant; diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java index ec314c7..499c166 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java @@ -38,23 +38,23 @@ import common.ecommerce.lingxing.http.LingxingRateLimiter; import common.ecommerce.lingxing.http.LingxingRequestFactory; import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.lingxing.platform.multiplatform.order.LingxingOrderFilters; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.Platform; -import common.ecommerce.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.order.OrderLine; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.model.order.SalesOrderRef; -import common.ecommerce.model.settlement.SettlementQuery; -import common.ecommerce.model.settlement.SettlementTransaction; -import common.ecommerce.model.support.Page; -import common.ecommerce.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelContext; -import common.ecommerce.spi.AccessToken; -import common.ecommerce.spi.ChannelSecret; -import common.ecommerce.testkit.InMemoryLockProvider; -import common.ecommerce.testkit.InMemoryTokenStore; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.order.OrderLine; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.channel.model.order.SalesOrderRef; +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.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelContext; +import common.ecommerce.shared.spi.AccessToken; +import common.ecommerce.shared.spi.ChannelSecret; +import common.ecommerce.shared.testkit.InMemoryLockProvider; +import common.ecommerce.shared.testkit.InMemoryTokenStore; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/amazon/order/AmazonFbmOrderSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/amazon/order/AmazonFbmOrderSourceTest.java index 1f28faa..4637f7d 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/amazon/order/AmazonFbmOrderSourceTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/amazon/order/AmazonFbmOrderSourceTest.java @@ -1,13 +1,13 @@ package common.ecommerce.lingxing.platform.amazon.order; import common.ecommerce.lingxing.LingxingApi; -import common.ecommerce.model.Platform; -import common.ecommerce.model.order.OrderLine; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.model.support.Page; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.order.OrderLine; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import java.time.Instant; diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/AwdCargoSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/AwdCargoSourceTest.java index e2f7ade..eb56486 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/AwdCargoSourceTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/AwdCargoSourceTest.java @@ -1,15 +1,15 @@ package common.ecommerce.lingxing.platform.inbound; -import common.ecommerce.error.ValidationException; +import common.ecommerce.shared.error.ValidationException; import common.ecommerce.lingxing.LingxingApi; -import common.ecommerce.model.Platform; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.inbound.InboundShipmentTimeType; -import common.ecommerce.model.support.Page; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.inbound.InboundShipment; +import common.ecommerce.channel.model.inbound.InboundShipmentQuery; +import common.ecommerce.channel.model.inbound.InboundShipmentTimeType; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import java.time.Instant; diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/FbaReceivedInventorySourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/FbaReceivedInventorySourceTest.java index 429c41e..ff1c086 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/FbaReceivedInventorySourceTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/FbaReceivedInventorySourceTest.java @@ -1,14 +1,14 @@ package common.ecommerce.lingxing.platform.inbound; -import common.ecommerce.error.ValidationException; +import common.ecommerce.shared.error.ValidationException; import common.ecommerce.lingxing.LingxingApi; -import common.ecommerce.model.Platform; -import common.ecommerce.model.inbound.InboundReceipt; -import common.ecommerce.model.inbound.InboundReceiptQuery; -import common.ecommerce.model.support.Page; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.inbound.InboundReceipt; +import common.ecommerce.channel.model.inbound.InboundReceiptQuery; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import java.time.Instant; diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/FbtCargoSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/FbtCargoSourceTest.java index 764cb19..d007ec9 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/FbtCargoSourceTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/FbtCargoSourceTest.java @@ -1,15 +1,15 @@ package common.ecommerce.lingxing.platform.inbound; -import common.ecommerce.error.ValidationException; +import common.ecommerce.shared.error.ValidationException; import common.ecommerce.lingxing.LingxingApi; -import common.ecommerce.model.Platform; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.inbound.InboundShipmentTimeType; -import common.ecommerce.model.support.Page; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.inbound.InboundShipment; +import common.ecommerce.channel.model.inbound.InboundShipmentQuery; +import common.ecommerce.channel.model.inbound.InboundShipmentTimeType; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import java.time.Instant; diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/WfsCargoSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/WfsCargoSourceTest.java index fdca2e1..5e98ef1 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/WfsCargoSourceTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/inbound/WfsCargoSourceTest.java @@ -1,15 +1,15 @@ package common.ecommerce.lingxing.platform.inbound; -import common.ecommerce.error.ValidationException; +import common.ecommerce.shared.error.ValidationException; import common.ecommerce.lingxing.LingxingApi; -import common.ecommerce.model.Platform; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.inbound.InboundShipmentTimeType; -import common.ecommerce.model.support.Page; -import common.ecommerce.testkit.JsonFixture; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.inbound.InboundShipment; +import common.ecommerce.channel.model.inbound.InboundShipmentQuery; +import common.ecommerce.channel.model.inbound.InboundShipmentTimeType; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.testkit.JsonFixture; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import java.time.Instant; diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/platform/multiplatform/order/MultiPlatformOrderSourceTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/platform/multiplatform/order/MultiPlatformOrderSourceTest.java index fe10cf7..094ebd3 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/platform/multiplatform/order/MultiPlatformOrderSourceTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/platform/multiplatform/order/MultiPlatformOrderSourceTest.java @@ -1,12 +1,12 @@ package common.ecommerce.lingxing.platform.multiplatform.order; import common.ecommerce.lingxing.LingxingApi; -import common.ecommerce.model.Platform; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.model.support.Page; -import common.ecommerce.testkit.RecordingTransport; -import common.ecommerce.testkit.Responses; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.testkit.RecordingTransport; +import common.ecommerce.shared.testkit.Responses; import org.junit.jupiter.api.Test; import java.time.Instant; diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/probe/FulfillmentProbeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/probe/FulfillmentProbeTest.java index 62636d7..e5ba9a0 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/probe/FulfillmentProbeTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/probe/FulfillmentProbeTest.java @@ -1,6 +1,6 @@ package common.ecommerce.lingxing.probe; -import common.ecommerce.capability.AggregatorCapable.SubChannel; +import common.ecommerce.channel.capability.AggregatorCapable.SubChannel; import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpResponse; import common.ecommerce.http.HttpTransport; @@ -15,31 +15,31 @@ import common.ecommerce.lingxing.http.LingxingRateLimiter; import common.ecommerce.lingxing.http.LingxingRequestFactory; import common.ecommerce.lingxing.platform.LingxingCall; import common.ecommerce.lingxing.platform.multiplatform.order.LingxingOrderFilters; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.Capability; -import common.ecommerce.model.Platform; -import common.ecommerce.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.fulfillment.LabelQuery; -import common.ecommerce.model.fulfillment.OutboundOrder; -import common.ecommerce.model.fulfillment.OutboundOrderLine; -import common.ecommerce.model.fulfillment.OutboundOrderQuery; -import common.ecommerce.model.fulfillment.ShippingLabel; -import common.ecommerce.model.inbound.InboundReceipt; -import common.ecommerce.model.inbound.InboundReceiptQuery; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.inbound.InboundShipmentTimeType; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.model.support.Page; -import common.ecommerce.model.support.PlatformTime; -import common.ecommerce.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelContext; -import common.ecommerce.spi.AccessToken; -import common.ecommerce.spi.ChannelSecret; -import common.ecommerce.testkit.InMemoryLockProvider; -import common.ecommerce.testkit.InMemoryTokenStore; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.model.Capability; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +import common.ecommerce.channel.model.fulfillment.LabelQuery; +import common.ecommerce.channel.model.fulfillment.OutboundOrder; +import common.ecommerce.channel.model.fulfillment.OutboundOrderLine; +import common.ecommerce.channel.model.fulfillment.OutboundOrderQuery; +import common.ecommerce.channel.model.fulfillment.ShippingLabel; +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.model.inbound.InboundShipmentTimeType; +import common.ecommerce.channel.model.order.SalesOrder; +import common.ecommerce.channel.model.order.SalesOrderQuery; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.support.PlatformTime; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelContext; +import common.ecommerce.shared.spi.AccessToken; +import common.ecommerce.shared.spi.ChannelSecret; +import common.ecommerce.shared.testkit.InMemoryLockProvider; +import common.ecommerce.shared.testkit.InMemoryTokenStore; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; @@ -245,7 +245,7 @@ class FulfillmentProbeTest { printOrders(page); if (!page.items().isEmpty()) { System.out.println(" [detail] " + adapter.get(ctx, - common.ecommerce.model.order.SalesOrderRef.of( + common.ecommerce.channel.model.order.SalesOrderRef.of( page.items().get(0).channelOrderId()))); } } catch (RuntimeException e) { @@ -291,7 +291,7 @@ class FulfillmentProbeTest { printOrders(page); if (!page.items().isEmpty()) { System.out.println(" [detail] " + adapter.get(ctx, - common.ecommerce.model.order.SalesOrderRef.of( + common.ecommerce.channel.model.order.SalesOrderRef.of( page.items().get(0).channelOrderId()))); } } catch (RuntimeException e) { diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/probe/InboundProbeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/probe/InboundProbeTest.java index 5120a92..5a98ae6 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/probe/InboundProbeTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/probe/InboundProbeTest.java @@ -7,23 +7,23 @@ import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.http.OkHttpTransport; import common.ecommerce.lingxing.LingxingConstants; import common.ecommerce.lingxing.adapter.LingxingAdapter; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.Platform; -import common.ecommerce.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.inbound.InboundReceipt; -import common.ecommerce.model.inbound.InboundReceiptQuery; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.inbound.InboundShipmentTimeType; -import common.ecommerce.model.support.Page; -import common.ecommerce.model.support.PlatformTime; -import common.ecommerce.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelSdk; -import common.ecommerce.spi.ChannelSecret; -import common.ecommerce.testkit.InMemoryAccounts; -import common.ecommerce.testkit.InMemoryLockProvider; -import common.ecommerce.testkit.InMemoryTokenStore; +import common.ecommerce.shared.model.ChannelProvider; +import common.ecommerce.shared.model.Platform; +import common.ecommerce.channel.model.account.AccountKey; +import common.ecommerce.channel.model.account.ChannelAccount; +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.model.inbound.InboundShipmentTimeType; +import common.ecommerce.shared.support.Page; +import common.ecommerce.shared.support.PlatformTime; +import common.ecommerce.channel.sdk.ChannelConnection; +import common.ecommerce.channel.sdk.ChannelSdk; +import common.ecommerce.shared.spi.ChannelSecret; +import common.ecommerce.shared.testkit.InMemoryAccounts; +import common.ecommerce.shared.testkit.InMemoryLockProvider; +import common.ecommerce.shared.testkit.InMemoryTokenStore; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledIfSystemProperty; diff --git a/testkit/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java b/testkit/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java index 7ea19d4..f825295 100644 --- a/testkit/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java +++ b/testkit/src/main/java/common/ecommerce/shared/testkit/FakeDirectAdapter.java @@ -1,6 +1,8 @@ package common.ecommerce.shared.testkit; import common.ecommerce.channel.capability.AfterSaleCapable; +import common.ecommerce.channel.capability.InboundReceiptCapable; +import common.ecommerce.channel.capability.InboundShipmentCapable; import common.ecommerce.channel.capability.ProductCapable; import common.ecommerce.channel.capability.SalesOrderCapable; import common.ecommerce.shared.error.ChannelException; @@ -10,6 +12,10 @@ import common.ecommerce.channel.model.aftersale.AfterSale; import common.ecommerce.channel.model.aftersale.AfterSaleQuery; import common.ecommerce.channel.model.aftersale.AfterSaleType; import common.ecommerce.channel.model.account.ChannelAccount; +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.shared.model.ChannelProvider; import common.ecommerce.shared.support.Money; import common.ecommerce.channel.model.order.OrderLine; diff --git a/testkit/src/test/java/common/ecommerce/shared/testkit/SdkFacadeCallTest.java b/testkit/src/test/java/common/ecommerce/shared/testkit/SdkFacadeCallTest.java index fa7727b..2ae4224 100644 --- a/testkit/src/test/java/common/ecommerce/shared/testkit/SdkFacadeCallTest.java +++ b/testkit/src/test/java/common/ecommerce/shared/testkit/SdkFacadeCallTest.java @@ -19,29 +19,10 @@ import common.ecommerce.shared.support.Page; import common.ecommerce.channel.sdk.ChannelConnection; import common.ecommerce.channel.sdk.ChannelSdk; import common.ecommerce.shared.spi.ChannelSecret; -import common.ecommerce.capability.CapabilityReport; -import common.ecommerce.error.ChannelException; -import common.ecommerce.model.Capability; -import common.ecommerce.model.ChannelProvider; -import common.ecommerce.model.Platform; -import common.ecommerce.model.account.AccountKey; -import common.ecommerce.model.account.ChannelAccount; -import common.ecommerce.model.aftersale.AfterSale; -import common.ecommerce.model.aftersale.AfterSaleQuery; -import common.ecommerce.model.aftersale.AfterSaleType; -import common.ecommerce.model.inbound.InboundReceipt; -import common.ecommerce.model.inbound.InboundReceiptQuery; -import common.ecommerce.model.inbound.InboundShipment; -import common.ecommerce.model.inbound.InboundShipmentQuery; -import common.ecommerce.model.order.SalesOrder; -import common.ecommerce.model.order.SalesOrderQuery; -import common.ecommerce.model.product.ProductListing; -import common.ecommerce.model.product.ProductQuery; -import common.ecommerce.model.product.ProductStatus; -import common.ecommerce.model.support.Page; -import common.ecommerce.sdk.ChannelConnection; -import common.ecommerce.sdk.ChannelSdk; -import common.ecommerce.spi.ChannelSecret; +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 org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;