This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 96d09dcec42cbde956809bab73e6ca6efff1dc40 Author: cherrylzhao <[email protected]> AuthorDate: Mon Aug 27 14:39:40 2018 +0800 SCB-856 Refactor TCC alpha server package. --- .../java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java | 4 ++-- .../servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java | 4 ++++ .../saga/alpha/server/tcc/{ => callback}/CallbackEngine.java | 2 +- .../saga/alpha/server/tcc/{ => callback}/GrpcOmegaTccCallback.java | 3 ++- .../saga/alpha/server/tcc/{ => callback}/OmegaCallback.java | 2 +- .../saga/alpha/server/tcc/{ => callback}/OmegaCallbackWrapper.java | 3 ++- .../saga/alpha/server/tcc/{ => callback}/TccCallbackEngine.java | 3 ++- .../alpha/server/tcc/{ => registry}/OmegaCallbacksRegistry.java | 4 +++- .../alpha/server/tcc/{ => registry}/TransactionEventRegistry.java | 2 +- .../servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java | 6 +++--- 10 files changed, 21 insertions(+), 12 deletions(-) diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java index 91143f4..d332be2 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/AlphaConfig.java @@ -35,8 +35,8 @@ import org.apache.servicecomb.saga.alpha.core.TxConsistentService; import org.apache.servicecomb.saga.alpha.core.TxEventRepository; import org.apache.servicecomb.saga.alpha.core.TxTimeoutRepository; import org.apache.servicecomb.saga.alpha.server.tcc.GrpcTccEventService; -import org.apache.servicecomb.saga.alpha.server.tcc.OmegaCallbackWrapper; -import org.apache.servicecomb.saga.alpha.server.tcc.TccCallbackEngine; +import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallbackWrapper; +import org.apache.servicecomb.saga.alpha.server.tcc.callback.TccCallbackEngine; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.Bean; diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java index aa20f77..27410e2 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcTccEventService.java @@ -18,7 +18,11 @@ package org.apache.servicecomb.saga.alpha.server.tcc; import io.grpc.stub.StreamObserver; +import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallback; +import org.apache.servicecomb.saga.alpha.server.tcc.registry.OmegaCallbacksRegistry; +import org.apache.servicecomb.saga.alpha.server.tcc.callback.TccCallbackEngine; import org.apache.servicecomb.saga.alpha.server.tcc.event.ParticipateEventFactory; +import org.apache.servicecomb.saga.alpha.server.tcc.registry.TransactionEventRegistry; import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck; import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig; import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand; diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/CallbackEngine.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/CallbackEngine.java similarity index 94% rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/CallbackEngine.java rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/CallbackEngine.java index e69eb6a..a8521e6 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/CallbackEngine.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/CallbackEngine.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.saga.alpha.server.tcc; +package org.apache.servicecomb.saga.alpha.server.tcc.callback; import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionEndedEvent; diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcOmegaTccCallback.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java similarity index 93% rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcOmegaTccCallback.java rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java index e1fb68a..cf8eb8d 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/GrpcOmegaTccCallback.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/GrpcOmegaTccCallback.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package org.apache.servicecomb.saga.alpha.server.tcc; +package org.apache.servicecomb.saga.alpha.server.tcc.callback; import io.grpc.stub.StreamObserver; +import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallback; import org.apache.servicecomb.saga.alpha.server.tcc.event.ParticipatedEvent; import org.apache.servicecomb.saga.common.TransactionStatus; import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand; diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/OmegaCallback.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallback.java similarity index 94% rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/OmegaCallback.java rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallback.java index 41a6c06..02ae7a6 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/OmegaCallback.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallback.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.saga.alpha.server.tcc; +package org.apache.servicecomb.saga.alpha.server.tcc.callback; import org.apache.servicecomb.saga.alpha.server.tcc.event.ParticipatedEvent; import org.apache.servicecomb.saga.common.TransactionStatus; diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/OmegaCallbackWrapper.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java similarity index 90% rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/OmegaCallbackWrapper.java rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java index 3b55ffa..62c183a 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/OmegaCallbackWrapper.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/OmegaCallbackWrapper.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package org.apache.servicecomb.saga.alpha.server.tcc; +package org.apache.servicecomb.saga.alpha.server.tcc.callback; import org.apache.servicecomb.saga.alpha.server.tcc.event.ParticipatedEvent; +import org.apache.servicecomb.saga.alpha.server.tcc.registry.OmegaCallbacksRegistry; import org.apache.servicecomb.saga.common.TransactionStatus; public class OmegaCallbackWrapper implements OmegaCallback { diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngine.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java similarity index 94% rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngine.java rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java index f9aae88..bcdca6d 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/TccCallbackEngine.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/callback/TccCallbackEngine.java @@ -15,9 +15,10 @@ * limitations under the License. */ -package org.apache.servicecomb.saga.alpha.server.tcc; +package org.apache.servicecomb.saga.alpha.server.tcc.callback; import java.lang.invoke.MethodHandles; +import org.apache.servicecomb.saga.alpha.server.tcc.registry.TransactionEventRegistry; import org.apache.servicecomb.saga.alpha.server.tcc.event.ParticipatedEvent; import org.apache.servicecomb.saga.common.TransactionStatus; import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionEndedEvent; diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/OmegaCallbacksRegistry.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/registry/OmegaCallbacksRegistry.java similarity index 94% rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/OmegaCallbacksRegistry.java rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/registry/OmegaCallbacksRegistry.java index 9e228da..02340b2 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/OmegaCallbacksRegistry.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/registry/OmegaCallbacksRegistry.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.saga.alpha.server.tcc; +package org.apache.servicecomb.saga.alpha.server.tcc.registry; import static java.util.Collections.emptyMap; @@ -24,6 +24,8 @@ import java.lang.invoke.MethodHandles; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.apache.servicecomb.saga.alpha.core.AlphaException; +import org.apache.servicecomb.saga.alpha.server.tcc.callback.GrpcOmegaTccCallback; +import org.apache.servicecomb.saga.alpha.server.tcc.callback.OmegaCallback; import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig; import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand; import org.slf4j.Logger; diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/TransactionEventRegistry.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/registry/TransactionEventRegistry.java similarity index 96% rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/TransactionEventRegistry.java rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/registry/TransactionEventRegistry.java index 6218304..2304f52 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/TransactionEventRegistry.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/tcc/registry/TransactionEventRegistry.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.saga.alpha.server.tcc; +package org.apache.servicecomb.saga.alpha.server.tcc.registry; import java.util.LinkedHashSet; import java.util.Map; diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java index 50b992f..503d80a 100644 --- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java +++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java @@ -30,9 +30,9 @@ import java.util.Queue; import java.util.UUID; import java.util.concurrent.ConcurrentLinkedQueue; import org.apache.servicecomb.saga.alpha.server.AlphaApplication; -import org.apache.servicecomb.saga.alpha.server.tcc.GrpcOmegaTccCallback; -import org.apache.servicecomb.saga.alpha.server.tcc.OmegaCallbacksRegistry; -import org.apache.servicecomb.saga.alpha.server.tcc.TransactionEventRegistry; +import org.apache.servicecomb.saga.alpha.server.tcc.callback.GrpcOmegaTccCallback; +import org.apache.servicecomb.saga.alpha.server.tcc.registry.OmegaCallbacksRegistry; +import org.apache.servicecomb.saga.alpha.server.tcc.registry.TransactionEventRegistry; import org.apache.servicecomb.saga.alpha.server.tcc.event.ParticipatedEvent; import org.apache.servicecomb.saga.common.TransactionStatus; import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
