[servicecomb-pack] 13/13: SCB-1627 Method name ask rename to getAck

[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/servicecomb-pack.git

commit a8b24100a59a8ec9c917f89b1aa6978cc81e10df
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Sat Dec 7 15:10:15 2019 +0800

    SCB-1627 Method name ask rename to getAck
---
 .../java/org/apache/servicecomb/pack/alpha/core/OmegaCallback.java    | 2 +-
 .../apache/servicecomb/pack/alpha/server/fsm/GrpcOmegaCallback.java   | 4 ++--
 .../servicecomb/pack/alpha/server/fsm/GrpcSagaEventService.java       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/OmegaCallback.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/OmegaCallback.java
index eab13f4..81b26a0 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/OmegaCallback.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/OmegaCallback.java
@@ -25,7 +25,7 @@ public interface OmegaCallback {
   default void disconnect() {
   }
 
-  default void ask(CompensateAckType type) {
+  default void getAck(CompensateAckType type) {
   }
 
   default boolean isWaiting() {
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcOmegaCallback.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcOmegaCallback.java
index cd1bf72..027046d 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcOmegaCallback.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcOmegaCallback.java
@@ -55,7 +55,7 @@ class GrpcOmegaCallback implements OmegaCallback {
       if (compensateAckCountDownLatch.getType() == CompensateAckType.Disconnected) {
         throw new CompensateConnectException("Omega connect exception");
       }else{
-        LOG.info("compensate ask "+ compensateAckCountDownLatch.getType().name());
+        LOG.info("compensate ack "+ compensateAckCountDownLatch.getType().name());
         if(compensateAckCountDownLatch.getType() == CompensateAckType.Failed){
           throw new CompensateAckFailedException("An exception is thrown inside the compensation method");
         }
@@ -76,7 +76,7 @@ class GrpcOmegaCallback implements OmegaCallback {
   }
 
   @Override
-  public void ask(CompensateAckType type) {
+  public void getAck(CompensateAckType type) {
     if (compensateAckCountDownLatch != null) {
       compensateAckCountDownLatch.countDown(type);
     }
diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcSagaEventService.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcSagaEventService.java
index 61548c0..dac6f21 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcSagaEventService.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/GrpcSagaEventService.java
@@ -174,7 +174,7 @@ public class GrpcSagaEventService extends TxEventServiceImplBase {
           .createTime(new Date())
           .localTxId(message.getLocalTxId()).build();
       omegaCallbacks.get(message.getServiceName()).get(message.getInstanceId())
-          .ask(CompensateAckType.Succeed);
+          .getAck(CompensateAckType.Succeed);
     } else if (message.getType().equals(EventType.TxCompensateAckFailedEvent.name())) {
       event = TxCompensateAckEvent.builder()
           .succeed(false)
@@ -185,7 +185,7 @@ public class GrpcSagaEventService extends TxEventServiceImplBase {
           .createTime(new Date())
           .localTxId(message.getLocalTxId()).build();
       omegaCallbacks.get(message.getServiceName()).get(message.getInstanceId())
-          .ask(CompensateAckType.Failed);
+          .getAck(CompensateAckType.Failed);
     } else {
       ok = false;
     }