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 8a21836ba926a282ad464308e5c8479d2e7b8b9b Author: Daniel Qian <chanjars...@gmail.com> AuthorDate: Sun Apr 1 14:13:52 2018 +0800 Rename TxEventRepository#findTxStartedEventToCompensate method to findTxStartedEvent. The "ToCompensate" phrase in the original method name doesn't match the underlying code logic. --- .../main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java | 2 +- .../java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java | 2 +- .../org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java | 2 +- .../apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java index a52ebe5..0e84066 100644 --- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java +++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java @@ -135,7 +135,7 @@ public class EventScanner implements Runnable { eventRepository.save(toTxAbortedEvent(timeout)); if (timeout.type().equals(TxStartedEvent.name())) { - eventRepository.findTxStartedEventToCompensate(timeout.globalTxId(), timeout.localTxId()) + eventRepository.findTxStartedEvent(timeout.globalTxId(), timeout.localTxId()) .ifPresent(omegaCallback::compensate); } }); diff --git a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java index 4b6c997..2474f85 100644 --- a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java +++ b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java @@ -69,7 +69,7 @@ public interface TxEventRepository { * @param localTxId * @return {@link TxEvent} */ - Optional<TxEvent> findTxStartedEventToCompensate(String globalTxId, String localTxId); + Optional<TxEvent> findTxStartedEvent(String globalTxId, String localTxId); /** * Find {@link TxEvent}s which satisfy below requirements: diff --git a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java b/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java index d220994..9c0b103 100644 --- a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java +++ b/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java @@ -59,7 +59,7 @@ public class TxConsistentServiceTest { } @Override - public Optional<TxEvent> findTxStartedEventToCompensate(String globalTxId, String localTxId) { + public Optional<TxEvent> findTxStartedEvent(String globalTxId, String localTxId) { return events.stream() .filter(event -> globalTxId.equals(event.globalTxId()) && localTxId.equals(event.localTxId())) .findFirst(); diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java index d6ea21c..3f1acdc 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java @@ -48,7 +48,7 @@ class SpringTxEventRepository implements TxEventRepository { } @Override - public Optional<TxEvent> findTxStartedEventToCompensate(String globalTxId, String localTxId) { + public Optional<TxEvent> findTxStartedEvent(String globalTxId, String localTxId) { return eventRepo.findFirstStartedEventByGlobalTxIdAndLocalTxId(globalTxId, localTxId); } -- To stop receiving notification emails like this one, please contact ningji...@apache.org.