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/servicecomb-pack.git
commit 2b363d4f322da2ff160292b2b9fd63d77ca94eff Author: Lei Zhang <[email protected]> AuthorDate: Wed Aug 7 11:28:32 2019 +0800 SCB-1411 Refactoring the alpha-fms module Move org.apache.servicecomb.pack.alpha.fsm.repository.model to the alpha-core module --- alpha/alpha-core/pom.xml | 17 ++++++++++++++++- .../pack/alpha/core}/fsm/SagaActorState.java | 2 +- .../pack/alpha/core}/fsm/TransactionType.java | 2 +- .../servicecomb/pack/alpha/core}/fsm/TxState.java | 2 +- .../core}/fsm/repository/model/GlobalTransaction.java | 6 +++--- .../fsm/repository/model/PagingGlobalTransactions.java | 2 +- .../core}/fsm/repository/model/SagaSubTransaction.java | 4 ++-- .../apache/servicecomb/pack/alpha/fsm/SagaActor.java | 2 ++ .../pack/alpha/fsm/domain/AddTxEventDomain.java | 2 +- .../pack/alpha/fsm/domain/SagaEndedDomain.java | 2 +- .../pack/alpha/fsm/domain/UpdateTxEventDomain.java | 2 +- .../servicecomb/pack/alpha/fsm/model/SagaData.java | 2 +- .../servicecomb/pack/alpha/fsm/model/TxEntity.java | 2 +- .../AbstractTransactionRepositoryChannel.java | 2 +- .../alpha/fsm/repository/NoneTransactionRepository.java | 4 ++-- .../alpha/fsm/repository/TransactionRepository.java | 4 ++-- .../fsm/repository/TransactionRepositoryChannel.java | 2 +- .../channel/MemoryTransactionRepositoryChannel.java | 2 +- .../ElasticsearchTransactionRepository.java | 4 ++-- .../elasticsearch/GlobalTransactionDocument.java | 2 +- .../fsm/spring/integration/akka/SagaDataExtension.java | 8 ++++---- .../servicecomb/pack/alpha/fsm/SagaActorTest.java | 2 ++ .../servicecomb/pack/alpha/fsm/SagaIntegrationTest.java | 6 ++++-- .../ElasticsearchTransactionRepositoryTest.java | 6 +++--- .../pack/alpha/server/api/APIControllerV1.java | 4 ++-- .../pack/alpha/server/api/APIControllerV1Tests.java | 12 ++++++------ .../pack/alpha/server/fsm/AlphaIntegrationFsmTest.java | 4 ++-- 27 files changed, 65 insertions(+), 44 deletions(-) diff --git a/alpha/alpha-core/pom.xml b/alpha/alpha-core/pom.xml index 65f4d7c..5af6514 100644 --- a/alpha/alpha-core/pom.xml +++ b/alpha/alpha-core/pom.xml @@ -28,7 +28,17 @@ <artifactId>alpha-core</artifactId> <name>Pack::Alpha::Core</name> - + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-persistence_2.12</artifactId> + <version>${akka.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>org.apache.servicecomb.pack</groupId> @@ -87,6 +97,11 @@ <artifactId>jackson-databind</artifactId> <version>${jackson.version}</version> </dependency> + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-persistence_2.12</artifactId> + <scope>provided</scope> + </dependency> </dependencies> diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/SagaActorState.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/SagaActorState.java similarity index 95% rename from alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/SagaActorState.java rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/SagaActorState.java index 7c7c6ad..640066c 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/SagaActorState.java +++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/SagaActorState.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.pack.alpha.fsm; +package org.apache.servicecomb.pack.alpha.core.fsm; import akka.persistence.fsm.PersistentFSM; diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/TransactionType.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/TransactionType.java similarity index 94% rename from alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/TransactionType.java rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/TransactionType.java index 7184783..5826ed6 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/TransactionType.java +++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/TransactionType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.pack.alpha.fsm; +package org.apache.servicecomb.pack.alpha.core.fsm; public enum TransactionType { SAGA diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/TxState.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/TxState.java similarity index 94% rename from alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/TxState.java rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/TxState.java index 655db30..747cfc1 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/TxState.java +++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/TxState.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.pack.alpha.fsm; +package org.apache.servicecomb.pack.alpha.core.fsm; public enum TxState { ACTIVE, diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/GlobalTransaction.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/GlobalTransaction.java similarity index 95% rename from alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/GlobalTransaction.java rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/GlobalTransaction.java index f992342..53da46d 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/GlobalTransaction.java +++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/GlobalTransaction.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.pack.alpha.fsm.repository.model; +package org.apache.servicecomb.pack.alpha.core.fsm.repository.model; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.ArrayList; @@ -23,8 +23,8 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.apache.servicecomb.pack.alpha.fsm.SagaActorState; -import org.apache.servicecomb.pack.alpha.fsm.TransactionType; +import org.apache.servicecomb.pack.alpha.core.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.core.fsm.TransactionType; import org.apache.servicecomb.pack.alpha.core.fsm.event.base.BaseEvent; public class GlobalTransaction { diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/PagingGlobalTransactions.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/PagingGlobalTransactions.java similarity index 97% rename from alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/PagingGlobalTransactions.java rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/PagingGlobalTransactions.java index 720193a..77abfd4 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/PagingGlobalTransactions.java +++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/PagingGlobalTransactions.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.pack.alpha.fsm.repository.model; +package org.apache.servicecomb.pack.alpha.core.fsm.repository.model; import java.util.List; diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/SagaSubTransaction.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/SagaSubTransaction.java similarity index 95% rename from alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/SagaSubTransaction.java rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/SagaSubTransaction.java index 0c07f35..f0358e7 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/SagaSubTransaction.java +++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/SagaSubTransaction.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.servicecomb.pack.alpha.fsm.repository.model; +package org.apache.servicecomb.pack.alpha.core.fsm.repository.model; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; -import org.apache.servicecomb.pack.alpha.fsm.TxState; +import org.apache.servicecomb.pack.alpha.core.fsm.TxState; public class SagaSubTransaction { private String localTxId; diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/SagaActor.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/SagaActor.java index ad0b8a5..117bc3a 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/SagaActor.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/SagaActor.java @@ -25,6 +25,8 @@ import java.util.Collections; import java.util.Date; import java.util.concurrent.TimeUnit; import org.apache.servicecomb.pack.alpha.core.AlphaException; +import org.apache.servicecomb.pack.alpha.core.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.core.fsm.TxState; import org.apache.servicecomb.pack.alpha.fsm.domain.AddTxEventDomain; import org.apache.servicecomb.pack.alpha.fsm.domain.DomainEvent; import org.apache.servicecomb.pack.alpha.fsm.domain.SagaEndedDomain; diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/domain/AddTxEventDomain.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/domain/AddTxEventDomain.java index 9f4e95b..0e410a3 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/domain/AddTxEventDomain.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/domain/AddTxEventDomain.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.pack.alpha.fsm.domain; -import org.apache.servicecomb.pack.alpha.fsm.TxState; +import org.apache.servicecomb.pack.alpha.core.fsm.TxState; import org.apache.servicecomb.pack.alpha.core.fsm.event.TxStartedEvent; import org.apache.servicecomb.pack.alpha.core.fsm.event.base.BaseEvent; diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/domain/SagaEndedDomain.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/domain/SagaEndedDomain.java index 778feca..c8247f8 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/domain/SagaEndedDomain.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/domain/SagaEndedDomain.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.pack.alpha.fsm.domain; -import org.apache.servicecomb.pack.alpha.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.core.fsm.SagaActorState; import org.apache.servicecomb.pack.alpha.core.fsm.event.base.BaseEvent; public class SagaEndedDomain implements DomainEvent { diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/domain/UpdateTxEventDomain.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/domain/UpdateTxEventDomain.java index 86aa775..f74d3e6 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/domain/UpdateTxEventDomain.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/domain/UpdateTxEventDomain.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.pack.alpha.fsm.domain; -import org.apache.servicecomb.pack.alpha.fsm.TxState; +import org.apache.servicecomb.pack.alpha.core.fsm.TxState; import org.apache.servicecomb.pack.alpha.core.fsm.event.TxAbortedEvent; import org.apache.servicecomb.pack.alpha.core.fsm.event.TxCompensatedEvent; import org.apache.servicecomb.pack.alpha.core.fsm.event.TxEndedEvent; diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/model/SagaData.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/model/SagaData.java index 5b214f2..b3c6483 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/model/SagaData.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/model/SagaData.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -import org.apache.servicecomb.pack.alpha.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.core.fsm.SagaActorState; import org.apache.servicecomb.pack.alpha.core.fsm.event.base.BaseEvent; public class SagaData implements Serializable { diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/model/TxEntity.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/model/TxEntity.java index 9928283..5fd6430 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/model/TxEntity.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/model/TxEntity.java @@ -20,7 +20,7 @@ package org.apache.servicecomb.pack.alpha.fsm.model; import java.io.Serializable; import java.util.Date; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.servicecomb.pack.alpha.fsm.TxState; +import org.apache.servicecomb.pack.alpha.core.fsm.TxState; public class TxEntity implements Serializable { private String serviceName; diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/AbstractTransactionRepositoryChannel.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/AbstractTransactionRepositoryChannel.java index 01727d2..0dc7593 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/AbstractTransactionRepositoryChannel.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/AbstractTransactionRepositoryChannel.java @@ -18,7 +18,7 @@ package org.apache.servicecomb.pack.alpha.fsm.repository; import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsService; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.GlobalTransaction; public abstract class AbstractTransactionRepositoryChannel implements TransactionRepositoryChannel { diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/NoneTransactionRepository.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/NoneTransactionRepository.java index a50bd47..5ebc21c 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/NoneTransactionRepository.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/NoneTransactionRepository.java @@ -18,8 +18,8 @@ package org.apache.servicecomb.pack.alpha.fsm.repository; import java.lang.invoke.MethodHandles; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGlobalTransactions; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.GlobalTransaction; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.PagingGlobalTransactions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepository.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepository.java index 463ff59..fd303d4 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepository.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepository.java @@ -17,8 +17,8 @@ package org.apache.servicecomb.pack.alpha.fsm.repository; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGlobalTransactions; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.GlobalTransaction; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.PagingGlobalTransactions; public interface TransactionRepository { diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepositoryChannel.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepositoryChannel.java index 7c85e9d..b571911 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepositoryChannel.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepositoryChannel.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.pack.alpha.fsm.repository; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.GlobalTransaction; public interface TransactionRepositoryChannel { void send(GlobalTransaction transaction); diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/channel/MemoryTransactionRepositoryChannel.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/channel/MemoryTransactionRepositoryChannel.java index abc5add..ebea958 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/channel/MemoryTransactionRepositoryChannel.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/channel/MemoryTransactionRepositoryChannel.java @@ -21,7 +21,7 @@ import java.lang.invoke.MethodHandles; import java.util.concurrent.LinkedBlockingQueue; import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsService; import org.apache.servicecomb.pack.alpha.fsm.repository.AbstractTransactionRepositoryChannel; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.GlobalTransaction; import org.apache.servicecomb.pack.alpha.fsm.repository.TransactionRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java index 45510e4..4ccc5c4 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java @@ -26,8 +26,8 @@ import java.util.Collections; import java.util.List; import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsService; import org.apache.servicecomb.pack.alpha.fsm.repository.TransactionRepository; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGlobalTransactions; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.GlobalTransaction; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.PagingGlobalTransactions; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/GlobalTransactionDocument.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/GlobalTransactionDocument.java index ebd542f..dd23ef7 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/GlobalTransactionDocument.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/GlobalTransactionDocument.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.pack.alpha.fsm.repository.elasticsearch; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.GlobalTransaction; import org.springframework.data.elasticsearch.annotations.Document; @Document(indexName = ElasticsearchTransactionRepository.INDEX_NAME, type = ElasticsearchTransactionRepository.INDEX_TYPE) diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/SagaDataExtension.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/SagaDataExtension.java index b741453..c2df49f 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/SagaDataExtension.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/SagaDataExtension.java @@ -24,12 +24,12 @@ import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ConcurrentHashMap; -import org.apache.servicecomb.pack.alpha.fsm.SagaActorState; -import org.apache.servicecomb.pack.alpha.fsm.TransactionType; +import org.apache.servicecomb.pack.alpha.core.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.core.fsm.TransactionType; import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsService; import org.apache.servicecomb.pack.alpha.fsm.model.SagaData; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.SagaSubTransaction; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.GlobalTransaction; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.SagaSubTransaction; import org.apache.servicecomb.pack.alpha.fsm.repository.TransactionRepositoryChannel; import org.apache.servicecomb.pack.alpha.fsm.spring.integration.akka.SagaDataExtension.SagaDataExt; import org.slf4j.Logger; diff --git a/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaActorTest.java b/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaActorTest.java index acd43d8..95d97fb 100644 --- a/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaActorTest.java +++ b/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaActorTest.java @@ -33,6 +33,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; +import org.apache.servicecomb.pack.alpha.core.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.core.fsm.TxState; import org.apache.servicecomb.pack.alpha.core.fsm.event.base.BaseEvent; import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsService; import org.apache.servicecomb.pack.alpha.fsm.model.SagaData; diff --git a/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java b/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java index f09de72..0d1ec9c 100644 --- a/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java +++ b/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/SagaIntegrationTest.java @@ -24,6 +24,8 @@ import static org.junit.Assert.assertNotNull; import akka.actor.ActorSystem; import java.util.UUID; +import org.apache.servicecomb.pack.alpha.core.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.core.fsm.TxState; import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsService; import org.apache.servicecomb.pack.alpha.fsm.model.SagaData; import org.apache.servicecomb.pack.alpha.fsm.sink.SagaActorEventSender; @@ -83,13 +85,13 @@ public class SagaIntegrationTest { }); await().atMost(2, SECONDS).until(() -> { SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData(); - return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()==SagaActorState.COMMITTED; + return sagaData !=null && sagaData.isTerminated() && sagaData.getLastState()== SagaActorState.COMMITTED; }); SagaData sagaData = SagaDataExtension.SAGA_DATA_EXTENSION_PROVIDER.get(system).getLastSagaData(); assertNotNull(sagaData.getBeginTime()); assertNotNull(sagaData.getEndTime()); assertEquals(sagaData.getTxEntityMap().size(),3); - assertEquals(sagaData.getTxEntityMap().get(localTxId_1).getState(),TxState.COMMITTED); + assertEquals(sagaData.getTxEntityMap().get(localTxId_1).getState(), TxState.COMMITTED); assertEquals(sagaData.getTxEntityMap().get(localTxId_2).getState(),TxState.COMMITTED); assertEquals(sagaData.getTxEntityMap().get(localTxId_3).getState(),TxState.COMMITTED); assertEquals(metricsService.metrics().getActorReceived(),8); diff --git a/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/repository/ElasticsearchTransactionRepositoryTest.java b/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/repository/ElasticsearchTransactionRepositoryTest.java index e29585c..fc4736f 100644 --- a/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/repository/ElasticsearchTransactionRepositoryTest.java +++ b/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/repository/ElasticsearchTransactionRepositoryTest.java @@ -24,11 +24,11 @@ import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.Date; import java.util.UUID; -import org.apache.servicecomb.pack.alpha.fsm.SagaActorState; -import org.apache.servicecomb.pack.alpha.fsm.TransactionType; +import org.apache.servicecomb.pack.alpha.core.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.core.fsm.TransactionType; import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsService; import org.apache.servicecomb.pack.alpha.fsm.repository.elasticsearch.ElasticsearchTransactionRepository; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.GlobalTransaction; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1.java index 88f718d..88148db 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1.java @@ -18,8 +18,8 @@ package org.apache.servicecomb.pack.alpha.server.api; import org.apache.servicecomb.pack.alpha.fsm.repository.TransactionRepository; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGlobalTransactions; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.GlobalTransaction; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.PagingGlobalTransactions; import org.apache.servicecomb.pack.alpha.server.metrics.AlphaMetrics; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1Tests.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1Tests.java index 9a7a854..90bad61 100644 --- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1Tests.java +++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1Tests.java @@ -32,9 +32,9 @@ import java.util.List; import java.util.UUID; import org.apache.servicecomb.pack.alpha.core.NodeStatus; import org.apache.servicecomb.pack.alpha.core.NodeStatus.TypeEnum; -import org.apache.servicecomb.pack.alpha.fsm.SagaActorState; -import org.apache.servicecomb.pack.alpha.fsm.TransactionType; -import org.apache.servicecomb.pack.alpha.fsm.TxState; +import org.apache.servicecomb.pack.alpha.core.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.core.fsm.TransactionType; +import org.apache.servicecomb.pack.alpha.core.fsm.TxState; import org.apache.servicecomb.pack.alpha.core.fsm.event.SagaEndedEvent; import org.apache.servicecomb.pack.alpha.core.fsm.event.SagaStartedEvent; import org.apache.servicecomb.pack.alpha.core.fsm.event.TxEndedEvent; @@ -43,9 +43,9 @@ import org.apache.servicecomb.pack.alpha.core.fsm.event.base.BaseEvent; import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsBean; import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsService; import org.apache.servicecomb.pack.alpha.fsm.repository.TransactionRepository; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGlobalTransactions; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.SagaSubTransaction; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.GlobalTransaction; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.PagingGlobalTransactions; +import org.apache.servicecomb.pack.alpha.core.fsm.repository.model.SagaSubTransaction; import org.apache.servicecomb.pack.alpha.server.metrics.AlphaMetrics; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/fsm/AlphaIntegrationFsmTest.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/fsm/AlphaIntegrationFsmTest.java index 8b38c54..ff9d5a9 100644 --- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/fsm/AlphaIntegrationFsmTest.java +++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/fsm/AlphaIntegrationFsmTest.java @@ -29,8 +29,8 @@ import io.grpc.netty.NettyChannelBuilder; import java.util.Map; import java.util.UUID; import org.apache.servicecomb.pack.alpha.core.OmegaCallback; -import org.apache.servicecomb.pack.alpha.fsm.SagaActorState; -import org.apache.servicecomb.pack.alpha.fsm.TxState; +import org.apache.servicecomb.pack.alpha.core.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.core.fsm.TxState; import org.apache.servicecomb.pack.alpha.fsm.model.SagaData; import org.apache.servicecomb.pack.alpha.fsm.spring.integration.akka.SagaDataExtension; import org.apache.servicecomb.pack.alpha.server.AlphaApplication;
