JAV-225 more appropriate naming for incomplete operations

apache · Jul 29, 2017 · 5b8238a · 5b8238a
1 parent a704a9b
commit 5b8238a
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git a/saga-core/src/main/java/io/servicecomb/saga/core/AbstractSagaState.java b/saga-core/src/main/java/io/servicecomb/saga/core/AbstractSagaState.java
@@ -52,12 +52,12 @@ public void run() {
   abstract void invoke(Collection<Node<SagaTask>> nodes);
 
   @Override
-  public void replay(Map<Operation, Collection<SagaEvent>> completedOperationsCopy) {
+  public void replay(Map<Operation, Collection<SagaEvent>> completedOperations) {
     boolean played = false;
     Collection<Node<SagaTask>> nodes = traveller.nodes();
     while (traveller.hasNext() && !played) {
       traveller.next();
-      played = replay(nodes, completedOperationsCopy);
+      played = replay(nodes, completedOperations);
     }
   }
 

diff --git a/saga-core/src/main/java/io/servicecomb/saga/core/CompensationEndedEvent.java b/saga-core/src/main/java/io/servicecomb/saga/core/CompensationEndedEvent.java
@@ -29,9 +29,9 @@ class CompensationEndedEvent extends SagaEvent {
   }
 
   @Override
-  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> orphanOperations) {
+  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> hangingOperations) {
     completedOperations.get(payload().compensation()).add(this);
-    orphanOperations.remove(payload());
+    hangingOperations.remove(payload());
   }
 
   @Override

diff --git a/saga-core/src/main/java/io/servicecomb/saga/core/CompensationStartedEvent.java b/saga-core/src/main/java/io/servicecomb/saga/core/CompensationStartedEvent.java
@@ -30,10 +30,10 @@ class CompensationStartedEvent extends SagaEvent {
   }
 
   @Override
-  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> orphanOperations) {
+  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> hangingOperations) {
     completedOperations.put(payload().compensation(), new LinkedList<>());
     completedOperations.get(payload().compensation()).add(this);
-    orphanOperations.add(payload());
+    hangingOperations.add(payload());
   }
 
   @Override

diff --git a/saga-core/src/main/java/io/servicecomb/saga/core/Saga.java b/saga-core/src/main/java/io/servicecomb/saga/core/Saga.java
@@ -43,7 +43,7 @@ public class Saga {
       Executors.newFixedThreadPool(5));
 
   private final Map<Operation, Collection<SagaEvent>> completedOperations;
-  private final Set<SagaTask> orphanOperations;
+  private final Set<SagaTask> hangingOperations;
 
   private final TransactionState transactionState;
   private final CompensationState compensationState;
