You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by se...@apache.org on 2017/12/29 09:18:21 UTC
[incubator-servicecomb-saga] 04/05: SCB-138 fixed code conflict
This is an automated email from the ASF dual-hosted git repository.
seanyinx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 310e4dd3ccb6cb16037e131d7baec2d96665a0e2
Author: seanyinx <se...@huawei.com>
AuthorDate: Fri Dec 29 14:58:57 2017 +0800
SCB-138 fixed code conflict
Signed-off-by: seanyinx <se...@huawei.com>
---
.../io/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java | 1 +
.../io/servicecomb/saga/alpha/server/SwiftTxEventEndpointImpl.java | 0
.../java/io/servicecomb/saga/alpha/server/AlphaIntegrationTest.java | 1 +
.../servicecomb/saga/omega/connector/thrift/ThriftMessageSender.java | 0
.../saga/omega/connector/thrift/ThriftMessageSenderTest.java | 0
pack-contracts/pack-contract-grpc/src/main/proto/GrpcTxEvent.proto | 5 +++--
.../java/io/servicecomb/saga/pack/contracts/thrift/SwiftTxEvent.java | 0
7 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java b/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java
index 41e5bbe..76ab346 100644
--- a/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java
+++ b/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/GrpcTxEventEndpointImpl.java
@@ -45,6 +45,7 @@ class GrpcTxEventEndpointImpl extends TxEventServiceImplBase {
message.getLocalTxId(),
message.getParentTxId().isEmpty()? null : message.getParentTxId(),
message.getType(),
+ message.getCompensationMethod(),
message.getPayloads().toByteArray()
));
GrpcEmpty reply = GrpcEmpty.newBuilder().build();
diff --git a/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/SwiftTxEventEndpointImpl.java b/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/SwiftTxEventEndpointImpl.java
deleted file mode 100644
index e69de29..0000000
diff --git a/alpha/alpha-server/src/test/java/io/servicecomb/saga/alpha/server/AlphaIntegrationTest.java b/alpha/alpha-server/src/test/java/io/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
index 787b368..56a57eb 100644
--- a/alpha/alpha-server/src/test/java/io/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
+++ b/alpha/alpha-server/src/test/java/io/servicecomb/saga/alpha/server/AlphaIntegrationTest.java
@@ -123,6 +123,7 @@ public class AlphaIntegrationTest {
.setLocalTxId(this.localTxId)
.setParentTxId(this.parentTxId)
.setType(type.name())
+ .setCompensationMethod(getClass().getCanonicalName())
.setPayloads(ByteString.copyFrom(payload.getBytes()))
.build();
}
diff --git a/omega/omega-connector/omega-connector-thrift/src/main/java/io/servicecomb/saga/omega/connector/thrift/ThriftMessageSender.java b/omega/omega-connector/omega-connector-thrift/src/main/java/io/servicecomb/saga/omega/connector/thrift/ThriftMessageSender.java
deleted file mode 100644
index e69de29..0000000
diff --git a/omega/omega-connector/omega-connector-thrift/src/test/java/io/servicecomb/saga/omega/connector/thrift/ThriftMessageSenderTest.java b/omega/omega-connector/omega-connector-thrift/src/test/java/io/servicecomb/saga/omega/connector/thrift/ThriftMessageSenderTest.java
deleted file mode 100644
index e69de29..0000000
diff --git a/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTxEvent.proto b/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTxEvent.proto
index 41ffb81..f6ebf74 100644
--- a/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTxEvent.proto
+++ b/pack-contracts/pack-contract-grpc/src/main/proto/GrpcTxEvent.proto
@@ -31,7 +31,8 @@ message GrpcTxEvent {
string localTxId = 3;
string parentTxId = 4;
string type = 5;
- bytes payloads = 6;
+ string compensationMethod = 6;
+ bytes payloads = 7;
}
-message GrpcEmpty {}
\ No newline at end of file
+message GrpcEmpty {}
diff --git a/pack-contracts/pack-contract-thrift/src/main/java/io/servicecomb/saga/pack/contracts/thrift/SwiftTxEvent.java b/pack-contracts/pack-contract-thrift/src/main/java/io/servicecomb/saga/pack/contracts/thrift/SwiftTxEvent.java
deleted file mode 100644
index e69de29..0000000
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.