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 4781bc1d2600defb0e31b9573002dd7cf3f9eafe
Author: cherrylzhao <zhaoju...@126.com>
AuthorDate: Wed Aug 22 23:11:59 2018 +0800
SCB-856 Revise ParticipateEvent => ParticipatedEvent.
---
.../servicecomb/saga/alpha/tcc/server/GrpcOmegaTccCallback.java | 4 ++--
.../servicecomb/saga/alpha/tcc/server/GrpcTccEventService.java | 6 +++---
.../apache/servicecomb/saga/alpha/tcc/server/OmegaCallback.java | 4 ++--
.../saga/alpha/tcc/server/TransactionEventRegistry.java | 8 ++++----
.../saga/alpha/tcc/server/event/ParticipateEventFactory.java | 6 +++---
.../event/{ParticipateEvent.java => ParticipatedEvent.java} | 4 ++--
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/GrpcOmegaTccCallback.java
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/GrpcOmegaTccCallback.java
index 8e92a3f..e59aaa3 100644
---
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/GrpcOmegaTccCallback.java
+++
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/GrpcOmegaTccCallback.java
@@ -18,7 +18,7 @@
package org.apache.servicecomb.saga.alpha.tcc.server;
import io.grpc.stub.StreamObserver;
-import org.apache.servicecomb.saga.alpha.tcc.server.event.ParticipateEvent;
+import org.apache.servicecomb.saga.alpha.tcc.server.event.ParticipatedEvent;
import org.apache.servicecomb.saga.common.TransactionStatus;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
@@ -36,7 +36,7 @@ public final class GrpcOmegaTccCallback implements
OmegaCallback {
}
@Override
- public void compensate(ParticipateEvent event, TransactionStatus status) {
+ public void compensate(ParticipatedEvent event, TransactionStatus status) {
GrpcTccCoordinateCommand command = GrpcTccCoordinateCommand.newBuilder()
.setGlobalTxId(event.getGlobalTxId())
.setLocalTxId(event.getLocalTxId())
diff --git
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/GrpcTccEventService.java
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/GrpcTccEventService.java
index f24fefd..b82d002 100644
---
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/GrpcTccEventService.java
+++
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/GrpcTccEventService.java
@@ -18,12 +18,12 @@
package org.apache.servicecomb.saga.alpha.tcc.server;
import io.grpc.stub.StreamObserver;
-import org.apache.servicecomb.saga.alpha.tcc.server.event.ParticipateEvent;
+import org.apache.servicecomb.saga.alpha.tcc.server.event.ParticipatedEvent;
import
org.apache.servicecomb.saga.alpha.tcc.server.event.ParticipateEventFactory;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcAck;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccParticipateEvent;
+import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccParticipatedEvent;
import
org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionEndedEvent;
import
org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionStartedEvent;
import org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc;
@@ -56,7 +56,7 @@ public class GrpcTccEventService extends
TccEventServiceGrpc.TccEventServiceImpl
@Override
public void onTccTransactionEnded(GrpcTccTransactionEndedEvent request,
StreamObserver<GrpcAck> responseObserver) {
- for (ParticipateEvent event :
TransactionEventRegistry.retrieve(request.getGlobalTxId())) {
+ for (ParticipatedEvent event :
TransactionEventRegistry.retrieve(request.getGlobalTxId())) {
OmegaCallbacksRegistry.retrieve(event.getServiceName(),
event.getInstanceId()).compensate(event, event.getStatus());
}
responseObserver.onNext(ALLOW);
diff --git
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/OmegaCallback.java
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/OmegaCallback.java
index 14f8842..31e38ed 100644
---
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/OmegaCallback.java
+++
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/OmegaCallback.java
@@ -17,12 +17,12 @@
package org.apache.servicecomb.saga.alpha.tcc.server;
-import org.apache.servicecomb.saga.alpha.tcc.server.event.ParticipateEvent;
+import org.apache.servicecomb.saga.alpha.tcc.server.event.ParticipatedEvent;
import org.apache.servicecomb.saga.common.TransactionStatus;
public interface OmegaCallback {
- void compensate(ParticipateEvent event, TransactionStatus status);
+ void compensate(ParticipatedEvent event, TransactionStatus status);
default void disconnect() {
}
diff --git
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/TransactionEventRegistry.java
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/TransactionEventRegistry.java
index b89967a..511db74 100644
---
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/TransactionEventRegistry.java
+++
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/TransactionEventRegistry.java
@@ -21,7 +21,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.servicecomb.saga.alpha.tcc.server.event.ParticipateEvent;
+import org.apache.servicecomb.saga.alpha.tcc.server.event.ParticipatedEvent;
/**
* Manage TCC transaction event.
@@ -30,14 +30,14 @@ import
org.apache.servicecomb.saga.alpha.tcc.server.event.ParticipateEvent;
*/
public final class TransactionEventRegistry {
- private final static Map<String, List<ParticipateEvent>> REGISTRY = new
ConcurrentHashMap<>();
+ private final static Map<String, List<ParticipatedEvent>> REGISTRY = new
ConcurrentHashMap<>();
/**
* Register participate event.
*
* @param participateEvent participate event
*/
- public static void register(ParticipateEvent participateEvent) {
+ public static void register(ParticipatedEvent participateEvent) {
REGISTRY
.computeIfAbsent(participateEvent.getGlobalTxId(), key -> new
LinkedList<>())
.add(participateEvent);
@@ -49,7 +49,7 @@ public final class TransactionEventRegistry {
* @param globalTxId global transaction id
* @return participate events
*/
- public static List<ParticipateEvent> retrieve(String globalTxId) {
+ public static List<ParticipatedEvent> retrieve(String globalTxId) {
return REGISTRY.get(globalTxId);
}
}
diff --git
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/event/ParticipateEventFactory.java
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/event/ParticipateEventFactory.java
index d876acf..5a4f325 100644
---
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/event/ParticipateEventFactory.java
+++
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/event/ParticipateEventFactory.java
@@ -18,7 +18,7 @@
package org.apache.servicecomb.saga.alpha.tcc.server.event;
import org.apache.servicecomb.saga.common.TransactionStatus;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccParticipateEvent;
+import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccParticipatedEvent;
/**
* Participate event factory.
@@ -27,8 +27,8 @@ import
org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccParticipateEvent;
*/
public class ParticipateEventFactory {
- public static ParticipateEvent create(GrpcTccParticipateEvent request) {
- return new ParticipateEvent(
+ public static ParticipatedEvent create(GrpcTccParticipatedEvent request) {
+ return new ParticipatedEvent(
request.getGlobalTxId(),
request.getLocalTxId(),
request.getParentTxId(),
diff --git
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/event/ParticipateEvent.java
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/event/ParticipatedEvent.java
similarity index 95%
rename from
alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/event/ParticipateEvent.java
rename to
alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/event/ParticipatedEvent.java
index 66182c6..2c5740b 100644
---
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/event/ParticipateEvent.java
+++
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/event/ParticipatedEvent.java
@@ -24,7 +24,7 @@ import org.apache.servicecomb.saga.common.TransactionStatus;
*
* @author zhaojun
*/
-public class ParticipateEvent {
+public class ParticipatedEvent {
private String globalTxId;
private String localTxId;
@@ -35,7 +35,7 @@ public class ParticipateEvent {
private String cancelMethod;
private TransactionStatus status;
- public ParticipateEvent(String globalTxId, String localTxId, String
parentTxId, String serviceName,
+ public ParticipatedEvent(String globalTxId, String localTxId, String
parentTxId, String serviceName,
String instanceId, String confirmMethod, String cancelMethod,
TransactionStatus status) {
this.globalTxId = globalTxId;
this.localTxId = localTxId;
