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 398056424bd644bfc010648baa3d84b396c425a5 Author: Lei Zhang <[email protected]> AuthorDate: Sun Jul 28 19:30:13 2019 +0800 SCB-1369 Fixed typo Global --- .../AbstractTransactionRepositoryChannel.java | 6 ++--- .../fsm/repository/NoneTransactionRepository.java | 6 ++--- .../fsm/repository/TransactionRepository.java | 6 ++--- .../repository/TransactionRepositoryChannel.java | 4 +-- .../MemoryTransactionRepositoryChannel.java | 14 +++++----- .../ElasticsearchTransactionRepository.java | 14 +++++----- .../elasticsearch/GloablTransactionDocument.java | 4 +-- ...oablTransaction.java => GlobalTransaction.java} | 30 +++++++++++----------- .../repository/model/PagingGloablTransactions.java | 14 +++++----- .../spring/integration/akka/SagaDataExtension.java | 4 +-- .../ElasticsearchTransactionRepositoryTest.java | 8 +++--- .../pack/alpha/server/api/APIControllerV1.java | 8 +++--- docs/fsm/how_to_use_fsm_zh.md | 4 +-- 13 files changed, 61 insertions(+), 61 deletions(-) diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/AbstractTransactionRepositoryChannel.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/AbstractTransactionRepositoryChannel.java index 92ed257..01727d2 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/AbstractTransactionRepositoryChannel.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/AbstractTransactionRepositoryChannel.java @@ -18,14 +18,14 @@ package org.apache.servicecomb.pack.alpha.fsm.repository; import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsService; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GloablTransaction; +import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; public abstract class AbstractTransactionRepositoryChannel implements TransactionRepositoryChannel { protected final MetricsService metricsService; protected final TransactionRepository repository; - public abstract void sendTo(GloablTransaction transaction); + public abstract void sendTo(GlobalTransaction transaction); public AbstractTransactionRepositoryChannel( TransactionRepository repository, @@ -34,7 +34,7 @@ public abstract class AbstractTransactionRepositoryChannel implements Transactio this.metricsService = metricsService; } - public void send(GloablTransaction transaction) { + public void send(GlobalTransaction transaction) { this.sendTo(transaction); } diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/NoneTransactionRepository.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/NoneTransactionRepository.java index 9cd6d1e..e40629f 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/NoneTransactionRepository.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/NoneTransactionRepository.java @@ -18,7 +18,7 @@ package org.apache.servicecomb.pack.alpha.fsm.repository; import java.lang.invoke.MethodHandles; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GloablTransaction; +import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGloablTransactions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,12 +28,12 @@ public class NoneTransactionRepository implements TransactionRepository { private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @Override - public void send(GloablTransaction transaction) { + public void send(GlobalTransaction transaction) { LOG.warn("Please configure alpha.feature.akka.transaction.repository.type=elasticsearch to use elasticsearch to persist transaction data."); } @Override - public GloablTransaction getGloablTransactionByGlobalTxId(String globalTxId){ + public GlobalTransaction getGloablTransactionByGlobalTxId(String globalTxId){ throw new UnsupportedOperationException("NoneTransactionRepository Unsupported!"); } diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepository.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepository.java index 472aabc..7e81fc7 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepository.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepository.java @@ -17,14 +17,14 @@ package org.apache.servicecomb.pack.alpha.fsm.repository; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GloablTransaction; +import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGloablTransactions; public interface TransactionRepository { - void send(GloablTransaction transaction) throws Exception; + void send(GlobalTransaction transaction) throws Exception; - GloablTransaction getGloablTransactionByGlobalTxId(String globalTxId) + GlobalTransaction getGloablTransactionByGlobalTxId(String globalTxId) throws Exception; PagingGloablTransactions getGloablTransactions(int page, int size) diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepositoryChannel.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepositoryChannel.java index a6998b0..7c85e9d 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepositoryChannel.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/TransactionRepositoryChannel.java @@ -17,8 +17,8 @@ package org.apache.servicecomb.pack.alpha.fsm.repository; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GloablTransaction; +import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; public interface TransactionRepositoryChannel { - void send(GloablTransaction transaction); + void send(GlobalTransaction transaction); } diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/channel/MemoryTransactionRepositoryChannel.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/channel/MemoryTransactionRepositoryChannel.java index 8b9a6eb..8a143eb 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/channel/MemoryTransactionRepositoryChannel.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/channel/MemoryTransactionRepositoryChannel.java @@ -21,7 +21,7 @@ import java.lang.invoke.MethodHandles; import java.util.concurrent.LinkedBlockingQueue; import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsService; import org.apache.servicecomb.pack.alpha.fsm.repository.AbstractTransactionRepositoryChannel; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GloablTransaction; +import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; import org.apache.servicecomb.pack.alpha.fsm.repository.TransactionRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,21 +29,21 @@ import org.slf4j.LoggerFactory; public class MemoryTransactionRepositoryChannel extends AbstractTransactionRepositoryChannel { private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - private final LinkedBlockingQueue<GloablTransaction> gloablTransactionQueue; + private final LinkedBlockingQueue<GlobalTransaction> globalTransactionQueue; private int size; public MemoryTransactionRepositoryChannel(TransactionRepository repository, int size, MetricsService metricsService) { super(repository, metricsService); this.size = size > 0 ? size : Integer.MAX_VALUE; - gloablTransactionQueue = new LinkedBlockingQueue(this.size); + globalTransactionQueue = new LinkedBlockingQueue(this.size); new Thread(new GloablTransactionConsumer(), "MemoryTransactionRepositoryChannel").start(); } @Override - public void sendTo(GloablTransaction transaction) { + public void sendTo(GlobalTransaction transaction) { try { - gloablTransactionQueue.put(transaction); + globalTransactionQueue.put(transaction); } catch (Exception e) { throw new RuntimeException(e); } @@ -55,10 +55,10 @@ public class MemoryTransactionRepositoryChannel extends AbstractTransactionRepos public void run() { while (true) { try { - GloablTransaction transaction = gloablTransactionQueue.peek(); + GlobalTransaction transaction = globalTransactionQueue.peek(); if (transaction != null) { repository.send(transaction); - gloablTransactionQueue.poll(); + globalTransactionQueue.poll(); } else { Thread.sleep(10); } diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java index ef62b18..23e27da 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/ElasticsearchTransactionRepository.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.List; import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsService; import org.apache.servicecomb.pack.alpha.fsm.repository.TransactionRepository; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GloablTransaction; +import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGloablTransactions; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.query.QueryBuilders; @@ -76,7 +76,7 @@ public class ElasticsearchTransactionRepository implements TransactionRepository } @Override - public void send(GloablTransaction transaction) throws Exception { + public void send(GlobalTransaction transaction) throws Exception { long begin = System.currentTimeMillis(); queries.add(convert(transaction)); batchSizeCounter++; @@ -91,7 +91,7 @@ public class ElasticsearchTransactionRepository implements TransactionRepository } @Override - public GloablTransaction getGloablTransactionByGlobalTxId(String globalTxId) { + public GlobalTransaction getGloablTransactionByGlobalTxId(String globalTxId) { GetQuery getQuery = new GetQuery(); getQuery.setId(globalTxId); GloablTransactionDocument gloablTransaction = this.template @@ -102,7 +102,7 @@ public class ElasticsearchTransactionRepository implements TransactionRepository @Override public PagingGloablTransactions getGloablTransactions(int page, int size) { long start = System.currentTimeMillis(); - List<GloablTransaction> gloablTransactions = new ArrayList(); + List<GlobalTransaction> globalTransactions = new ArrayList(); SearchQuery searchQuery = new NativeSearchQueryBuilder() .withIndices(INDEX_NAME) .withTypes(INDEX_TYPE) @@ -122,7 +122,7 @@ public class ElasticsearchTransactionRepository implements TransactionRepository pageCursor++; } else { for (GloablTransactionDocument dto : scroll.getContent()) { - gloablTransactions.add(dto); + globalTransactions.add(dto); } break; } @@ -130,7 +130,7 @@ public class ElasticsearchTransactionRepository implements TransactionRepository LOG.info("Query total hits {}, return page {}, size {}", scroll.getTotalElements(), page, size); this.template.clearScroll(scroll.getScrollId()); return PagingGloablTransactions.builder().page(page).size(size).total(scroll.getTotalElements()) - .gloablTransactions(gloablTransactions).elapsed(System.currentTimeMillis() - start).build(); + .gloablTransactions(globalTransactions).elapsed(System.currentTimeMillis() - start).build(); } private final SearchResultMapper searchResultMapper = new SearchResultMapper() { @@ -161,7 +161,7 @@ public class ElasticsearchTransactionRepository implements TransactionRepository } }; - private IndexQuery convert(GloablTransaction transaction) throws JsonProcessingException { + private IndexQuery convert(GlobalTransaction transaction) throws JsonProcessingException { IndexQuery indexQuery = new IndexQuery(); indexQuery.setId(transaction.getGlobalTxId()); indexQuery.setSource(mapper.writeValueAsString(transaction)); diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/GloablTransactionDocument.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/GloablTransactionDocument.java index d37639b..444190f 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/GloablTransactionDocument.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/GloablTransactionDocument.java @@ -1,9 +1,9 @@ package org.apache.servicecomb.pack.alpha.fsm.repository.elasticsearch; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GloablTransaction; +import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; import org.springframework.data.elasticsearch.annotations.Document; @Document(indexName = ElasticsearchTransactionRepository.INDEX_NAME, type = ElasticsearchTransactionRepository.INDEX_TYPE) -public class GloablTransactionDocument extends GloablTransaction { +public class GloablTransactionDocument extends GlobalTransaction { } diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/GloablTransaction.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/GlobalTransaction.java similarity index 84% rename from alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/GloablTransaction.java rename to alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/GlobalTransaction.java index f0572a2..8ec31c4 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/GloablTransaction.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/GlobalTransaction.java @@ -26,7 +26,7 @@ import org.apache.servicecomb.pack.alpha.fsm.SagaActorState; import org.apache.servicecomb.pack.alpha.fsm.TransactionType; import org.apache.servicecomb.pack.alpha.fsm.event.base.BaseEvent; -public class GloablTransaction { +public class GlobalTransaction { private String globalTxId; private TransactionType type; private String serviceName; @@ -153,26 +153,26 @@ public class GloablTransaction { return this; } - public GloablTransaction build() { - GloablTransaction gloablTransaction = new GloablTransaction(); - gloablTransaction.instanceId = this.instanceId; - gloablTransaction.state = this.state; - gloablTransaction.type = this.type; - gloablTransaction.serviceName = this.serviceName; - gloablTransaction.beginTime = this.beginTime; - gloablTransaction.endTime = this.endTime; - gloablTransaction.globalTxId = this.globalTxId; - gloablTransaction.subTxSize = this.subTxSize; - gloablTransaction.durationTime = this.endTime.getTime() - this.beginTime.getTime(); - gloablTransaction.subTransactions = this.subTransactions; + public GlobalTransaction build() { + GlobalTransaction globalTransaction = new GlobalTransaction(); + globalTransaction.instanceId = this.instanceId; + globalTransaction.state = this.state; + globalTransaction.type = this.type; + globalTransaction.serviceName = this.serviceName; + globalTransaction.beginTime = this.beginTime; + globalTransaction.endTime = this.endTime; + globalTransaction.globalTxId = this.globalTxId; + globalTransaction.subTxSize = this.subTxSize; + globalTransaction.durationTime = this.endTime.getTime() - this.beginTime.getTime(); + globalTransaction.subTransactions = this.subTransactions; for(BaseEvent event : events){ try { - gloablTransaction.events.add(event.toMap()); + globalTransaction.events.add(event.toMap()); } catch (Exception e) { new RuntimeException(e.getMessage(),e); } } - return gloablTransaction; + return globalTransaction; } } } diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/PagingGloablTransactions.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/PagingGloablTransactions.java index a477019..741cdbe 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/PagingGloablTransactions.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/PagingGloablTransactions.java @@ -24,11 +24,11 @@ public class PagingGloablTransactions { return elapsed; } - public List<GloablTransaction> getGloablTransactions() { - return gloablTransactions; + public List<GlobalTransaction> getGlobalTransactions() { + return globalTransactions; } - private List<GloablTransaction> gloablTransactions; + private List<GlobalTransaction> globalTransactions; public static Builder builder() { return new Builder(); @@ -40,7 +40,7 @@ public class PagingGloablTransactions { private int page; private int size; private long elapsed; - private List<GloablTransaction> gloablTransactions; + private List<GlobalTransaction> globalTransactions; private Builder() { } @@ -65,15 +65,15 @@ public class PagingGloablTransactions { return this; } - public Builder gloablTransactions(List<GloablTransaction> gloablTransactions) { - this.gloablTransactions = gloablTransactions; + public Builder gloablTransactions(List<GlobalTransaction> globalTransactions) { + this.globalTransactions = globalTransactions; return this; } public PagingGloablTransactions build() { PagingGloablTransactions pagingGloablTransactions = new PagingGloablTransactions(); pagingGloablTransactions.total = this.total; - pagingGloablTransactions.gloablTransactions = this.gloablTransactions; + pagingGloablTransactions.globalTransactions = this.globalTransactions; pagingGloablTransactions.page = this.page; pagingGloablTransactions.size = this.size; pagingGloablTransactions.elapsed = this.elapsed; diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/SagaDataExtension.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/SagaDataExtension.java index dbf7425..f4b8e3a 100644 --- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/SagaDataExtension.java +++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/spring/integration/akka/SagaDataExtension.java @@ -28,7 +28,7 @@ import org.apache.servicecomb.pack.alpha.fsm.SagaActorState; import org.apache.servicecomb.pack.alpha.fsm.TransactionType; import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsService; import org.apache.servicecomb.pack.alpha.fsm.model.SagaData; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GloablTransaction; +import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; import org.apache.servicecomb.pack.alpha.fsm.repository.model.SagaSubTransaction; import org.apache.servicecomb.pack.alpha.fsm.repository.TransactionRepositoryChannel; import org.apache.servicecomb.pack.alpha.fsm.spring.integration.akka.SagaDataExtension.SagaDataExt; @@ -75,7 +75,7 @@ public class SagaDataExtension extends AbstractExtensionId<SagaDataExt> { .state(v.getState()) .build()); }); - GloablTransaction record = GloablTransaction.builder() + GlobalTransaction record = GlobalTransaction.builder() .type(TransactionType.SAGA) .serviceName(sagaData.getServiceName()) .instanceId(sagaData.getInstanceId()) diff --git a/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/repository/ElasticsearchTransactionRepositoryTest.java b/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/repository/ElasticsearchTransactionRepositoryTest.java index 2833487..4192000 100644 --- a/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/repository/ElasticsearchTransactionRepositoryTest.java +++ b/alpha/alpha-fsm/src/test/java/org/apache/servicecomb/pack/alpha/fsm/repository/ElasticsearchTransactionRepositoryTest.java @@ -28,7 +28,7 @@ import org.apache.servicecomb.pack.alpha.fsm.SagaActorState; import org.apache.servicecomb.pack.alpha.fsm.TransactionType; import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsService; import org.apache.servicecomb.pack.alpha.fsm.repository.elasticsearch.ElasticsearchTransactionRepository; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GloablTransaction; +import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -57,7 +57,7 @@ public class ElasticsearchTransactionRepositoryTest { int size = 100; for (int i = 0; i < size; i++) { final String globalTxId = UUID.randomUUID().toString(); - GloablTransaction transaction = GloablTransaction.builder() + GlobalTransaction transaction = GlobalTransaction.builder() .type(TransactionType.SAGA) .serviceName("serviceName") .instanceId("instanceId") @@ -87,7 +87,7 @@ public class ElasticsearchTransactionRepositoryTest { metricsService, batchSize, refreshTime * 1000); for (int i = 0; i < size; i++) { final String globalTxId = UUID.randomUUID().toString(); - GloablTransaction transaction = GloablTransaction.builder() + GlobalTransaction transaction = GlobalTransaction.builder() .type(TransactionType.SAGA) .serviceName("serviceName") .instanceId("instanceId") @@ -116,7 +116,7 @@ public class ElasticsearchTransactionRepositoryTest { metricsService, batchSize, refreshTime * 1000); for (int i = 0; i < size; i++) { final String globalTxId = UUID.randomUUID().toString(); - GloablTransaction transaction = GloablTransaction.builder() + GlobalTransaction transaction = GlobalTransaction.builder() .type(TransactionType.SAGA) .serviceName("serviceName") .instanceId("instanceId") diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1.java index 336b710..c5b621c 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1.java @@ -18,7 +18,7 @@ package org.apache.servicecomb.pack.alpha.server.api; import org.apache.servicecomb.pack.alpha.fsm.repository.TransactionRepository; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.GloablTransaction; +import org.apache.servicecomb.pack.alpha.fsm.repository.model.GlobalTransaction; import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGloablTransactions; import org.apache.servicecomb.pack.alpha.server.metrics.AlphaMetrics; import org.springframework.beans.factory.annotation.Autowired; @@ -45,11 +45,11 @@ public class APIControllerV1 { } @GetMapping(value = "/transaction/{globalTxId}") - ResponseEntity<GloablTransaction> getTransactionByGlobalTxId(@PathVariable String globalTxId) + ResponseEntity<GlobalTransaction> getTransactionByGlobalTxId(@PathVariable String globalTxId) throws Exception { - GloablTransaction gloablTransaction = transactionRepository + GlobalTransaction globalTransaction = transactionRepository .getGloablTransactionByGlobalTxId(globalTxId); - return ResponseEntity.ok(gloablTransaction); + return ResponseEntity.ok(globalTransaction); } @GetMapping(value = "/transaction") diff --git a/docs/fsm/how_to_use_fsm_zh.md b/docs/fsm/how_to_use_fsm_zh.md index d5da9b8..c458f74 100644 --- a/docs/fsm/how_to_use_fsm_zh.md +++ b/docs/fsm/how_to_use_fsm_zh.md @@ -114,7 +114,7 @@ curl http://localhost:8090/alpha/api/v1/metrics "page": 0, "size": 50, "elapsed": 581, - "gloablTransactions": [...] + "globalTransactions": [...] } ``` @@ -130,7 +130,7 @@ curl http://localhost:8090/alpha/api/v1/metrics * page 本次查询结果页号 * size 本次查询行数 * elapsed 本次查询耗时（毫秒） - * gloablTransactions 事件数据列表 + * globalTransactions 事件数据列表 * 查询一条事务
