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 4207b6572bdcff17da09020b62f259c48fd52756 Author: Lei Zhang <[email protected]> AuthorDate: Sat Aug 3 00:10:03 2019 +0800 SCB-1369 Fixed typo --- .../fsm/repository/NoneTransactionRepository.java | 4 ++-- .../alpha/fsm/repository/TransactionRepository.java | 4 ++-- .../ElasticsearchTransactionRepository.java | 6 +++--- ...Transactions.java => PagingGlobalTransactions.java} | 18 +++++++++--------- .../pack/alpha/server/api/APIControllerV1.java | 8 ++++---- .../pack/alpha/server/api/APIControllerV1Tests.java | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) 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 e40629f..f18f8ed 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 @@ -19,7 +19,7 @@ package org.apache.servicecomb.pack.alpha.fsm.repository; import java.lang.invoke.MethodHandles; 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.fsm.repository.model.PagingGlobalTransactions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +38,7 @@ public class NoneTransactionRepository implements TransactionRepository { } @Override - public PagingGloablTransactions getGloablTransactions(int page, int size) throws Exception { + public PagingGlobalTransactions getGloablTransactions(int page, int size) throws Exception { 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 7e81fc7..8079462 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 @@ -18,7 +18,7 @@ package org.apache.servicecomb.pack.alpha.fsm.repository; 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.fsm.repository.model.PagingGlobalTransactions; public interface TransactionRepository { @@ -27,6 +27,6 @@ public interface TransactionRepository { GlobalTransaction getGloablTransactionByGlobalTxId(String globalTxId) throws Exception; - PagingGloablTransactions getGloablTransactions(int page, int size) + PagingGlobalTransactions getGloablTransactions(int page, int size) throws Exception; } 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 23e27da..b802cdf 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 @@ -27,7 +27,7 @@ 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.GlobalTransaction; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGloablTransactions; +import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGlobalTransactions; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; @@ -100,7 +100,7 @@ public class ElasticsearchTransactionRepository implements TransactionRepository } @Override - public PagingGloablTransactions getGloablTransactions(int page, int size) { + public PagingGlobalTransactions getGloablTransactions(int page, int size) { long start = System.currentTimeMillis(); List<GlobalTransaction> globalTransactions = new ArrayList(); SearchQuery searchQuery = new NativeSearchQueryBuilder() @@ -129,7 +129,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()) + return PagingGlobalTransactions.builder().page(page).size(size).total(scroll.getTotalElements()) .gloablTransactions(globalTransactions).elapsed(System.currentTimeMillis() - start).build(); } 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/PagingGlobalTransactions.java similarity index 81% rename from alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/PagingGloablTransactions.java rename to alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/PagingGlobalTransactions.java index 980a886..73dab61 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/PagingGlobalTransactions.java @@ -19,7 +19,7 @@ package org.apache.servicecomb.pack.alpha.fsm.repository.model; import java.util.List; -public class PagingGloablTransactions { +public class PagingGlobalTransactions { private long total; private int page; private int size; @@ -87,14 +87,14 @@ public class PagingGloablTransactions { return this; } - public PagingGloablTransactions build() { - PagingGloablTransactions pagingGloablTransactions = new PagingGloablTransactions(); - pagingGloablTransactions.total = this.total; - pagingGloablTransactions.globalTransactions = this.globalTransactions; - pagingGloablTransactions.page = this.page; - pagingGloablTransactions.size = this.size; - pagingGloablTransactions.elapsed = this.elapsed; - return pagingGloablTransactions; + public PagingGlobalTransactions build() { + PagingGlobalTransactions pagingGlobalTransactions = new PagingGlobalTransactions(); + pagingGlobalTransactions.total = this.total; + pagingGlobalTransactions.globalTransactions = this.globalTransactions; + pagingGlobalTransactions.page = this.page; + pagingGlobalTransactions.size = this.size; + pagingGlobalTransactions.elapsed = this.elapsed; + return pagingGlobalTransactions; } } } 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 c5b621c..8898075 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 @@ -19,7 +19,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.GlobalTransaction; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGloablTransactions; +import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGlobalTransactions; import org.apache.servicecomb.pack.alpha.server.metrics.AlphaMetrics; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -53,11 +53,11 @@ public class APIControllerV1 { } @GetMapping(value = "/transaction") - ResponseEntity<PagingGloablTransactions> getTransactions(@RequestParam(value = "page", required = false, defaultValue = "0") int page, + ResponseEntity<PagingGlobalTransactions> getTransactions(@RequestParam(value = "page", required = false, defaultValue = "0") int page, @RequestParam(value = "size", required = false, defaultValue = "50") int size) throws Exception { - PagingGloablTransactions pagingGloablTransactions = transactionRepository + PagingGlobalTransactions pagingGlobalTransactions = transactionRepository .getGloablTransactions(page, size); - return ResponseEntity.ok(pagingGloablTransactions); + return ResponseEntity.ok(pagingGlobalTransactions); } } diff --git a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1Tests.java b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1Tests.java index e4914b2..d7c63c1 100644 --- a/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1Tests.java +++ b/alpha/alpha-server/src/test/java/org/apache/servicecomb/pack/alpha/server/api/APIControllerV1Tests.java @@ -44,7 +44,7 @@ import org.apache.servicecomb.pack.alpha.fsm.metrics.MetricsBean; 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.GlobalTransaction; -import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGloablTransactions; +import org.apache.servicecomb.pack.alpha.fsm.repository.model.PagingGlobalTransactions; import org.apache.servicecomb.pack.alpha.fsm.repository.model.SagaSubTransaction; import org.apache.servicecomb.pack.alpha.server.metrics.AlphaMetrics; import org.junit.Test; @@ -179,7 +179,7 @@ public class APIControllerV1Tests { .events(events) .subTransactions(subTransactions) .build()); - PagingGloablTransactions paging = PagingGloablTransactions.builder() + PagingGlobalTransactions paging = PagingGlobalTransactions.builder() .page(0) .size(50) .elapsed(10)
