diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapter.java b/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java similarity index 96% rename from lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapter.java rename to lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java index 8df2f90..f853883 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapter.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapter.java @@ -1,4 +1,11 @@ -package common.ecommerce.lingxing; +package common.ecommerce.lingxing.adapter; +import common.ecommerce.lingxing.LingxingConstants; +import common.ecommerce.lingxing.http.LingxingEnvelope; +import common.ecommerce.lingxing.dto.LingxingOrderDto; +import common.ecommerce.lingxing.mapper.LingxingOrderMapper; +import common.ecommerce.lingxing.http.LingxingRateLimiter; +import common.ecommerce.lingxing.http.LingxingRequestFactory; +import common.ecommerce.lingxing.auth.LingxingTokenClient; import common.ecommerce.capability.AggregatorCapable; import common.ecommerce.capability.SalesOrderCapable; @@ -9,7 +16,6 @@ import common.ecommerce.http.HttpResponse; import common.ecommerce.http.HttpTransport; import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.http.TokenManager; -import common.ecommerce.lingxing.dto.LingxingOrderDto; import common.ecommerce.model.Capability; import common.ecommerce.model.account.ChannelAccount; import common.ecommerce.model.ChannelProvider; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapterFactory.java b/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java similarity index 94% rename from lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapterFactory.java rename to lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java index c62fd43..56c2f65 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingAdapterFactory.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/adapter/LingxingAdapterFactory.java @@ -1,4 +1,5 @@ -package common.ecommerce.lingxing; +package common.ecommerce.lingxing.adapter; +import common.ecommerce.lingxing.LingxingConstants; import common.ecommerce.capability.PlatformAdapter; import common.ecommerce.model.ChannelProvider; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingTokenClient.java b/lingxing/src/main/java/common/ecommerce/lingxing/auth/LingxingTokenClient.java similarity index 98% rename from lingxing/src/main/java/common/ecommerce/lingxing/LingxingTokenClient.java rename to lingxing/src/main/java/common/ecommerce/lingxing/auth/LingxingTokenClient.java index 3ed5fa4..6246ade 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingTokenClient.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/auth/LingxingTokenClient.java @@ -1,4 +1,5 @@ -package common.ecommerce.lingxing; +package common.ecommerce.lingxing.auth; +import common.ecommerce.lingxing.LingxingConstants; import common.ecommerce.error.AuthException; import common.ecommerce.error.ChannelException; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingEnvelope.java b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java similarity index 97% rename from lingxing/src/main/java/common/ecommerce/lingxing/LingxingEnvelope.java rename to lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java index 647a5ad..7a4f7ba 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingEnvelope.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingEnvelope.java @@ -1,4 +1,5 @@ -package common.ecommerce.lingxing; +package common.ecommerce.lingxing.http; +import common.ecommerce.lingxing.LingxingConstants; import common.ecommerce.error.AuthException; import common.ecommerce.error.ChannelException; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingRateLimiter.java b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRateLimiter.java similarity index 85% rename from lingxing/src/main/java/common/ecommerce/lingxing/LingxingRateLimiter.java rename to lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRateLimiter.java index b94380e..f08f31d 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingRateLimiter.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRateLimiter.java @@ -1,4 +1,4 @@ -package common.ecommerce.lingxing; +package common.ecommerce.lingxing.http; import java.util.HashMap; import java.util.Map; @@ -12,10 +12,10 @@ import java.util.function.LongSupplier; * *

进程内实现,多实例部署会叠加;需要跨实例限流时由宿主替换。