@@ -59,7 +59,7 @@ public Saga(EventStore eventStore, RecoveryPolicy recoveryPolicy,
 
     this.eventStore = eventStore;
     this.completedOperations = new HashMap<>();
-    this.orphanOperations = new HashSet<>();
+    this.hangingOperations = new HashSet<>();
 
     this.transactionState = new TransactionState(executorService, new LoggingRecoveryPolicy(recoveryPolicy),
         traveller(sagaTaskGraph, new FromRootTraversalDirection<>()));
@@ -80,7 +80,7 @@ public void run() {
 
         gatherEvents(eventStore);
 
-        orphanOperations.forEach(sagaTask -> {
+        hangingOperations.forEach(sagaTask -> {
           sagaTask.commit();
           sagaTask.compensation();
         });
@@ -107,7 +107,7 @@ public void play() {
 
   private void gatherEvents(Iterable<EventEnvelope> events) {
     for (EventEnvelope event : events) {
-      event.event.gatherTo(completedOperations, orphanOperations);
+      event.event.gatherTo(completedOperations, hangingOperations);
     }
   }
 

diff --git a/saga-core/src/main/java/io/servicecomb/saga/core/SagaEndedEvent.java b/saga-core/src/main/java/io/servicecomb/saga/core/SagaEndedEvent.java
@@ -29,7 +29,7 @@ class SagaEndedEvent extends SagaEvent {
   }
 
   @Override
-  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> orphanOperations) {
+  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> hangingOperations) {
     completedOperations.get(payload().transaction()).add(this);
   }
 

diff --git a/saga-core/src/main/java/io/servicecomb/saga/core/SagaEvent.java b/saga-core/src/main/java/io/servicecomb/saga/core/SagaEvent.java
@@ -34,7 +34,7 @@ SagaTask payload() {
     return payload;
   }
 
-  public abstract void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> orphanOperations);
+  public abstract void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> hangingOperations);
 
   public abstract void play(Iterator<Node<SagaTask>> iterator);
 }
diff --git a/saga-core/src/main/java/io/servicecomb/saga/core/SagaStartedEvent.java b/saga-core/src/main/java/io/servicecomb/saga/core/SagaStartedEvent.java
@@ -30,7 +30,7 @@ class SagaStartedEvent extends SagaEvent {
   }
 
   @Override
-  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> orphanOperations) {
+  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> hangingOperations) {
     completedOperations.put(payload().transaction(), new LinkedList<>());
     completedOperations.get(payload().transaction()).add(this);
   }

diff --git a/saga-core/src/main/java/io/servicecomb/saga/core/SagaState.java b/saga-core/src/main/java/io/servicecomb/saga/core/SagaState.java
@@ -25,5 +25,5 @@ interface SagaState {
 
   void run();
 
-  void replay(Map<Operation, Collection<SagaEvent>> completedOperationsCopy);
+  void replay(Map<Operation, Collection<SagaEvent>> completedOperations);
 }
diff --git a/saga-core/src/main/java/io/servicecomb/saga/core/TransactionAbortedEvent.java b/saga-core/src/main/java/io/servicecomb/saga/core/TransactionAbortedEvent.java
@@ -29,9 +29,9 @@ class TransactionAbortedEvent extends SagaEvent {
   }
 
   @Override
-  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> orphanOperations) {
+  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> hangingOperations) {
     completedOperations.remove(payload().transaction());
-    orphanOperations.remove(payload());
+    hangingOperations.remove(payload());
   }
 
   @Override

diff --git a/saga-core/src/main/java/io/servicecomb/saga/core/TransactionEndedEvent.java b/saga-core/src/main/java/io/servicecomb/saga/core/TransactionEndedEvent.java
@@ -29,9 +29,9 @@ class TransactionEndedEvent extends SagaEvent {
   }
 
   @Override
-  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> orphanOperations) {
+  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> hangingOperations) {
     completedOperations.get(payload().transaction()).add(this);
-    orphanOperations.remove(payload());
+    hangingOperations.remove(payload());
   }
 
   @Override

diff --git a/saga-core/src/main/java/io/servicecomb/saga/core/TransactionStartedEvent.java b/saga-core/src/main/java/io/servicecomb/saga/core/TransactionStartedEvent.java
@@ -30,10 +30,10 @@ class TransactionStartedEvent extends SagaEvent {
   }
 
   @Override
-  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> orphanOperations) {
+  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> hangingOperations) {
     completedOperations.put(payload().transaction(), new LinkedList<>());
     completedOperations.get(payload().transaction()).add(this);
-    orphanOperations.add(payload());
+    hangingOperations.add(payload());
   }
 
   @Override

diff --git a/saga-core/src/test/java/io/servicecomb/saga/core/DummyEvent.java b/saga-core/src/test/java/io/servicecomb/saga/core/DummyEvent.java
@@ -29,7 +29,7 @@ public DummyEvent(SagaTask payload) {
   }
 
   @Override
-  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> orphanOperations) {
+  public void gatherTo(Map<Operation, Collection<SagaEvent>> completedOperations, Set<SagaTask> hangingOperations) {
 
   }