You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2019/08/08 03:15:43 UTC
[servicecomb-pack] 01/02: SCB-1417 Reformate the code
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 2eaa964591f45aa4b07a3d693408a98088e4cdc8
Author: Willem Jiang <wi...@gmail.com>
AuthorDate: Thu Aug 8 10:29:23 2019 +0800
SCB-1417 Reformate the code
---
.../alpha/fsm/channel/redis/MessageSerializer.java | 78 +++++++--------
.../redis/RedisChannelAutoConfiguration.java | 84 ++++++++--------
.../fsm/channel/redis/RedisMessagePublisher.java | 28 +++---
.../fsm/channel/redis/RedisMessageSubscriber.java | 58 +++++------
.../pack/alpha/fsm/RedisChannelTest.java | 110 ++++++++++-----------
.../servicecomb/pack/alpha/fsm/RedisEventSink.java | 12 +--
6 files changed, 185 insertions(+), 185 deletions(-)
diff --git a/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/MessageSerializer.java b/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/MessageSerializer.java
index 711bb07..dc2ef16 100644
--- a/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/MessageSerializer.java
+++ b/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/MessageSerializer.java
@@ -29,58 +29,58 @@ import java.util.Optional;
public class MessageSerializer {
- private static final Logger logger = LoggerFactory.getLogger(MessageSerializer.class);
+ private static final Logger logger = LoggerFactory.getLogger(MessageSerializer.class);
- private static MessageSerializerImpl serializer = null;
+ private static MessageSerializerImpl serializer = null;
- public MessageSerializer() {
- serializer = new MessageSerializerImpl();
- }
+ public MessageSerializer() {
+ serializer = new MessageSerializerImpl();
+ }
- public Optional<byte[]> serializer(Object data){
- return Optional.ofNullable(serializer.serialize(data));
- }
+ public Optional<byte[]> serializer(Object data){
+ return Optional.ofNullable(serializer.serialize(data));
+ }
- public Optional<Object> deserialize(byte[] bytes){
- return Optional.ofNullable(serializer.deserialize(bytes));
- }
+ public Optional<Object> deserialize(byte[] bytes){
+ return Optional.ofNullable(serializer.deserialize(bytes));
+ }
- private class MessageSerializerImpl implements RedisSerializer<Object>{
- @Override
- public byte[] serialize(Object data) throws SerializationException {
- try {
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- ObjectOutputStream outputStream = new ObjectOutputStream(byteArrayOutputStream);
- outputStream.writeObject(data);
+ private class MessageSerializerImpl implements RedisSerializer<Object>{
+ @Override
+ public byte[] serialize(Object data) throws SerializationException {
+ try {
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ ObjectOutputStream outputStream = new ObjectOutputStream(byteArrayOutputStream);
+ outputStream.writeObject(data);
- byte[] bytes = byteArrayOutputStream.toByteArray();
+ byte[] bytes = byteArrayOutputStream.toByteArray();
- outputStream.close();
+ outputStream.close();
- return bytes;
- }catch (Exception e){
- logger.error("serialize Exception = [{}]", e.getMessage(), e);
- }
+ return bytes;
+ }catch (Exception e){
+ logger.error("serialize Exception = [{}]", e.getMessage(), e);
+ }
- return null;
- }
+ return null;
+ }
- @Override
- public Object deserialize(byte[] bytes) throws SerializationException {
- try {
- ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes);
- ObjectInputStream objectInputStream = new ObjectInputStream(byteArrayInputStream);
+ @Override
+ public Object deserialize(byte[] bytes) throws SerializationException {
+ try {
+ ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes);
+ ObjectInputStream objectInputStream = new ObjectInputStream(byteArrayInputStream);
- Object object = objectInputStream.readObject();
+ Object object = objectInputStream.readObject();
- objectInputStream.close();
+ objectInputStream.close();
- return object;
- }catch (Exception e){
- logger.error("deserialize Exception = [{}]", e.getMessage(), e);
- }
+ return object;
+ }catch (Exception e){
+ logger.error("deserialize Exception = [{}]", e.getMessage(), e);
+ }
- return null;
- }
+ return null;
}
+ }
}
diff --git a/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/RedisChannelAutoConfiguration.java b/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/RedisChannelAutoConfiguration.java
index 0a91531..e67e8d5 100644
--- a/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/RedisChannelAutoConfiguration.java
+++ b/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/RedisChannelAutoConfiguration.java
@@ -42,58 +42,58 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
@ConditionalOnClass(RedisConnection.class)
@ConditionalOnProperty(value = "alpha.feature.akka.channel.type", havingValue = "redis")
public class RedisChannelAutoConfiguration {
- private static final Logger logger = LoggerFactory.getLogger(RedisChannelAutoConfiguration.class);
+ private static final Logger logger = LoggerFactory.getLogger(RedisChannelAutoConfiguration.class);
- @Value("${alpha.feature.akka.channel.redis.topic:servicecomb-pack-actor-event}")
- private String topic;
+ @Value("${alpha.feature.akka.channel.redis.topic:servicecomb-pack-actor-event}")
+ private String topic;
- @Bean
- public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
- RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
- redisTemplate.setKeySerializer(new StringRedisSerializer());
- redisTemplate.setHashKeySerializer(new GenericToStringSerializer<>(Object.class));
- redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());
- redisTemplate.setValueSerializer(new JdkSerializationRedisSerializer());
- redisTemplate.setConnectionFactory(redisConnectionFactory);
+ @Bean
+ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+ RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+ redisTemplate.setKeySerializer(new StringRedisSerializer());
+ redisTemplate.setHashKeySerializer(new GenericToStringSerializer<>(Object.class));
+ redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());
+ redisTemplate.setValueSerializer(new JdkSerializationRedisSerializer());
+ redisTemplate.setConnectionFactory(redisConnectionFactory);
- return redisTemplate;
- }
+ return redisTemplate;
+ }
- @Bean
- RedisMessageSubscriber redisMessageSubscriber(@Lazy @Qualifier("actorEventSink") ActorEventSink actorEventSink,
- @Lazy @Qualifier("nodeStatus") NodeStatus nodeStatus) {
- return new RedisMessageSubscriber(actorEventSink, nodeStatus);
- }
+ @Bean
+ RedisMessageSubscriber redisMessageSubscriber(@Lazy @Qualifier("actorEventSink") ActorEventSink actorEventSink,
+ @Lazy @Qualifier("nodeStatus") NodeStatus nodeStatus) {
+ return new RedisMessageSubscriber(actorEventSink, nodeStatus);
+ }
- @Bean
- public MessageListenerAdapter messageListenerAdapter(@Lazy @Qualifier("actorEventSink") ActorEventSink actorEventSink,
- @Lazy @Qualifier("nodeStatus") NodeStatus nodeStatus) {
- return new MessageListenerAdapter(redisMessageSubscriber(actorEventSink, nodeStatus));
- }
+ @Bean
+ public MessageListenerAdapter messageListenerAdapter(@Lazy @Qualifier("actorEventSink") ActorEventSink actorEventSink,
+ @Lazy @Qualifier("nodeStatus") NodeStatus nodeStatus) {
+ return new MessageListenerAdapter(redisMessageSubscriber(actorEventSink, nodeStatus));
+ }
- @Bean
- public RedisMessageListenerContainer redisMessageListenerContainer(RedisConnectionFactory redisConnectionFactory,
- @Lazy @Qualifier("actorEvetSink") ActorEventSink actorEventSink,
- @Lazy @Qualifier("nodeStatus") NodeStatus nodeStatus) {
- RedisMessageListenerContainer redisMessageListenerContainer = new RedisMessageListenerContainer();
+ @Bean
+ public RedisMessageListenerContainer redisMessageListenerContainer(RedisConnectionFactory redisConnectionFactory,
+ @Lazy @Qualifier("actorEvetSink") ActorEventSink actorEventSink,
+ @Lazy @Qualifier("nodeStatus") NodeStatus nodeStatus) {
+ RedisMessageListenerContainer redisMessageListenerContainer = new RedisMessageListenerContainer();
- redisMessageListenerContainer.setConnectionFactory(redisConnectionFactory);
- redisMessageListenerContainer.addMessageListener(redisMessageSubscriber(actorEventSink, nodeStatus), channelTopic());
+ redisMessageListenerContainer.setConnectionFactory(redisConnectionFactory);
+ redisMessageListenerContainer.addMessageListener(redisMessageSubscriber(actorEventSink, nodeStatus), channelTopic());
- return redisMessageListenerContainer;
- }
+ return redisMessageListenerContainer;
+ }
- @Bean
- MessagePublisher redisMessagePublisher(RedisTemplate<String, Object> redisTemplate) {
- return new RedisMessagePublisher(redisTemplate, channelTopic());
- }
+ @Bean
+ MessagePublisher redisMessagePublisher(RedisTemplate<String, Object> redisTemplate) {
+ return new RedisMessagePublisher(redisTemplate, channelTopic());
+ }
- @Bean
- ChannelTopic channelTopic() {
- if (logger.isDebugEnabled()) {
- logger.debug("build channel topic = [{}]", topic);
- }
- return new ChannelTopic(topic);
+ @Bean
+ ChannelTopic channelTopic() {
+ if (logger.isDebugEnabled()) {
+ logger.debug("build channel topic = [{}]", topic);
}
+ return new ChannelTopic(topic);
+ }
}
diff --git a/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/RedisMessagePublisher.java b/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/RedisMessagePublisher.java
index 8957bb7..31370e3 100644
--- a/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/RedisMessagePublisher.java
+++ b/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/RedisMessagePublisher.java
@@ -25,22 +25,22 @@ import org.springframework.data.redis.listener.ChannelTopic;
public class RedisMessagePublisher implements MessagePublisher {
- private static final Logger logger = LoggerFactory.getLogger(RedisMessagePublisher.class);
+ private static final Logger logger = LoggerFactory.getLogger(RedisMessagePublisher.class);
- private RedisTemplate<String, Object> redisTemplate;
- private ChannelTopic channelTopic;
+ private RedisTemplate<String, Object> redisTemplate;
+ private ChannelTopic channelTopic;
- public RedisMessagePublisher(RedisTemplate<String, Object> redisTemplate, ChannelTopic channelTopic) {
- this.redisTemplate = redisTemplate;
- this.channelTopic = channelTopic;
- }
-
- @Override
- public void publish(Object data) {
- if(logger.isDebugEnabled()) {
- logger.debug("send message [{}] to [{}]", data, channelTopic.getTopic());
- }
- redisTemplate.convertAndSend(channelTopic.getTopic(), data);
+ public RedisMessagePublisher(RedisTemplate<String, Object> redisTemplate, ChannelTopic channelTopic) {
+ this.redisTemplate = redisTemplate;
+ this.channelTopic = channelTopic;
+ }
+ @Override
+ public void publish(Object data) {
+ if(logger.isDebugEnabled()) {
+ logger.debug("send message [{}] to [{}]", data, channelTopic.getTopic());
}
+ redisTemplate.convertAndSend(channelTopic.getTopic(), data);
+
+ }
}
diff --git a/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/RedisMessageSubscriber.java b/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/RedisMessageSubscriber.java
index 3f11134..0aa171b 100644
--- a/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/RedisMessageSubscriber.java
+++ b/alpha/alpha-fsm-channel-redis/src/main/java/org/apache/servicecomb/pack/alpha/fsm/channel/redis/RedisMessageSubscriber.java
@@ -28,43 +28,43 @@ import java.nio.charset.StandardCharsets;
public class RedisMessageSubscriber implements MessageListener {
- private static final Logger logger = LoggerFactory.getLogger(RedisMessageSubscriber.class);
+ private static final Logger logger = LoggerFactory.getLogger(RedisMessageSubscriber.class);
- private ActorEventSink actorEventSink;
- private NodeStatus nodeStatus;
+ private ActorEventSink actorEventSink;
+ private NodeStatus nodeStatus;
- private MessageSerializer messageSerializer = new MessageSerializer();
+ private MessageSerializer messageSerializer = new MessageSerializer();
- public RedisMessageSubscriber(ActorEventSink actorEventSink, NodeStatus nodeStatus) {
- this.actorEventSink = actorEventSink;
- this.nodeStatus = nodeStatus;
- }
+ public RedisMessageSubscriber(ActorEventSink actorEventSink, NodeStatus nodeStatus) {
+ this.actorEventSink = actorEventSink;
+ this.nodeStatus = nodeStatus;
+ }
- @Override
- public void onMessage(Message message, byte[] pattern) {
- if(nodeStatus.isMaster()) {
- if (logger.isDebugEnabled()) {
- logger.debug("pattern = [{}]", new String(pattern, StandardCharsets.UTF_8));
- }
+ @Override
+ public void onMessage(Message message, byte[] pattern) {
+ if(nodeStatus.isMaster()) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("pattern = [{}]", new String(pattern, StandardCharsets.UTF_8));
+ }
- messageSerializer.deserialize(message.getBody()).ifPresent(data -> {
+ messageSerializer.deserialize(message.getBody()).ifPresent(data -> {
- BaseEvent event = (BaseEvent) data;
+ BaseEvent event = (BaseEvent) data;
- if (logger.isDebugEnabled()) {
- logger.debug("event = [{}]", event);
- }
+ if (logger.isDebugEnabled()) {
+ logger.debug("event = [{}]", event);
+ }
- try {
- actorEventSink.send(event);
- } catch (Exception e) {
- logger.error("subscriber Exception = [{}]", e.getMessage(), e);
- }
- });
- }else{
- if(logger.isDebugEnabled()){
- logger.debug("nodeStatus is not master and cancel this time subscribe");
- }
+ try {
+ actorEventSink.send(event);
+ } catch (Exception e) {
+ logger.error("subscriber Exception = [{}]", e.getMessage(), e);
}
+ });
+ }else{
+ if(logger.isDebugEnabled()){
+ logger.debug("nodeStatus is not master and cancel this time subscribe");
+ }
}
+ }
}
diff --git a/alpha/alpha-fsm-channel-redis/src/test/java/org/apache/servicecomb/pack/alpha/fsm/RedisChannelTest.java b/alpha/alpha-fsm-channel-redis/src/test/java/org/apache/servicecomb/pack/alpha/fsm/RedisChannelTest.java
index 5e1077a..858919f 100644
--- a/alpha/alpha-fsm-channel-redis/src/test/java/org/apache/servicecomb/pack/alpha/fsm/RedisChannelTest.java
+++ b/alpha/alpha-fsm-channel-redis/src/test/java/org/apache/servicecomb/pack/alpha/fsm/RedisChannelTest.java
@@ -50,81 +50,81 @@ import static org.mockito.Mockito.*;
@RunWith(MockitoJUnitRunner.class)
public class RedisChannelTest {
- @Mock
- private RedisConnection redisConnection;
+ @Mock
+ private RedisConnection redisConnection;
- @Mock
- private RedisTemplate<String, Object> redisTemplate;
+ @Mock
+ private RedisTemplate<String, Object> redisTemplate;
- @Mock
- private RedisConnectionFactory redisConnectionFactory;
+ @Mock
+ private RedisConnectionFactory redisConnectionFactory;
- @Spy
- private ChannelTopic channelTopic = new ChannelTopic("redis-channel");
+ @Spy
+ private ChannelTopic channelTopic = new ChannelTopic("redis-channel");
- private RedisMessageListenerContainer redisMessageListenerContainer;
+ private RedisMessageListenerContainer redisMessageListenerContainer;
- @Spy
- private NodeStatus nodeStatus = new NodeStatus(NodeStatus.TypeEnum.MASTER);
+ @Spy
+ private NodeStatus nodeStatus = new NodeStatus(NodeStatus.TypeEnum.MASTER);
- @Spy
- private RedisEventSink actorEventSink = new RedisEventSink();
+ @Spy
+ private RedisEventSink actorEventSink = new RedisEventSink();
- private RedisMessagePublisher redisMessagePublisher;
+ private RedisMessagePublisher redisMessagePublisher;
- private RedisMessageSubscriber redisMessageSubscriber;
+ private RedisMessageSubscriber redisMessageSubscriber;
- private MessageListenerAdapter messageListenerAdapter;
+ private MessageListenerAdapter messageListenerAdapter;
- @Before
- public void setup(){
- when(redisConnectionFactory.getConnection()).thenReturn(redisConnection);
+ @Before
+ public void setup(){
+ when(redisConnectionFactory.getConnection()).thenReturn(redisConnection);
- redisTemplate.afterPropertiesSet();
+ redisTemplate.afterPropertiesSet();
- redisMessageSubscriber = new RedisMessageSubscriber(actorEventSink, nodeStatus);
- messageListenerAdapter = new MessageListenerAdapter(redisMessageSubscriber);
- messageListenerAdapter.afterPropertiesSet();
+ redisMessageSubscriber = new RedisMessageSubscriber(actorEventSink, nodeStatus);
+ messageListenerAdapter = new MessageListenerAdapter(redisMessageSubscriber);
+ messageListenerAdapter.afterPropertiesSet();
- redisMessageListenerContainer = new RedisMessageListenerContainer();
- redisMessageListenerContainer.setConnectionFactory(redisConnectionFactory);
- redisMessageListenerContainer.addMessageListener(messageListenerAdapter, channelTopic);
- redisMessageListenerContainer.afterPropertiesSet();
- redisMessageListenerContainer.start();
+ redisMessageListenerContainer = new RedisMessageListenerContainer();
+ redisMessageListenerContainer.setConnectionFactory(redisConnectionFactory);
+ redisMessageListenerContainer.addMessageListener(messageListenerAdapter, channelTopic);
+ redisMessageListenerContainer.afterPropertiesSet();
+ redisMessageListenerContainer.start();
- redisMessagePublisher = new RedisMessagePublisher(redisTemplate, channelTopic);
+ redisMessagePublisher = new RedisMessagePublisher(redisTemplate, channelTopic);
- }
+ }
- @Test
- public void testRedisPubSub(){
- final String globalTxId = UUID.randomUUID().toString().replaceAll("-", "");
- final String localTxId1 = UUID.randomUUID().toString().replaceAll("-", "");
- final String localTxId2 = UUID.randomUUID().toString().replaceAll("-", "");
- final String localTxId3 = UUID.randomUUID().toString().replaceAll("-", "");
+ @Test
+ public void testRedisPubSub(){
+ final String globalTxId = UUID.randomUUID().toString().replaceAll("-", "");
+ final String localTxId1 = UUID.randomUUID().toString().replaceAll("-", "");
+ final String localTxId2 = UUID.randomUUID().toString().replaceAll("-", "");
+ final String localTxId3 = UUID.randomUUID().toString().replaceAll("-", "");
- MessageSerializer messageSerializer = new MessageSerializer();
- buildData(globalTxId, localTxId1, localTxId2, localTxId3).forEach(baseEvent -> {
- redisMessagePublisher.publish(baseEvent);
- redisMessageSubscriber.onMessage(new DefaultMessage(channelTopic.getTopic().getBytes(), messageSerializer.serializer(baseEvent).orElse(new byte[0])), channelTopic.getTopic().getBytes());
- });
+ MessageSerializer messageSerializer = new MessageSerializer();
+ buildData(globalTxId, localTxId1, localTxId2, localTxId3).forEach(baseEvent -> {
+ redisMessagePublisher.publish(baseEvent);
+ redisMessageSubscriber.onMessage(new DefaultMessage(channelTopic.getTopic().getBytes(), messageSerializer.serializer(baseEvent).orElse(new byte[0])), channelTopic.getTopic().getBytes());
+ });
- assertEquals(0, actorEventSink.countDownLatch.getCount());
- }
+ assertEquals(0, actorEventSink.countDownLatch.getCount());
+ }
- private List<BaseEvent> buildData(String globalTxId, String localTxId_1, String localTxId_2, String localTxId_3){
- List<BaseEvent> sagaEvents = new ArrayList<>();
- sagaEvents.add(SagaStartedEvent.builder().serviceName("service_g").instanceId("instance_g").globalTxId(globalTxId).build());
- sagaEvents.add(TxStartedEvent.builder().serviceName("service_c1").instanceId("instance_c1").globalTxId(globalTxId).parentTxId(globalTxId).localTxId(localTxId_1).build());
- sagaEvents.add(TxEndedEvent.builder().serviceName("service_c1").instanceId("instance_c1").globalTxId(globalTxId).parentTxId(globalTxId).localTxId(localTxId_1).build());
- sagaEvents.add(TxStartedEvent.builder().serviceName("service_c2").instanceId("instance_c2").globalTxId(globalTxId).parentTxId(globalTxId).localTxId(localTxId_2).build());
- sagaEvents.add(TxEndedEvent.builder().serviceName("service_c2").instanceId("instance_c2").globalTxId(globalTxId).parentTxId(globalTxId).localTxId(localTxId_2).build());
- sagaEvents.add(TxStartedEvent.builder().serviceName("service_c3").instanceId("instance_c3").globalTxId(globalTxId).parentTxId(globalTxId).localTxId(localTxId_3).build());
- sagaEvents.add(TxEndedEvent.builder().serviceName("service_c3").instanceId("instance_c3").globalTxId(globalTxId).parentTxId(globalTxId).localTxId(localTxId_3).build());
- sagaEvents.add(SagaEndedEvent.builder().serviceName("service_g").instanceId("instance_g").globalTxId(globalTxId).build());
- return sagaEvents;
- }
+ private List<BaseEvent> buildData(String globalTxId, String localTxId_1, String localTxId_2, String localTxId_3){
+ List<BaseEvent> sagaEvents = new ArrayList<>();
+ sagaEvents.add(SagaStartedEvent.builder().serviceName("service_g").instanceId("instance_g").globalTxId(globalTxId).build());
+ sagaEvents.add(TxStartedEvent.builder().serviceName("service_c1").instanceId("instance_c1").globalTxId(globalTxId).parentTxId(globalTxId).localTxId(localTxId_1).build());
+ sagaEvents.add(TxEndedEvent.builder().serviceName("service_c1").instanceId("instance_c1").globalTxId(globalTxId).parentTxId(globalTxId).localTxId(localTxId_1).build());
+ sagaEvents.add(TxStartedEvent.builder().serviceName("service_c2").instanceId("instance_c2").globalTxId(globalTxId).parentTxId(globalTxId).localTxId(localTxId_2).build());
+ sagaEvents.add(TxEndedEvent.builder().serviceName("service_c2").instanceId("instance_c2").globalTxId(globalTxId).parentTxId(globalTxId).localTxId(localTxId_2).build());
+ sagaEvents.add(TxStartedEvent.builder().serviceName("service_c3").instanceId("instance_c3").globalTxId(globalTxId).parentTxId(globalTxId).localTxId(localTxId_3).build());
+ sagaEvents.add(TxEndedEvent.builder().serviceName("service_c3").instanceId("instance_c3").globalTxId(globalTxId).parentTxId(globalTxId).localTxId(localTxId_3).build());
+ sagaEvents.add(SagaEndedEvent.builder().serviceName("service_g").instanceId("instance_g").globalTxId(globalTxId).build());
+ return sagaEvents;
+ }
}
diff --git a/alpha/alpha-fsm-channel-redis/src/test/java/org/apache/servicecomb/pack/alpha/fsm/RedisEventSink.java b/alpha/alpha-fsm-channel-redis/src/test/java/org/apache/servicecomb/pack/alpha/fsm/RedisEventSink.java
index f681e2b..f44342e 100644
--- a/alpha/alpha-fsm-channel-redis/src/test/java/org/apache/servicecomb/pack/alpha/fsm/RedisEventSink.java
+++ b/alpha/alpha-fsm-channel-redis/src/test/java/org/apache/servicecomb/pack/alpha/fsm/RedisEventSink.java
@@ -23,10 +23,10 @@ import java.util.concurrent.CountDownLatch;
public class RedisEventSink implements ActorEventSink {
- public static final CountDownLatch countDownLatch = new CountDownLatch(8);
+ public static final CountDownLatch countDownLatch = new CountDownLatch(8);
- @Override
- public void send(BaseEvent event) throws Exception {
- countDownLatch.countDown();
- }
-}
\ No newline at end of file
+ @Override
+ public void send(BaseEvent event) throws Exception {
+ countDownLatch.countDown();
+ }
+}