You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2019/08/05 14:47:47 UTC
[servicecomb-pack] 36/38: SCB-1369 Fixed global typo
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 4130d60488a314114c3aea6614c3c53ec6d0baa1
Author: Lei Zhang <co...@gmail.com>
AuthorDate: Sat Aug 3 03:48:26 2019 +0800
SCB-1369 Fixed global typo
---
.../fsm/repository/NoneTransactionRepository.java | 4 +--
.../fsm/repository/TransactionRepository.java | 4 +--
.../MemoryTransactionRepositoryChannel.java | 4 +--
.../ElasticsearchTransactionRepository.java | 32 +++++++++++-----------
...ocument.java => GlobalTransactionDocument.java} | 2 +-
.../repository/model/PagingGlobalTransactions.java | 2 +-
.../pack/alpha/server/api/APIControllerV1.java | 4 +--
.../alpha/server/api/APIControllerV1Tests.java | 6 ++--
8 files changed, 29 insertions(+), 29 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 f18f8ed..fac9cd2 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
@@ -33,12 +33,12 @@ public class NoneTransactionRepository implements TransactionRepository {
}
@Override
- public GlobalTransaction getGloablTransactionByGlobalTxId(String globalTxId){
+ public GlobalTransaction getGlobalTransactionByGlobalTxId(String globalTxId){
throw new UnsupportedOperationException("NoneTransactionRepository Unsupported!");
}
@Override
- public PagingGlobalTransactions getGloablTransactions(int page, int size) throws Exception {
+ public PagingGlobalTransactions getGlobalTransactions(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 8079462..463ff59 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
@@ -24,9 +24,9 @@ public interface TransactionRepository {
void send(GlobalTransaction transaction) throws Exception;
- GlobalTransaction getGloablTransactionByGlobalTxId(String globalTxId)
+ GlobalTransaction getGlobalTransactionByGlobalTxId(String globalTxId)
throws Exception;
- PagingGlobalTransactions getGloablTransactions(int page, int size)
+ PagingGlobalTransactions getGlobalTransactions(int page, int size)
throws Exception;
}
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 8a143eb..abc5add 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
@@ -37,7 +37,7 @@ public class MemoryTransactionRepositoryChannel extends AbstractTransactionRepos
super(repository, metricsService);
this.size = size > 0 ? size : Integer.MAX_VALUE;
globalTransactionQueue = new LinkedBlockingQueue(this.size);
- new Thread(new GloablTransactionConsumer(), "MemoryTransactionRepositoryChannel").start();
+ new Thread(new GlobalTransactionConsumer(), "MemoryTransactionRepositoryChannel").start();
}
@Override
@@ -49,7 +49,7 @@ public class MemoryTransactionRepositoryChannel extends AbstractTransactionRepos
}
}
- class GloablTransactionConsumer implements Runnable {
+ class GlobalTransactionConsumer implements Runnable {
@Override
public void run() {
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 b802cdf..3a1a430 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
@@ -91,16 +91,16 @@ public class ElasticsearchTransactionRepository implements TransactionRepository
}
@Override
- public GlobalTransaction getGloablTransactionByGlobalTxId(String globalTxId) {
+ public GlobalTransaction getGlobalTransactionByGlobalTxId(String globalTxId) {
GetQuery getQuery = new GetQuery();
getQuery.setId(globalTxId);
- GloablTransactionDocument gloablTransaction = this.template
- .queryForObject(getQuery, GloablTransactionDocument.class);
- return gloablTransaction;
+ GlobalTransactionDocument globalTransaction = this.template
+ .queryForObject(getQuery, GlobalTransactionDocument.class);
+ return globalTransaction;
}
@Override
- public PagingGlobalTransactions getGloablTransactions(int page, int size) {
+ public PagingGlobalTransactions getGlobalTransactions(int page, int size) {
long start = System.currentTimeMillis();
List<GlobalTransaction> globalTransactions = new ArrayList();
SearchQuery searchQuery = new NativeSearchQueryBuilder()
@@ -110,18 +110,18 @@ public class ElasticsearchTransactionRepository implements TransactionRepository
.withPageable(PageRequest.of(page, size))
.build();
- ScrolledPage<GloablTransactionDocument> scroll = (ScrolledPage<GloablTransactionDocument>) this.template
- .startScroll(SCROLL_TIMEOUT, searchQuery, GloablTransactionDocument.class,
+ ScrolledPage<GlobalTransactionDocument> scroll = (ScrolledPage<GlobalTransactionDocument>) this.template
+ .startScroll(SCROLL_TIMEOUT, searchQuery, GlobalTransactionDocument.class,
searchResultMapper);
int pageCursor = 0;
while (scroll.hasContent()) {
if (pageCursor < page) {
- scroll = (ScrolledPage<GloablTransactionDocument>) this.template
- .continueScroll(scroll.getScrollId(), SCROLL_TIMEOUT, GloablTransactionDocument.class,
+ scroll = (ScrolledPage<GlobalTransactionDocument>) this.template
+ .continueScroll(scroll.getScrollId(), SCROLL_TIMEOUT, GlobalTransactionDocument.class,
searchResultMapper);
pageCursor++;
} else {
- for (GloablTransactionDocument dto : scroll.getContent()) {
+ for (GlobalTransactionDocument dto : scroll.getContent()) {
globalTransactions.add(dto);
}
break;
@@ -130,27 +130,27 @@ public class ElasticsearchTransactionRepository implements TransactionRepository
LOG.info("Query total hits {}, return page {}, size {}", scroll.getTotalElements(), page, size);
this.template.clearScroll(scroll.getScrollId());
return PagingGlobalTransactions.builder().page(page).size(size).total(scroll.getTotalElements())
- .gloablTransactions(globalTransactions).elapsed(System.currentTimeMillis() - start).build();
+ .globalTransactions(globalTransactions).elapsed(System.currentTimeMillis() - start).build();
}
private final SearchResultMapper searchResultMapper = new SearchResultMapper() {
@Override
public <T> AggregatedPage<T> mapResults(SearchResponse response, Class<T> aClass,
Pageable pageable) {
- List<GloablTransactionDocument> result = new ArrayList<>();
+ List<GlobalTransactionDocument> result = new ArrayList<>();
for (SearchHit hit : response.getHits()) {
if (response.getHits().getHits().length <= 0) {
return new AggregatedPageImpl<T>(Collections.EMPTY_LIST, pageable,
response.getHits().getTotalHits(), response.getScrollId());
}
- GloablTransactionDocument gloablTransactionDocument = null;
+ GlobalTransactionDocument globalTransactionDocument = null;
try {
- gloablTransactionDocument = mapper.readValue(hit.getSourceAsString(),
- GloablTransactionDocument.class);
+ globalTransactionDocument = mapper.readValue(hit.getSourceAsString(),
+ GlobalTransactionDocument.class);
} catch (IOException e) {
new RuntimeException(e.getMessage(), e);
}
- result.add(gloablTransactionDocument);
+ result.add(globalTransactionDocument);
}
if (result.isEmpty()) {
return new AggregatedPageImpl<T>(Collections.EMPTY_LIST, pageable,
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/GlobalTransactionDocument.java
similarity index 84%
rename from alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/GloablTransactionDocument.java
rename to alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/elasticsearch/GlobalTransactionDocument.java
index 444190f..47c25d9 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/GlobalTransactionDocument.java
@@ -4,6 +4,6 @@ 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 GlobalTransaction {
+public class GlobalTransactionDocument extends GlobalTransaction {
}
diff --git a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/PagingGlobalTransactions.java b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/PagingGlobalTransactions.java
index 73dab61..720193a 100644
--- a/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/PagingGlobalTransactions.java
+++ b/alpha/alpha-fsm/src/main/java/org/apache/servicecomb/pack/alpha/fsm/repository/model/PagingGlobalTransactions.java
@@ -82,7 +82,7 @@ public class PagingGlobalTransactions {
return this;
}
- public Builder gloablTransactions(List<GlobalTransaction> globalTransactions) {
+ public Builder globalTransactions(List<GlobalTransaction> globalTransactions) {
this.globalTransactions = globalTransactions;
return this;
}
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 8898075..88f718d 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
@@ -48,7 +48,7 @@ public class APIControllerV1 {
ResponseEntity<GlobalTransaction> getTransactionByGlobalTxId(@PathVariable String globalTxId)
throws Exception {
GlobalTransaction globalTransaction = transactionRepository
- .getGloablTransactionByGlobalTxId(globalTxId);
+ .getGlobalTransactionByGlobalTxId(globalTxId);
return ResponseEntity.ok(globalTransaction);
}
@@ -57,7 +57,7 @@ public class APIControllerV1 {
@RequestParam(value = "size", required = false, defaultValue = "50") int size)
throws Exception {
PagingGlobalTransactions pagingGlobalTransactions = transactionRepository
- .getGloablTransactions(page, size);
+ .getGlobalTransactions(page, size);
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 d7c63c1..0b4fa37 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
@@ -184,10 +184,10 @@ public class APIControllerV1Tests {
.size(50)
.elapsed(10)
.total(1)
- .gloablTransactions(globalTransactions)
+ .globalTransactions(globalTransactions)
.build();
- when(transactionRepository.getGloablTransactions(0, 50)).thenReturn(paging);
+ when(transactionRepository.getGlobalTransactions(0, 50)).thenReturn(paging);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(JsonGenerator.Feature.QUOTE_FIELD_NAMES, false);
@@ -275,7 +275,7 @@ public class APIControllerV1Tests {
.subTransactions(subTransactions)
.build();
- when(transactionRepository.getGloablTransactionByGlobalTxId(globalTxId)).thenReturn(globalTransaction);
+ when(transactionRepository.getGlobalTransactionByGlobalTxId(globalTxId)).thenReturn(globalTransaction);
ObjectMapper mapper = new ObjectMapper();
mapper.configure(JsonGenerator.Feature.QUOTE_FIELD_NAMES, false);