[incubator-servicecomb-saga] 05/07: SCB-168 resolved rebase conflict

[ni...@apache.org]

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 e2828ee8aa781fcfa0e09a1c72ae2c88d8044dc7
Author: seanyinx <se...@huawei.com>
AuthorDate: Mon Jan 8 16:39:47 2018 +0800

    SCB-168 resolved rebase conflict
    
    Signed-off-by: seanyinx <se...@huawei.com>
---
 .../servicecomb/saga/omega/format/MessageFormat.java     | 12 +-----------
 .../servicecomb/saga/omega/spring/OmegaSpringConfig.java | 16 +++++++++-------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/omega/omega-format/src/main/java/org/apache/servicecomb/saga/omega/format/MessageFormat.java b/omega/omega-format/src/main/java/org/apache/servicecomb/saga/omega/format/MessageFormat.java
index 0ccac37..d80467d 100644
--- a/omega/omega-format/src/main/java/org/apache/servicecomb/saga/omega/format/MessageFormat.java
+++ b/omega/omega-format/src/main/java/org/apache/servicecomb/saga/omega/format/MessageFormat.java
@@ -19,16 +19,6 @@ package org.apache.servicecomb.saga.omega.format;
 
 import org.apache.servicecomb.saga.omega.transaction.MessageDeserializer;
 import org.apache.servicecomb.saga.omega.transaction.MessageSerializer;
-import org.apache.servicecomb.saga.omega.transaction.OmegaException;
-import org.apache.servicecomb.saga.omega.transaction.TxEvent;
 
-interface MessageFormat extends MessageSerializer, MessageDeserializer {
-  @Override
-  default byte[] serialize(TxEvent event) {
-    try {
-      return serialize(event.payloads());
-    } catch (OmegaException e) {
-      throw new OmegaException("Unable to serialize event with global tx id " + event.globalTxId(), e);
-    }
-  }
+public interface MessageFormat extends MessageSerializer, MessageDeserializer {
 }
diff --git a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
index 00afc1a..5c6a397 100644
--- a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
+++ b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/saga/omega/spring/OmegaSpringConfig.java
@@ -23,6 +23,7 @@ import org.apache.servicecomb.saga.omega.context.OmegaContext;
 import org.apache.servicecomb.saga.omega.context.ServiceConfig;
 import org.apache.servicecomb.saga.omega.context.UniqueIdGenerator;
 import org.apache.servicecomb.saga.omega.format.KryoMessageFormat;
+import org.apache.servicecomb.saga.omega.format.MessageFormat;
 import org.apache.servicecomb.saga.omega.transaction.MessageHandler;
 import org.apache.servicecomb.saga.omega.transaction.MessageSender;
 import org.springframework.beans.factory.annotation.Value;
@@ -54,14 +55,15 @@ class OmegaSpringConfig {
       ServiceConfig serviceConfig,
       @Lazy MessageHandler handler) {
 
-        MessageSender sender = new LoadBalancedClusterMessageSender(
-            addresses,
-            new KryoMessageFormat(),
-            new KryoMessageFormat(),
-            serviceConfig,
-            handler);
+    MessageFormat messageFormat = new KryoMessageFormat();
+    MessageSender sender = new LoadBalancedClusterMessageSender(
+        addresses,
+        messageFormat,
+        messageFormat,
+        serviceConfig,
+        handler);
 
-        Runtime.getRuntime().addShutdownHook(new Thread(sender::close));
+    Runtime.getRuntime().addShutdownHook(new Thread(sender::close));
 
     return sender;
   }

-- 
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.