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 2881abb4ab42185973167e160b751f146821c5a0 Author: seanyinx <[email protected]> AuthorDate: Tue Dec 26 09:09:17 2017 +0800 SCB-97 removed unnecessary dependency on serializer Signed-off-by: seanyinx <[email protected]> --- .../spring/TransactionInterceptionTest.java | 31 ++++++++++------------ .../PostTransactionInterceptorTest.java | 3 +-- .../transaction/PreTransactionInterceptorTest.java | 13 ++++----- 3 files changed, 20 insertions(+), 27 deletions(-) diff --git a/omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java b/omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java index 2ba1785..5aefb68 100644 --- a/omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java +++ b/omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java @@ -43,7 +43,7 @@ import org.springframework.test.context.junit4.SpringRunner; import io.servicecomb.saga.omega.context.OmegaContext; import io.servicecomb.saga.omega.transaction.MessageHandler; import io.servicecomb.saga.omega.transaction.MessageSender; -import io.servicecomb.saga.omega.transaction.MessageSerializer; +import io.servicecomb.saga.omega.transaction.TxEvent; import io.servicecomb.saga.omega.transaction.spring.TransactionInterceptionTest.MessageConfig; @RunWith(SpringRunner.class) @@ -128,25 +128,22 @@ public class TransactionInterceptionTest { } @Bean - MessageSender sender(MessageSerializer serializer) { - return (event) -> messages.add(serializer.serialize(event)); + MessageSender sender() { + return (event) -> messages.add(serialize(event)); } - @Bean - MessageSerializer serializer() { - return event -> { - if (TX_STARTED_EVENT.equals(event.type())) { - User user = ((User) event.payloads()[0]); - return txStartedEvent(event.globalTxId(), - event.localTxId(), - event.parentTxId(), - user.username(), - user.email()).getBytes(); - } - return txEndedEvent(event.globalTxId(), + private byte[] serialize(TxEvent event) { + if (TX_STARTED_EVENT.equals(event.type())) { + User user = ((User) event.payloads()[0]); + return txStartedEvent(event.globalTxId(), event.localTxId(), - event.parentTxId()).getBytes(); - }; + event.parentTxId(), + user.username(), + user.email()).getBytes(); + } + return txEndedEvent(event.globalTxId(), + event.localTxId(), + event.parentTxId()).getBytes(); } @Bean diff --git a/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/PostTransactionInterceptorTest.java b/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/PostTransactionInterceptorTest.java index 508c987..7c72513 100644 --- a/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/PostTransactionInterceptorTest.java +++ b/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/PostTransactionInterceptorTest.java @@ -32,8 +32,7 @@ public class PostTransactionInterceptorTest { private final String localTxId = UUID.randomUUID().toString(); private final String parentTxId = UUID.randomUUID().toString(); - private final MessageSerializer serializer = event -> serialize(globalTxId, localTxId, parentTxId); - private final MessageSender sender = (msg) -> messages.add(serializer.serialize(msg)); + private final MessageSender sender = (msg) -> messages.add(serialize(msg.globalTxId(), msg.localTxId(), msg.parentTxId())); private final PostTransactionInterceptor interceptor = new PostTransactionInterceptor(sender); diff --git a/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/PreTransactionInterceptorTest.java b/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/PreTransactionInterceptorTest.java index 0fcf64e..db6a53d 100644 --- a/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/PreTransactionInterceptorTest.java +++ b/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/PreTransactionInterceptorTest.java @@ -33,14 +33,11 @@ public class PreTransactionInterceptorTest { private final String localTxId = UUID.randomUUID().toString(); private final String parentTxId = UUID.randomUUID().toString(); - private final MessageSerializer serializer = event -> { - if (event.payloads()[0] instanceof String) { - String message = (String) event.payloads()[0]; - return serialize(globalTxId, localTxId, parentTxId, message); - } - throw new IllegalArgumentException("Expected instance of String, but was " + event.getClass()); - }; - private final MessageSender sender = (msg) -> messages.add(serializer.serialize(msg)); + private final MessageSender sender = (msg) -> messages.add( + serialize(msg.globalTxId(), + msg.localTxId(), + msg.parentTxId(), + (String) msg.payloads()[0])); private final String message = uniquify("message"); private final PreTransactionInterceptor interceptor = new PreTransactionInterceptor(sender); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
