This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new de4f11048 chore: fix typos (#4609)
de4f11048 is described below
commit de4f110486ce0efc7af4973216e62e052545167d
Author: SweetWuXiaoMei <[email protected]>
AuthorDate: Sat Nov 30 10:38:19 2024 +0800
chore: fix typos (#4609)
---
.typos.toml | 8 ++-
.../src/test/resources/test/test/microservice.yaml | 2 +-
.../apache/servicecomb/samples/HelloWorldIT.java | 4 +-
demo/demo-cse-v2/README.md | 4 +-
.../java/org/apache/servicecomb/demo/TestMgr.java | 12 ++--
.../springmvc/client/UploadDownloadSchemaTest.java | 4 +-
.../client/CodeFirstRestTemplateSpringmvc.java | 18 +++---
.../demo/springmvc/server/CodeFirstSpringmvc.java | 2 +-
.../server/CodeFirstSpringmvcForSchema.java | 2 +-
.../schemas/CodeFirstSpringmvcForSchema.yaml | 2 +-
.../src/main/resources/application.yml | 4 +-
.../org/apache/servicecomb/config/YAMLUtil.java | 4 +-
.../src/test/resources/test1.yaml | 2 +-
foundations/foundation-protobuf/README.md | 73 +++++++++++-----------
.../internal/parser/ContentFileReader.java | 6 +-
.../internal/schema/scalar/TestBoolSchema.java | 2 +-
.../foundation/protobuf/performance/TestBase.java | 10 +--
.../protobuf/performance/TestEngineResult.java | 10 +--
.../protobuf/performance/TestProtoPerformance.java | 20 +++---
.../foundation/ssl/TestSSLOptionFactory.java | 2 +-
pom.xml | 2 +-
21 files changed, 98 insertions(+), 95 deletions(-)
diff --git a/.typos.toml b/.typos.toml
index 7ea0a0597..e8b6eb33f 100644
--- a/.typos.toml
+++ b/.typos.toml
@@ -24,13 +24,15 @@
"vertx" = "vertx"
[files]
-ignore = [
+extend-exclude = [
"**/cobertura.ser"
]
-[words]
-allow = [
+[default]
+extend-ignore-words-re = [
"Verticle",
"verticle",
"VERTICLE",
"Prelease",
+ "cobertura",
+ "ser",
]
diff --git a/core/src/test/resources/test/test/microservice.yaml
b/core/src/test/resources/test/test/microservice.yaml
index a82dcd3f0..7ec47b07b 100644
--- a/core/src/test/resources/test/test/microservice.yaml
+++ b/core/src/test/resources/test/test/microservice.yaml
@@ -18,7 +18,7 @@
service_description:
name: default
version: 0.0.1
- propertyExtentedClass:
org.apache.servicecomb.serviceregistry.MicroServicePropertyExtendedStub
+ propertyExtendedClass:
org.apache.servicecomb.serviceregistry.MicroServicePropertyExtendedStub
servicecomb:
service:
registry:
diff --git
a/demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/HelloWorldIT.java
b/demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/HelloWorldIT.java
index 423d3b58d..691ee47a1 100644
---
a/demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/HelloWorldIT.java
+++
b/demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/HelloWorldIT.java
@@ -39,7 +39,7 @@ public class HelloWorldIT implements CategorizedTestCase {
testHelloWorld();
testHelloWorldCanary();
testHelloWorldEmptyProtectionCloseWeight100();
- testHelloWorldeEptyProtectionCloseWeightLess100();
+ testHelloWorldeEmptyProtectionCloseWeightLess100();
testHelloWorldEmptyProtectionCloseFallback();
testHelloWorldEmptyProtectionCloseWeight100Two();
}
@@ -142,7 +142,7 @@ public class HelloWorldIT implements CategorizedTestCase {
TestMgr.check(failCount == 20, true);
}
- private void testHelloWorldeEptyProtectionCloseWeightLess100() {
+ private void testHelloWorldeEmptyProtectionCloseWeightLess100() {
int failCount = 0;
int succCount = 0;
diff --git a/demo/demo-cse-v2/README.md b/demo/demo-cse-v2/README.md
index f5c751f38..dda7dee70 100644
--- a/demo/demo-cse-v2/README.md
+++ b/demo/demo-cse-v2/README.md
@@ -60,7 +60,7 @@ cse:
priority1: v1
```
-* 服务级配置：consumerSer.yaml，微服务性选择consumer。类型为 yaml。
+* 服务级配置：consumerService.yaml，微服务性选择consumer。类型为 yaml。
```yaml
cse:
v2:
@@ -115,7 +115,7 @@ cse:
* 执行 tests-client 里面的集成测试用例 （成功）
* 修改
- * 服务级配置：consumerSer.yaml。
+ * 服务级配置：consumerService.yaml。
```yaml
cse:
v2:
diff --git
a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/TestMgr.java
b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/TestMgr.java
index 9cfffaa5c..c90fe8bc1 100644
--- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/TestMgr.java
+++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/TestMgr.java
@@ -32,7 +32,7 @@ public class TestMgr {
private static String msg = "";
- private static final AtomicLong checkes = new AtomicLong(0);
+ private static final AtomicLong checks = new AtomicLong(0);
public static void setMsg(String msg) {
TestMgr.msg = msg;
@@ -47,7 +47,7 @@ public class TestMgr {
}
public static void check(Object expect, Object real, Throwable error) {
- checkes.incrementAndGet();
+ checks.incrementAndGet();
if (expect == real) {
return;
@@ -66,7 +66,7 @@ public class TestMgr {
}
public static void checkNotEmpty(String real) {
- checkes.incrementAndGet();
+ checks.incrementAndGet();
if (StringUtils.isEmpty(real)) {
errorList.add(new Error(msg + " | unexpected null result, method is " +
getCaller()));
@@ -78,7 +78,7 @@ public class TestMgr {
}
public static void failed(String desc, Throwable e) {
- checkes.incrementAndGet();
+ checks.incrementAndGet();
Error error = new Error(msg + " | " + desc + ", method is " + getCaller());
if (e != null) {
@@ -94,12 +94,12 @@ public class TestMgr {
public static void summary() {
if (errorList.isEmpty()) {
LOGGER.info("............. test finished ............");
- LOGGER.info("............. total checks : " + checkes.get());
+ LOGGER.info("............. total checks : " + checks.get());
return;
}
LOGGER.info("............. test not finished ............");
- LOGGER.info("............. total checks : " + checkes.get());
+ LOGGER.info("............. total checks : " + checks.get());
LOGGER.info("............. total errors : " + errorList.size());
LOGGER.info("............. error details: ");
for (Throwable e : errorList) {
diff --git
a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/src/main/java/org/apache/servicecomb/springboot/springmvc/client/UploadDownloadSchemaTest.java
b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/src/main/java/org/apache/servicecomb/springboot/springmvc/client/UploadDownloadSchemaTest.java
index 60f61f1c5..18054cf4f 100644
---
a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/src/main/java/org/apache/servicecomb/springboot/springmvc/client/UploadDownloadSchemaTest.java
+++
b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/src/main/java/org/apache/servicecomb/springboot/springmvc/client/UploadDownloadSchemaTest.java
@@ -38,10 +38,10 @@ public class UploadDownloadSchemaTest implements
CategorizedTestCase {
@Override
public void testRestTransport() throws Exception {
testEmptyFileUploadWork();
- testNonEmptyFileUploadWorkd();
+ testNonEmptyFileUploadWork();
}
- private void testNonEmptyFileUploadWorkd() throws Exception {
+ private void testNonEmptyFileUploadWork() throws Exception {
String file2Content = " bonjour";
File someFile = File.createTempFile("upload2", ".txt");
FileUtils.writeStringToFile(someFile, file2Content,
StandardCharsets.UTF_8, false);
diff --git
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java
index f561b954f..d30edc6b4 100644
---
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java
+++
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java
@@ -213,12 +213,12 @@ public class CodeFirstRestTemplateSpringmvc extends
CodeFirstRestTemplate {
Map<String, String> map = new HashMap<>();
String code = "servicecomb%2bwelcome%40%23%24%25%5e%26*()%3d%3d";
map.put("form1", code);
- HttpEntity<Map<String, String>> formEntiry = new HttpEntity<>(map,
formHeaders);
+ HttpEntity<Map<String, String>> formEntry = new HttpEntity<>(map,
formHeaders);
TestMgr.check(code + "null",
- template.postForEntity(cseUrlPrefix + "/testform", formEntiry,
String.class).getBody());
+ template.postForEntity(cseUrlPrefix + "/testform", formEntry,
String.class).getBody());
map.put("form2", "hello");
TestMgr
- .check(code + "hello", template.postForEntity(cseUrlPrefix +
"/testform", formEntiry, String.class).getBody());
+ .check(code + "hello", template.postForEntity(cseUrlPrefix +
"/testform", formEntry, String.class).getBody());
}
private void testCodeFirstTestFormHighway(RestOperations template, String
cseUrlPrefix) {
@@ -228,16 +228,16 @@ public class CodeFirstRestTemplateSpringmvc extends
CodeFirstRestTemplate {
String code = "servicecomb%2bwelcome%40%23%24%25%5e%26*()%3d%3d";
map.put("form1", code);
map.put("form2", "");
- HttpEntity<Map<String, String>> formEntiry = new HttpEntity<>(map,
formHeaders);
- TestMgr.check(code + "", template.postForEntity(cseUrlPrefix +
"/testform", formEntiry, String.class).getBody());
+ HttpEntity<Map<String, String>> formEntry = new HttpEntity<>(map,
formHeaders);
+ TestMgr.check(code + "", template.postForEntity(cseUrlPrefix +
"/testform", formEntry, String.class).getBody());
map = new HashMap<>();
code = "servicecomb%2bwelcome%40%23%24%25%5e%26*()%3d%3d";
map.put("form1", code);
map.put("form2", null);
- formEntiry = new HttpEntity<>(map, formHeaders);
+ formEntry = new HttpEntity<>(map, formHeaders);
TestMgr.check(code + "null",
- template.postForEntity(cseUrlPrefix + "/testform", formEntiry,
String.class).getBody());
+ template.postForEntity(cseUrlPrefix + "/testform", formEntry,
String.class).getBody());
}
private void testCodeFirstTestFormRest(RestOperations template, String
cseUrlPrefix) {
@@ -247,8 +247,8 @@ public class CodeFirstRestTemplateSpringmvc extends
CodeFirstRestTemplate {
String code = "servicecomb%2bwelcome%40%23%24%25%5e%26*()%3d%3d";
map.put("form1", code);
map.put("form2", "");
- HttpEntity<Map<String, String>> formEntiry = new HttpEntity<>(map,
formHeaders);
+ HttpEntity<Map<String, String>> formEntry = new HttpEntity<>(map,
formHeaders);
// Rest will have empty string, but users will try to avoid depend on
this, This is different from highway
- TestMgr.check(code + "", template.postForEntity(cseUrlPrefix +
"/testform", formEntiry, String.class).getBody());
+ TestMgr.check(code + "", template.postForEntity(cseUrlPrefix +
"/testform", formEntry, String.class).getBody());
}
}
diff --git
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java
index ded1680b2..c49d8879d 100644
---
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java
+++
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java
@@ -302,7 +302,7 @@ public class CodeFirstSpringmvc {
}
// Using 490, 590 error code, the response type should be
CommonExceptionData. Or we need
- // complex ExceptionConverters to deal with exceptions thrown by Hanlders,
etc.
+ // complex ExceptionConverters to deal with exceptions thrown by Handlers,
etc.
@RequestMapping(path = "/fallback/returnnull/{name}", method =
RequestMethod.GET)
@ApiResponses(value = {@ApiResponse(responseCode = "200",
content = @Content(schema = @Schema(implementation = String.class)),
description = "xxx"),
diff --git
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvcForSchema.java
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvcForSchema.java
index fd5ddcecf..7b5c7e4f3 100644
---
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvcForSchema.java
+++
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvcForSchema.java
@@ -32,7 +32,7 @@ import org.springframework.web.multipart.MultipartFile;
* only checksum is validated to make sure schema is not changed.
*/
@RestSchema(schemaId = "CodeFirstSpringmvcForSchema")
-@RequestMapping(path = "/forScheam")
+@RequestMapping(path = "/forSchema")
public class CodeFirstSpringmvcForSchema {
/*
* Using http://editor.swagger.io/ . Listing errors not handled:
diff --git
a/demo/demo-springmvc/springmvc-server/src/main/resources/schemas/CodeFirstSpringmvcForSchema.yaml
b/demo/demo-springmvc/springmvc-server/src/main/resources/schemas/CodeFirstSpringmvcForSchema.yaml
index 5e2fd957b..2263730b5 100644
---
a/demo/demo-springmvc/springmvc-server/src/main/resources/schemas/CodeFirstSpringmvcForSchema.yaml
+++
b/demo/demo-springmvc/springmvc-server/src/main/resources/schemas/CodeFirstSpringmvcForSchema.yaml
@@ -21,7 +21,7 @@ info:
title: swagger definition for
org.apache.servicecomb.demo.springmvc.server.CodeFirstSpringmvcForSchema
version: 1.0.0
servers:
-- url: /forScheam
+- url: /forSchema
paths:
/uploadFile:
post:
diff --git
a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/src/main/resources/application.yml
b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/src/main/resources/application.yml
index 192d48653..af6c29465 100644
---
a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/src/main/resources/application.yml
+++
b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/src/main/resources/application.yml
@@ -52,7 +52,7 @@ servicecomb:
matches:
- apiPath:
exact: "/governance/retry"
- demo-retry-no-prefex: |
+ demo-retry-no-prefix: |
matches:
- apiPath:
exact: "/noPrefixRetry"
@@ -82,7 +82,7 @@ servicecomb:
maxAttempts: 3
## services is optional in configuration file
services: demo-zeroconfig-registry-client
- demo-retry-no-prefex: |
+ demo-retry-no-prefix: |
maxAttempts: 3
## services is optional in configuration file
services: demo-zeroconfig-registry-client
diff --git
a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/YAMLUtil.java
b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/YAMLUtil.java
index a83dd03ea..2dc116a30 100644
---
a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/YAMLUtil.java
+++
b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/YAMLUtil.java
@@ -98,13 +98,13 @@ public final class YAMLUtil {
}
@SuppressWarnings("unchecked")
- public static Map<String, Object> retrieveItems(String prefix, Map<String,
Object> propertieMap) {
+ public static Map<String, Object> retrieveItems(String prefix, Map<String,
Object> propertiesMap) {
Map<String, Object> result = new LinkedHashMap<>();
if (!prefix.isEmpty()) {
prefix += ".";
}
- for (Map.Entry<String, Object> entry : propertieMap.entrySet()) {
+ for (Map.Entry<String, Object> entry : propertiesMap.entrySet()) {
if (entry.getValue() instanceof Map) {
result.putAll(retrieveItems(prefix + entry.getKey(), (Map<String,
Object>) entry.getValue()));
} else {
diff --git a/foundations/foundation-config/src/test/resources/test1.yaml
b/foundations/foundation-config/src/test/resources/test1.yaml
index bface267f..e17148790 100644
--- a/foundations/foundation-config/src/test/resources/test1.yaml
+++ b/foundations/foundation-config/src/test/resources/test1.yaml
@@ -38,7 +38,7 @@ shutDownHandler:
enabled: true
timeLimit: 30000
-hsa:
+has:
manager:
url: 127.0.0.1
serializer:
diff --git a/foundations/foundation-protobuf/README.md
b/foundations/foundation-protobuf/README.md
index e37a1f414..c225e89dc 100644
--- a/foundations/foundation-protobuf/README.md
+++ b/foundations/foundation-protobuf/README.md
@@ -53,7 +53,6 @@ public class User {
// getter and setter
}
```
-```java
RootSerializer serializer = protoMapper.createRootSerializer("User",
User.class);
User user = new User();
@@ -63,6 +62,8 @@ byte[] pojoBytes= serializer.serialize(user);
Map<String, Object> map = new HashMap<>();
map.put("name", "userName");
byte[] mapBytes = serializer.serialize(map);
+```java
+
// pojoBytes equals mapBytes
```
@@ -96,57 +97,57 @@ Map<String, Object> map =
mapDeserializer.deserialize(bytes);
Empty:
Protostuff ScbStrong ScbWeak Protobuf Jackson
-ser time(ms) : 519 515 240 288 1242
-ser len : 36 0 0 0 56
-deser time(ms): 161 69 10 516 486
-deser->ser len: 36 0 0 0 56
-ser+deser(ms) : 680 584 250 804 1728
+serialize time(ms) : 519 515 240 288 1242
+serialize len : 36 0 0 0 56
+deserialize time(ms): 161 69 10 516 486
+deserialize->serialize len: 36 0 0 0 56
+serialize+deserialize(ms) : 680 584 250 804 1728
Scalars:
Protostuff ScbStrong ScbWeak Protobuf Jackson
-ser time(ms) : 557 529 328 262 1357
-ser len : 56 24 24 24 76
-deser time(ms): 181 141 115 527 504
-deser->ser len: 56 24 24 24 76
-ser+deser(ms) : 738 670 443 789 1861
+serialize time(ms) : 557 529 328 262 1357
+serialize len : 56 24 24 24 76
+deserialize time(ms): 181 141 115 527 504
+deserialize->serialize len: 56 24 24 24 76
+serialize+deserialize(ms) : 738 670 443 789 1861
Pojo:
Protostuff ScbStrong ScbWeak Protobuf Jackson
-ser time(ms) : 571 574 276 309 1304
-ser len : 46 10 10 10 66
-deser time(ms): 230 69 112 668 537
-deser->ser len: 46 10 10 10 66
-ser+deser(ms) : 801 643 388 977 1841
+serialize time(ms) : 571 574 276 309 1304
+serialize len : 46 10 10 10 66
+deserialize time(ms): 230 69 112 668 537
+deserialize->serialize len: 46 10 10 10 66
+serialize+deserialize(ms) : 801 643 388 977 1841
SimpleList:
Protostuff ScbStrong ScbWeak Protobuf Jackson
-ser time(ms) : 590 609 296 637 1320
-ser len : 68 32 32 32 88
-deser time(ms): 233 105 122 2226 541
-deser->ser len: 68 32 32 32 88
-ser+deser(ms) : 823 714 418 2863 1861
+serialize time(ms) : 590 609 296 637 1320
+serialize len : 68 32 32 32 88
+deserialize time(ms): 233 105 122 2226 541
+deserialize->serialize len: 68 32 32 32 88
+serialize+deserialize(ms) : 823 714 418 2863 1861
PojoList:
Protostuff ScbStrong ScbWeak Protobuf Jackson
-ser time(ms) : 609 632 319 2777 1407
-ser len : 56 20 20 20 76
-deser time(ms): 244 134 173 2287 679
-deser->ser len: 56 20 20 20 76
-ser+deser(ms) : 853 766 492 5064 2086
+serialize time(ms) : 609 632 319 2777 1407
+serialize len : 56 20 20 20 76
+deserialize time(ms): 244 134 173 2287 679
+deserialize->serialize len: 56 20 20 20 76
+serialize+deserialize(ms) : 853 766 492 5064 2086
Map:
Protostuff ScbStrong ScbWeak Protobuf Jackson
-ser time(ms) : 746 772 491 1079 1298
-ser len : 92 54 54 54 56
-deser time(ms): 522 427 468 1031 422
-deser->ser len: 92 54 54 54 56
-ser+deser(ms) : 1268 1199 959 2110 1720
+serialize time(ms) : 746 772 491 1079 1298
+serialize len : 92 54 54 54 56
+deserialize time(ms): 522 427 468 1031 422
+deserialize->serialize len: 92 54 54 54 56
+serialize+deserialize(ms) : 1268 1199 959 2110 1720
Mixed:
Protostuff ScbStrong ScbWeak Protobuf Jackson
-ser time(ms) : 1686 1999 2034 2112 2537
-ser len : 479 505 505 505 489
-deser time(ms): 1969 2154 2923 2984 3316
-deser->ser len: 479 505 505 505 489
-ser+deser(ms) : 3655 4153 4957 5096 5853
+serialize time(ms) : 1686 1999 2034 2112 2537
+serialize len : 479 505 505 505 489
+deserialize time(ms): 1969 2154 2923 2984 3316
+deserialize->serialize len: 479 505 505 505 489
+serialize+deserialize(ms) : 3655 4153 4957 5096 5853
```
diff --git
a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java
b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java
index 3a1aad264..89bf2b432 100644
---
a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java
+++
b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java
@@ -26,7 +26,7 @@ public class ContentFileReader implements FileReader {
private final String content;
- private boolean contentReaded;
+ private boolean contentRead;
public ContentFileReader(FileReader importReader, String content) {
this.importReader = importReader;
@@ -35,8 +35,8 @@ public class ContentFileReader implements FileReader {
@Override
public CharStream read(String contentOrName) {
- if (!contentReaded) {
- contentReaded = true;
+ if (!contentRead) {
+ contentRead = true;
return CharStreams.fromString(this.content);
}
diff --git
a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestBoolSchema.java
b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestBoolSchema.java
index 461900db5..5862c723b 100644
---
a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestBoolSchema.java
+++
b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestBoolSchema.java
@@ -36,7 +36,7 @@ public class TestBoolSchema extends TestSchemaBase {
// equalsIgnoreCase
doTestFromString("true");
- doTestFromString("trUe");
+ doTestFromString("true");
}
@Test
diff --git
a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestBase.java
b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestBase.java
index c8c810c65..c73caf9a3 100644
---
a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestBase.java
+++
b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestBase.java
@@ -79,25 +79,25 @@ public abstract class TestBase {
{
long msStart = System.currentTimeMillis();
for (int idx = 0; idx < count; idx++) {
- engineResult.serBytes = engine.serialize(model);
+ engineResult.serializeBytes = engine.serialize(model);
}
long msEnd = System.currentTimeMillis();
- engineResult.msSerTime = msEnd - msStart;
+ engineResult.msSerializeTime = msEnd - msStart;
}
// deserialize
{
long msStart = System.currentTimeMillis();
for (int idx = 0; idx < count; idx++) {
- engineResult.deserResult = engine.deserialize(engineResult.serBytes);
+ engineResult.deserializeResult =
engine.deserialize(engineResult.serializeBytes);
}
long msEnd = System.currentTimeMillis();
- engineResult.msDeserTime = msEnd - msStart;
+ engineResult.msDeserializeTime = msEnd - msStart;
}
- engineResult.deserResultBytes = engine.serialize(engineResult.deserResult);
+ engineResult.deserializeResultBytes =
engine.serialize(engineResult.deserializeResult);
return engineResult;
}
}
diff --git
a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestEngineResult.java
b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestEngineResult.java
index ffa08506d..f02ee1209 100644
---
a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestEngineResult.java
+++
b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestEngineResult.java
@@ -20,14 +20,14 @@ public class TestEngineResult {
public String engineName;
// serialize
- public long msSerTime;
+ public long msSerializeTime;
- public byte[] serBytes;
+ public byte[] serializeBytes;
// deserialize
- public long msDeserTime;
+ public long msDeserializeTime;
- public Object deserResult;
+ public Object deserializeResult;
- public byte[] deserResultBytes;
+ public byte[] deserializeResultBytes;
}
diff --git
a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestProtoPerformance.java
b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestProtoPerformance.java
index eea360412..98e2f5b78 100644
---
a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestProtoPerformance.java
+++
b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestProtoPerformance.java
@@ -65,17 +65,17 @@ public class TestProtoPerformance {
System.out.printf(" " + strFmt + "\n",
result.engineResults.stream().map(r -> r.engineName).toArray());
- System.out.printf("ser time(ms) : " + numberFmt + "\n",
- result.engineResults.stream().map(r -> r.msSerTime).toArray());
- System.out.printf("ser len : " + numberFmt + "\n",
- result.engineResults.stream().map(r -> r.serBytes.length).toArray());
+ System.out.printf("serialize time(ms) : " + numberFmt + "\n",
+ result.engineResults.stream().map(r -> r.msSerializeTime).toArray());
+ System.out.printf("serialize len : " + numberFmt + "\n",
+ result.engineResults.stream().map(r ->
r.serializeBytes.length).toArray());
- System.out.printf("deser time(ms): " + numberFmt + "\n",
- result.engineResults.stream().map(r -> r.msDeserTime).toArray());
- System.out.printf("deser->ser len: " + numberFmt + "\n",
- result.engineResults.stream().map(r ->
r.deserResultBytes.length).toArray());
+ System.out.printf("deserialize time(ms): " + numberFmt + "\n",
+ result.engineResults.stream().map(r -> r.msDeserializeTime).toArray());
+ System.out.printf("deserialize->serialize len: " + numberFmt + "\n",
+ result.engineResults.stream().map(r ->
r.deserializeResultBytes.length).toArray());
- System.out.printf("ser+deser(ms) : " + numberFmt + "\n\n",
- result.engineResults.stream().map(r -> r.msSerTime +
r.msDeserTime).toArray());
+ System.out.printf("serialize+deserialize(ms) : " + numberFmt + "\n\n",
+ result.engineResults.stream().map(r -> r.msSerializeTime +
r.msDeserializeTime).toArray());
}
}
diff --git
a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TestSSLOptionFactory.java
b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TestSSLOptionFactory.java
index ca65b057e..1d3b1b8b2 100644
---
a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TestSSLOptionFactory.java
+++
b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TestSSLOptionFactory.java
@@ -51,7 +51,7 @@ public class TestSSLOptionFactory {
}
@Test
- public void testSSLOptionFactoryCorrent() {
+ public void testSSLOptionFactoryCurrent() {
new MockUp<SSLOption>() {
@Mock
public String getStringProperty(Environment environment, String
defaultValue,
diff --git a/pom.xml b/pom.xml
index f30bbabd1..5cb03fdcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,7 +243,7 @@
<exclude>**/etc/eclipse-java-google-style.xml</exclude>
<exclude>**/etc/intellij-java-google-style.xml</exclude>
<!-- Skip the ssl configuration files -->
- <exculde>**/resources/ssl/**</exculde>
+ <exclude>**/resources/ssl/**</exclude>
<!-- SKip the licenses files -->
<exclude>**/src/release/licenses/**</exclude>
<!-- Skip the demo log files -->
