[servicecomb-pack] 06/13: SCB-1627 Rename CompensateAskFailedException to CompensateAckFailedException

[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 bb52a9837590d70f3797e09289f525ac284778a1
Author: Lei Zhang <zh...@apache.org>
AuthorDate: Mon Dec 2 09:28:29 2019 +0800

    SCB-1627 Rename CompensateAskFailedException to CompensateAckFailedException
---
 .../apache/servicecomb/pack/alpha/core/CompositeOmegaCallback.java    | 4 ++--
 ...nsateAskFailedException.java => CompensateAckFailedException.java} | 4 ++--
 .../apache/servicecomb/pack/alpha/server/fsm/GrpcOmegaCallback.java   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallback.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallback.java
index 95b0df6..23b585a 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallback.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/CompositeOmegaCallback.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.servicecomb.pack.alpha.core.exception.CompensateAskFailedException;
+import org.apache.servicecomb.pack.alpha.core.exception.CompensateAckFailedException;
 import org.apache.servicecomb.pack.alpha.core.exception.CompensateConnectException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,7 +59,7 @@ public class CompositeOmegaCallback implements OmegaCallback {
     } catch (CompensateConnectException e) {
       serviceCallbacks.values().remove(omegaCallback);
       throw e;
-    } catch (CompensateAskFailedException e) {
+    } catch (CompensateAckFailedException e) {
       throw e;
     } catch (Exception e) {
       serviceCallbacks.values().remove(omegaCallback);
diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/exception/CompensateAskFailedException.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/exception/CompensateAckFailedException.java
similarity index 88%
rename from alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/exception/CompensateAskFailedException.java
rename to alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/exception/CompensateAckFailedException.java
index 4adbe2b..b6dc51e 100644
--- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/exception/CompensateAskFailedException.java
+++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/pack/alpha/core/exception/CompensateAckFailedException.java
@@ -17,8 +17,8 @@
 
 package org.apache.servicecomb.pack.alpha.core.exception;
 
-public class CompensateAskFailedException extends RuntimeException {
-  public CompensateAskFailedException(String cause) {
+public class CompensateAckFailedException extends RuntimeException {
+  public CompensateAckFailedException(String cause) {
     super(cause);
   }
 }
\ No newline at end of file
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 3187892..1624479 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
@@ -22,7 +22,7 @@ import io.grpc.stub.StreamObserver;
 import java.lang.invoke.MethodHandles;
 import org.apache.servicecomb.pack.alpha.core.OmegaCallback;
 import org.apache.servicecomb.pack.alpha.core.TxEvent;
-import org.apache.servicecomb.pack.alpha.core.exception.CompensateAskFailedException;
+import org.apache.servicecomb.pack.alpha.core.exception.CompensateAckFailedException;
 import org.apache.servicecomb.pack.alpha.core.exception.CompensateConnectException;
 import org.apache.servicecomb.pack.alpha.core.fsm.CompensateAskType;
 import org.apache.servicecomb.pack.contract.grpc.GrpcCompensateCommand;
@@ -57,7 +57,7 @@ class GrpcOmegaCallback implements OmegaCallback {
       }else{
         LOG.info("compensate ask "+compensateAskWait.getType().name());
         if(compensateAskWait.getType() == CompensateAskType.Failed){
-          throw new CompensateAskFailedException("An exception is thrown inside the compensation method");
+          throw new CompensateAckFailedException("An exception is thrown inside the compensation method");
         }
       }
     } catch (InterruptedException e) {