[servicecomb-pack] 08/13: SCB-1627 Rename CompensateAskWait to CompensateAckCountDownLatch

[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 bbc54ebd95f8fbee27fc25f796ede0fb214a860a
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Mon Dec 2 13:58:20 2019 +0800

    SCB-1627 Rename CompensateAskWait to CompensateAckCountDownLatch
---
 ...kWait.java => CompensateAckCountDownLatch.java} |  4 ++--
 .../pack/alpha/server/fsm/GrpcOmegaCallback.java   | 24 +++++++++++-----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/CompensateAskWait.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/CompensateAckCountDownLatch.java
similarity index 91%
rename from alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/CompensateAskWait.java
rename to alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/CompensateAckCountDownLatch.java
index 9dee861..188cc16 100644
--- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/CompensateAskWait.java
+++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/fsm/CompensateAckCountDownLatch.java
@@ -20,10 +20,10 @@ package org.apache.servicecomb.pack.alpha.server.fsm;
 import java.util.concurrent.CountDownLatch;
 import org.apache.servicecomb.pack.alpha.core.fsm.CompensateAckType;
 
-public class CompensateAskWait extends CountDownLatch {
+public class CompensateAckCountDownLatch extends CountDownLatch {
   private CompensateAckType type;
 
-  public CompensateAskWait(int count) {
+  public CompensateAckCountDownLatch(int count) {
     super(count);
   }
 
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 010ba6e..cd1bf72 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
@@ -33,7 +33,7 @@ class GrpcOmegaCallback implements OmegaCallback {
 
   private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private final StreamObserver<GrpcCompensateCommand> observer;
-  private CompensateAskWait compensateAskWait;
+  private CompensateAckCountDownLatch compensateAckCountDownLatch;
 
   GrpcOmegaCallback(StreamObserver<GrpcCompensateCommand> observer) {
     this.observer = observer;
@@ -41,7 +41,7 @@ class GrpcOmegaCallback implements OmegaCallback {
 
   @Override
   public void compensate(TxEvent event) {
-    compensateAskWait = new CompensateAskWait(1);
+    compensateAckCountDownLatch = new CompensateAckCountDownLatch(1);
     try {
       GrpcCompensateCommand command = GrpcCompensateCommand.newBuilder()
           .setGlobalTxId(event.globalTxId())
@@ -51,39 +51,39 @@ class GrpcOmegaCallback implements OmegaCallback {
           .setPayloads(ByteString.copyFrom(event.payloads()))
           .build();
       observer.onNext(command);
-      compensateAskWait.await();
-      if (compensateAskWait.getType() == CompensateAckType.Disconnected) {
+      compensateAckCountDownLatch.await();
+      if (compensateAckCountDownLatch.getType() == CompensateAckType.Disconnected) {
         throw new CompensateConnectException("Omega connect exception");
       }else{
-        LOG.info("compensate ask "+compensateAskWait.getType().name());
-        if(compensateAskWait.getType() == CompensateAckType.Failed){
+        LOG.info("compensate ask "+ compensateAckCountDownLatch.getType().name());
+        if(compensateAckCountDownLatch.getType() == CompensateAckType.Failed){
           throw new CompensateAckFailedException("An exception is thrown inside the compensation method");
         }
       }
     } catch (InterruptedException e) {
       throw new RuntimeException(e);
     } finally {
-      compensateAskWait = null;
+      compensateAckCountDownLatch = null;
     }
   }
 
   @Override
   public void disconnect() {
     observer.onCompleted();
-    if (compensateAskWait != null) {
-      compensateAskWait.countDown(CompensateAckType.Disconnected);
+    if (compensateAckCountDownLatch != null) {
+      compensateAckCountDownLatch.countDown(CompensateAckType.Disconnected);
     }
   }
 
   @Override
   public void ask(CompensateAckType type) {
-    if (compensateAskWait != null) {
-      compensateAskWait.countDown(type);
+    if (compensateAckCountDownLatch != null) {
+      compensateAckCountDownLatch.countDown(type);
     }
   }
 
   @Override
   public boolean isWaiting(){
-    return compensateAskWait == null ? false : true;
+    return compensateAckCountDownLatch == null ? false : true;
   }
 }