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 2064d86e58c3971f38c4b352f5486a93a851ef6e
Author: cherrylzhao <zhaoju...@126.com>
AuthorDate: Wed Aug 22 23:09:05 2018 +0800
SCB-856 Revise GrpcTccCordinateCommand => GrpcTccCoordinateCommand.
---
.../saga/alpha/tcc/server/GrpcOmegaTccCallback.java | 8 ++++----
.../saga/alpha/tcc/server/GrpcTccEventService.java | 6 +++---
.../saga/alpha/tcc/server/OmegaCallbacksRegistry.java | 4 ++--
.../saga/alpha/tcc/server/AlphaTccServerTest.java | 6 +++---
.../server/common/TccCoordinateCommandStreamObserver.java | 14 +++++++-------
5 files changed, 19 insertions(+), 19 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 e05b024..8e92a3f 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
@@ -20,7 +20,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.common.TransactionStatus;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCordinateCommand;
+import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
/**
* Grpc omega callback for TCC workflow.
@@ -29,15 +29,15 @@ import
org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCordinateCommand;
*/
public final class GrpcOmegaTccCallback implements OmegaCallback {
- private StreamObserver<GrpcTccCordinateCommand> responseObserver;
+ private StreamObserver<GrpcTccCoordinateCommand> responseObserver;
- public GrpcOmegaTccCallback(StreamObserver<GrpcTccCordinateCommand>
responseObserver) {
+ public GrpcOmegaTccCallback(StreamObserver<GrpcTccCoordinateCommand>
responseObserver) {
this.responseObserver = responseObserver;
}
@Override
public void compensate(ParticipateEvent event, TransactionStatus status) {
- GrpcTccCordinateCommand command = GrpcTccCordinateCommand.newBuilder()
+ GrpcTccCoordinateCommand command = GrpcTccCoordinateCommand.newBuilder()
.setGlobalTxId(event.getGlobalTxId())
.setLocalTxId(event.getLocalTxId())
.setParentTxId(event.getParentTxId() == null ? "" :
event.getParentTxId())
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 a76530b..f24fefd 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
@@ -22,7 +22,7 @@ import
org.apache.servicecomb.saga.alpha.tcc.server.event.ParticipateEvent;
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.GrpcTccCordinateCommand;
+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.GrpcTccTransactionEndedEvent;
import
org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccTransactionStartedEvent;
@@ -39,7 +39,7 @@ public class GrpcTccEventService extends
TccEventServiceGrpc.TccEventServiceImpl
private static final GrpcAck REJECT =
GrpcAck.newBuilder().setAborted(true).build();
@Override
- public void onConnected(GrpcServiceConfig request,
StreamObserver<GrpcTccCordinateCommand> responseObserver) {
+ public void onConnected(GrpcServiceConfig request,
StreamObserver<GrpcTccCoordinateCommand> responseObserver) {
OmegaCallbacksRegistry.register(request, responseObserver);
}
@@ -48,7 +48,7 @@ public class GrpcTccEventService extends
TccEventServiceGrpc.TccEventServiceImpl
}
@Override
- public void participate(GrpcTccParticipateEvent request,
StreamObserver<GrpcAck> responseObserver) {
+ public void participate(GrpcTccParticipatedEvent request,
StreamObserver<GrpcAck> responseObserver) {
TransactionEventRegistry.register(ParticipateEventFactory.create(request));
responseObserver.onNext(ALLOW);
responseObserver.onCompleted();
diff --git
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/OmegaCallbacksRegistry.java
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/OmegaCallbacksRegistry.java
index c505df1..92733e8 100644
---
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/OmegaCallbacksRegistry.java
+++
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/tcc/server/OmegaCallbacksRegistry.java
@@ -23,7 +23,7 @@ import io.grpc.stub.StreamObserver;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.servicecomb.saga.pack.contract.grpc.GrpcServiceConfig;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCordinateCommand;
+import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
/**
* Manage Omega callbacks.
@@ -40,7 +40,7 @@ public final class OmegaCallbacksRegistry {
* @param request Grpc service config
* @param responseObserver stream observer
*/
- public static void register(GrpcServiceConfig request,
StreamObserver<GrpcTccCordinateCommand> responseObserver) {
+ public static void register(GrpcServiceConfig request,
StreamObserver<GrpcTccCoordinateCommand> responseObserver) {
REGISTRY
.computeIfAbsent(request.getServiceName(), key -> new
ConcurrentHashMap<>())
.put(request.getInstanceId(), new
GrpcOmegaTccCallback(responseObserver));
diff --git
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java
index 5e303e4..bfef293 100644
---
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java
+++
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/AlphaTccServerTest.java
@@ -32,7 +32,7 @@ import
org.apache.servicecomb.saga.alpha.tcc.server.common.GrpcTccServerConfig;
import
org.apache.servicecomb.saga.alpha.tcc.server.common.TccCoordinateCommandStreamObserver;
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.GrpcTccCordinateCommand;
+import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
import org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc;
import
org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceBlockingStub;
import
org.apache.servicecomb.saga.pack.contract.grpc.TccEventServiceGrpc.TccEventServiceStub;
@@ -74,7 +74,7 @@ public class AlphaTccServerTest {
private final TccEventServiceBlockingStub blockingStub =
TccEventServiceGrpc.newBlockingStub(clientChannel);
- private static final Queue<GrpcTccCordinateCommand> receivedCommands = new
ConcurrentLinkedQueue<>();
+ private static final Queue<GrpcTccCoordinateCommand> receivedCommands = new
ConcurrentLinkedQueue<>();
private final TccCoordinateCommandStreamObserver commandStreamObserver =
new TccCoordinateCommandStreamObserver(this::onCompensation,
receivedCommands);
@@ -118,7 +118,7 @@ public class AlphaTccServerTest {
// asyncStub.onConnected(serviceConfig, commandStreamObserver);
}
- private GrpcAck onCompensation(GrpcTccCordinateCommand command) {
+ private GrpcAck onCompensation(GrpcTccCoordinateCommand command) {
return GrpcAck.newBuilder().setAborted(false).build();
}
diff --git
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/common/TccCoordinateCommandStreamObserver.java
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/common/TccCoordinateCommandStreamObserver.java
index 7f1295b..cc39a8c 100644
---
a/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/common/TccCoordinateCommandStreamObserver.java
+++
b/alpha/alpha-server/src/test/java/org/apache/servicecomb/saga/alpha/tcc/server/common/TccCoordinateCommandStreamObserver.java
@@ -20,22 +20,22 @@ package org.apache.servicecomb.saga.alpha.tcc.server.common;
import io.grpc.stub.StreamObserver;
import java.util.Queue;
import java.util.function.Consumer;
-import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCordinateCommand;
+import org.apache.servicecomb.saga.pack.contract.grpc.GrpcTccCoordinateCommand;
-public class TccCoordinateCommandStreamObserver implements
StreamObserver<GrpcTccCordinateCommand> {
+public class TccCoordinateCommandStreamObserver implements
StreamObserver<GrpcTccCoordinateCommand> {
- private static Queue<GrpcTccCordinateCommand> receivedCommands;
- private Consumer<GrpcTccCordinateCommand> consumer;
+ private static Queue<GrpcTccCoordinateCommand> receivedCommands;
+ private Consumer<GrpcTccCoordinateCommand> consumer;
private boolean completed = false;
- public TccCoordinateCommandStreamObserver(Consumer<GrpcTccCordinateCommand>
consumer,
- Queue<GrpcTccCordinateCommand> receivedCommands) {
+ public TccCoordinateCommandStreamObserver(Consumer<GrpcTccCoordinateCommand>
consumer,
+ Queue<GrpcTccCoordinateCommand> receivedCommands) {
this.consumer = consumer;
TccCoordinateCommandStreamObserver.receivedCommands = receivedCommands;
}
@Override
- public void onNext(GrpcTccCordinateCommand value) {
+ public void onNext(GrpcTccCoordinateCommand value) {
consumer.accept(value);
receivedCommands.add(value);
}
