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 228af3082a1d7903a061039583a2a51f3d3222b9 Author: Lei Zhang <[email protected]> AuthorDate: Wed Aug 7 12:36:47 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 | 15 --------------- .../core/fsm/repository/model/GlobalTransaction.java | 9 ++++----- .../org/apache/servicecomb/pack/alpha/fsm/SagaActor.java | 1 - .../servicecomb/pack/alpha}/fsm/SagaActorState.java | 2 +- .../pack/alpha/fsm/domain/SagaEndedDomain.java | 2 +- .../apache/servicecomb/pack/alpha/fsm/model/SagaData.java | 2 +- .../fsm/spring/integration/akka/SagaDataExtension.java | 4 ++-- .../apache/servicecomb/pack/alpha/fsm/SagaActorTest.java | 2 +- .../servicecomb/pack/alpha/fsm/SagaIntegrationTest.java | 2 +- .../ElasticsearchTransactionRepositoryTest.java | 8 ++++---- .../pack/alpha/server/api/APIControllerV1Tests.java | 10 +++++----- .../pack/alpha/server/fsm/AlphaIntegrationFsmTest.java | 2 +- 12 files changed, 21 insertions(+), 38 deletions(-) diff --git a/alpha/alpha-core/pom.xml b/alpha/alpha-core/pom.xml index 5af6514..5d91ca0 100644 --- a/alpha/alpha-core/pom.xml +++ b/alpha/alpha-core/pom.xml @@ -29,16 +29,6 @@ <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> @@ -97,11 +87,6 @@ <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-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/GlobalTransaction.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/GlobalTransaction.java index 53da46d..f4548bd 100644 --- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/GlobalTransaction.java +++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/repository/model/GlobalTransaction.java @@ -23,7 +23,6 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; import java.util.Map; -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; @@ -36,7 +35,7 @@ public class GlobalTransaction { private Date beginTime; @JsonFormat(shape = JsonFormat.Shape.NUMBER) private Date endTime; - private SagaActorState state; + private String state; private Integer subTxSize; private Long durationTime; private List<SagaSubTransaction> subTransactions = new ArrayList<>(); @@ -66,7 +65,7 @@ public class GlobalTransaction { return endTime; } - public SagaActorState getState() { + public String getState() { return state; } @@ -98,7 +97,7 @@ public class GlobalTransaction { private String instanceId; private Date beginTime; private Date endTime; - private SagaActorState state; + private String state; private Integer subTxSize; private List<SagaSubTransaction> subTransactions; private List<BaseEvent> events; @@ -136,7 +135,7 @@ public class GlobalTransaction { return this; } - public Builder state(SagaActorState state) { + public Builder state(String state) { this.state = state; return this; } 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 117bc3a..2734deb 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,7 +25,6 @@ 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; diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/SagaActorState.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/SagaActorState.java similarity index 95% rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/SagaActorState.java rename to alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/SagaActorState.java index 640066c..7c7c6ad 100644 --- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/fsm/SagaActorState.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/SagaActorState.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.pack.alpha.core.fsm; +package org.apache.servicecomb.pack.alpha.fsm; import akka.persistence.fsm.PersistentFSM; 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 c8247f8..778feca 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.core.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.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/model/SagaData.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/model/SagaData.java index b3c6483..5b214f2 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.core.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.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/spring/integration/akka/SagaDataExtension.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/SagaDataExtension.java index c2df49f..0451a83 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,7 +24,7 @@ import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; import java.util.concurrent.ConcurrentHashMap; -import org.apache.servicecomb.pack.alpha.core.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.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; @@ -82,7 +82,7 @@ public class SagaDataExtension extends AbstractExtensionId<SagaDataExt> { .globalTxId(sagaData.getGlobalTxId()) .beginTime(sagaData.getBeginTime()) .endTime(sagaData.getEndTime()) - .state(sagaData.getLastState()) + .state(sagaData.getLastState().name()) .subTxSize(sagaData.getTxEntityMap().size()) .subTransactions(subTransactions) .events(sagaData.getEvents()) 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 95d97fb..fe00de2 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,7 +33,7 @@ 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.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; 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 0d1ec9c..2acb135 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,7 +24,7 @@ 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.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; 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 fc4736f..cc7778b 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,7 +24,7 @@ import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.Date; import java.util.UUID; -import org.apache.servicecomb.pack.alpha.core.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.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; @@ -64,7 +64,7 @@ public class ElasticsearchTransactionRepositoryTest { .globalTxId(globalTxId) .beginTime(new Date()) .endTime(new Date()) - .state(SagaActorState.COMMITTED) + .state(SagaActorState.COMMITTED.name()) .subTxSize(0) .subTransactions(new ArrayList<>()) .events(new ArrayList<>()) @@ -94,7 +94,7 @@ public class ElasticsearchTransactionRepositoryTest { .globalTxId(globalTxId) .beginTime(new Date()) .endTime(new Date()) - .state(SagaActorState.COMMITTED) + .state(SagaActorState.COMMITTED.name()) .subTxSize(0) .subTransactions(new ArrayList<>()) .events(new ArrayList<>()) @@ -123,7 +123,7 @@ public class ElasticsearchTransactionRepositoryTest { .globalTxId(globalTxId) .beginTime(new Date()) .endTime(new Date()) - .state(SagaActorState.COMMITTED) + .state(SagaActorState.COMMITTED.name()) .subTxSize(0) .subTransactions(new ArrayList<>()) .events(new ArrayList<>()) 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 90bad61..502cf32 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,7 +32,7 @@ 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.core.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.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; @@ -172,7 +172,7 @@ public class APIControllerV1Tests { .instanceId(instanceId) .globalTxId(globalTxId) .type(TransactionType.SAGA) - .state(SagaActorState.COMMITTED) + .state(SagaActorState.COMMITTED.name()) .beginTime(new Date()) .endTime(new Date()) .subTxSize(3) @@ -214,7 +214,7 @@ public class APIControllerV1Tests { .andExpect(jsonPath("$.globalTransactions[0].endTime") .value(globalTransactions.get(0).getEndTime().getTime())) .andExpect(jsonPath("$.globalTransactions[0].state") - .value(globalTransactions.get(0).getState().name())) + .value(globalTransactions.get(0).getState())) .andExpect(jsonPath("$.globalTransactions[0].subTxSize") .value(globalTransactions.get(0).getSubTxSize())) .andExpect(jsonPath("$.globalTransactions[0].durationTime") @@ -267,7 +267,7 @@ public class APIControllerV1Tests { .instanceId(instanceId) .globalTxId(globalTxId) .type(TransactionType.SAGA) - .state(SagaActorState.COMMITTED) + .state(SagaActorState.COMMITTED.name()) .beginTime(new Date()) .endTime(new Date()) .subTxSize(3) @@ -298,7 +298,7 @@ public class APIControllerV1Tests { .andExpect(jsonPath("$.endTime") .value(globalTransaction.getEndTime().getTime())) .andExpect(jsonPath("$.state") - .value(globalTransaction.getState().name())) + .value(globalTransaction.getState())) .andExpect(jsonPath("$.subTxSize") .value(globalTransaction.getSubTxSize())) .andExpect(jsonPath("$.durationTime") 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 ff9d5a9..e76eadd 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,7 +29,7 @@ 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.core.fsm.SagaActorState; +import org.apache.servicecomb.pack.alpha.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;