*/ -final class LingxingRateLimiter { +public final class LingxingRateLimiter { /** 便于测试注入,生产用 {@link Thread#sleep}。 */ - interface Sleeper { + public interface Sleeper { void sleep(long millis, int nanos); } @@ -23,7 +23,7 @@ final class LingxingRateLimiter { private final Sleeper sleeper; private final LongSupplier nanoClock; - LingxingRateLimiter() { + public LingxingRateLimiter() { this(new Sleeper() { @Override public void sleep(long millis, int nanos) { @@ -41,13 +41,13 @@ final class LingxingRateLimiter { }); } - LingxingRateLimiter(Sleeper sleeper, LongSupplier nanoClock) { + public LingxingRateLimiter(Sleeper sleeper, LongSupplier nanoClock) { this.sleeper = sleeper; this.nanoClock = nanoClock; } /** 同一路径两次调用之间至少间隔 {@code 1e9 / permitsPerSecond} 纳秒。 */ - synchronized void acquire(String path, int permitsPerSecond) { + public synchronized void acquire(String path, int permitsPerSecond) { if (permitsPerSecond <= 0) { return; } diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingRequestFactory.java b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java similarity index 92% rename from lingxing/src/main/java/common/ecommerce/lingxing/LingxingRequestFactory.java rename to lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java index 8e298ff..d18622e 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingRequestFactory.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingRequestFactory.java @@ -1,4 +1,4 @@ -package common.ecommerce.lingxing; +package common.ecommerce.lingxing.http; import common.ecommerce.http.HttpRequest; import common.ecommerce.http.JacksonJsonCodec; @@ -23,17 +23,17 @@ import java.util.Map; * *

{@code access_token} 只放 {@code Authorization} 头、不进 query,但必须参与签名。

*/ -final class LingxingRequestFactory { +public final class LingxingRequestFactory { private final JacksonJsonCodec json; private final Clock clock; - LingxingRequestFactory(JacksonJsonCodec json, Clock clock) { + public LingxingRequestFactory(JacksonJsonCodec json, Clock clock) { this.json = json; this.clock = clock; } - HttpRequest post(String baseUrl, String path, Map body, ChannelSecret secret, + public HttpRequest post(String baseUrl, String path, Map body, ChannelSecret secret, AccessToken token, ChannelContext ctx, String operation) { Map payload = withoutNulls(body); diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingSigner.java b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingSigner.java similarity index 98% rename from lingxing/src/main/java/common/ecommerce/lingxing/LingxingSigner.java rename to lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingSigner.java index 3992962..c8d02ff 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingSigner.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/http/LingxingSigner.java @@ -1,4 +1,4 @@ -package common.ecommerce.lingxing; +package common.ecommerce.lingxing.http; import common.ecommerce.spi.ChannelSecret; diff --git a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingOrderMapper.java b/lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java similarity index 99% rename from lingxing/src/main/java/common/ecommerce/lingxing/LingxingOrderMapper.java rename to lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java index f9396f4..6224f84 100644 --- a/lingxing/src/main/java/common/ecommerce/lingxing/LingxingOrderMapper.java +++ b/lingxing/src/main/java/common/ecommerce/lingxing/mapper/LingxingOrderMapper.java @@ -1,10 +1,10 @@ -package common.ecommerce.lingxing; - -import common.ecommerce.http.JacksonJsonCodec; +package common.ecommerce.lingxing.mapper; import common.ecommerce.lingxing.dto.LingxingOrderDto; import common.ecommerce.lingxing.dto.LingxingOrderItemDto; import common.ecommerce.lingxing.dto.LingxingPlatformInfoDto; import common.ecommerce.lingxing.dto.LingxingTransactionInfoDto; + +import common.ecommerce.http.JacksonJsonCodec; import common.ecommerce.model.ChannelProvider; import common.ecommerce.model.order.OrderLine; import common.ecommerce.model.order.SalesOrder; diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingLiveSmokeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java similarity index 97% rename from lingxing/src/test/java/common/ecommerce/lingxing/LingxingLiveSmokeTest.java rename to lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java index cd97e16..1cac30d 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingLiveSmokeTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/adapter/LingxingLiveSmokeTest.java @@ -1,4 +1,6 @@ -package common.ecommerce.lingxing; +package common.ecommerce.lingxing.adapter; +import common.ecommerce.lingxing.LingxingConstants; +import common.ecommerce.lingxing.auth.LingxingTokenClient; import common.ecommerce.http.HttpRequest; import common.ecommerce.http.HttpResponse; diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingEnvelopeTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingEnvelopeTest.java similarity index 98% rename from lingxing/src/test/java/common/ecommerce/lingxing/LingxingEnvelopeTest.java rename to lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingEnvelopeTest.java index 3cb663c..7316fd5 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingEnvelopeTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingEnvelopeTest.java @@ -1,4 +1,4 @@ -package common.ecommerce.lingxing; +package common.ecommerce.lingxing.http; import common.ecommerce.error.AuthException; import common.ecommerce.error.PlatformBusinessException; diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingRateLimiterTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRateLimiterTest.java similarity index 97% rename from lingxing/src/test/java/common/ecommerce/lingxing/LingxingRateLimiterTest.java rename to lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRateLimiterTest.java index 336392a..343ef40 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingRateLimiterTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRateLimiterTest.java @@ -1,4 +1,4 @@ -package common.ecommerce.lingxing; +package common.ecommerce.lingxing.http; import org.junit.jupiter.api.Test; diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingRequestFactoryTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRequestFactoryTest.java similarity index 98% rename from lingxing/src/test/java/common/ecommerce/lingxing/LingxingRequestFactoryTest.java rename to lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRequestFactoryTest.java index 5fd1270..4eba270 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingRequestFactoryTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingRequestFactoryTest.java @@ -1,4 +1,4 @@ -package common.ecommerce.lingxing; +package common.ecommerce.lingxing.http; import common.ecommerce.http.HttpRequest; import common.ecommerce.http.JacksonJsonCodec; diff --git a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingSignerTest.java b/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingSignerTest.java similarity index 97% rename from lingxing/src/test/java/common/ecommerce/lingxing/LingxingSignerTest.java rename to lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingSignerTest.java index 21bdb58..6d5fd6f 100644 --- a/lingxing/src/test/java/common/ecommerce/lingxing/LingxingSignerTest.java +++ b/lingxing/src/test/java/common/ecommerce/lingxing/http/LingxingSignerTest.java @@ -1,4 +1,4 @@ -package common.ecommerce.lingxing; +package common.ecommerce.lingxing.http; import org.junit.jupiter.api.Test;