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 ea07bbbbb refactor: 修正拼写错误并优化代码 (#4605)
ea07bbbbb is described below
commit ea07bbbbb38abf9adb617f1ba1954c812d7b7cdb
Author: SweetWuXiaoMei <[email protected]>
AuthorDate: Wed Nov 27 14:54:34 2024 +0800
refactor: 修正拼写错误并优化代码 (#4605)
---
.typos.toml | 1 +
.../org/apache/servicecomb/http/client/common/URLEndPoint.java | 6 +++---
.../core/element/impl/ConfigurableDatetimeAccessItem.java | 4 ++--
.../codec/protobuf/definition/RequestRootSerializer.java | 4 ++--
.../codec/protobuf/definition/ResponseRootSerializer.java | 4 ++--
.../main/java/org/apache/servicecomb/common/rest/RestConst.java | 6 +++---
.../servicecomb/common/rest/codec/TestRestObjectMapper.java | 2 +-
.../org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java | 2 +-
.../servicecomb/foundation/common/net/URIEndpointObject.java | 8 ++++----
.../servicecomb/foundation/common/net/TestURIEndpointObject.java | 4 ++--
.../java/org/apache/servicecomb/swagger/generator/jaxrs/Echo.java | 4 ++--
.../generator-jaxrs/src/test/resources/schemas/echo.yaml | 2 +-
.../servicecomb/swagger/generator/springmvc/TestSpringmvc.java | 2 +-
13 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/.typos.toml b/.typos.toml
index 1029beacb..7ea0a0597 100644
--- a/.typos.toml
+++ b/.typos.toml
@@ -32,4 +32,5 @@ allow = [
"Verticle",
"verticle",
"VERTICLE",
+ "Prelease",
]
diff --git
a/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/URLEndPoint.java
b/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/URLEndPoint.java
index ba295c353..e3e53bad0 100644
---
a/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/URLEndPoint.java
+++
b/clients/http-client-common/src/main/java/org/apache/servicecomb/http/client/common/URLEndPoint.java
@@ -36,7 +36,7 @@ public class URLEndPoint {
private final boolean sslEnabled;
- private final Map<String, List<String>> querys;
+ private final Map<String, List<String>> queries;
private final String hostOrIp;
@@ -49,7 +49,7 @@ public class URLEndPoint {
throw new IllegalArgumentException("port not specified.");
}
port = uri.getPort();
- querys = splitQuery(uri);
+ queries = splitQuery(uri);
if (endpoint.contains(HTTPS_KEY)) {
sslEnabled = true;
} else {
@@ -68,7 +68,7 @@ public class URLEndPoint {
}
public String getFirst(String key) {
- List<String> values = querys.get(key);
+ List<String> values = queries.get(key);
if (values == null) {
return null;
}
diff --git
a/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/element/impl/ConfigurableDatetimeAccessItem.java
b/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/element/impl/ConfigurableDatetimeAccessItem.java
index 75e193a17..9c759ca2c 100644
---
a/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/element/impl/ConfigurableDatetimeAccessItem.java
+++
b/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/core/element/impl/ConfigurableDatetimeAccessItem.java
@@ -71,14 +71,14 @@ public class ConfigurableDatetimeAccessItem implements
AccessLogItem<RoutingCont
"wrong format of configuration, \"PATTERN|TIMEZONE|LOCALE\" is
expected, but actually is \"" + config + "\"");
}
- setConfigruations(configArr);
+ setConfigurations(configArr);
}
private String[] splitConfig(String config) {
return config.split("\\|{1}?", -1);
}
- private void setConfigruations(String[] configArr) {
+ private void setConfigurations(String[] configArr) {
this.pattern = StringUtils.isEmpty(configArr[0]) ?
DEFAULT_DATETIME_PATTERN : configArr[0];
this.timezone = StringUtils.isEmpty(configArr[1]) ? TimeZone.getDefault()
: TimeZone.getTimeZone(configArr[1]);
this.locale = StringUtils.isEmpty(configArr[2]) ? DEFAULT_LOCALE :
Locale.forLanguageTag(configArr[2]);
diff --git
a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/RequestRootSerializer.java
b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/RequestRootSerializer.java
index 263e2d786..ac5763d9b 100644
---
a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/RequestRootSerializer.java
+++
b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/RequestRootSerializer.java
@@ -30,10 +30,10 @@ public class RequestRootSerializer {
private final boolean isWrap;
- public RequestRootSerializer(RootSerializer serializer, boolean isWrapp,
boolean noTypesInfo) {
+ public RequestRootSerializer(RootSerializer serializer, boolean isWrap,
boolean noTypesInfo) {
this.rootSerializer = serializer;
this.noTypesInfo = noTypesInfo;
- this.isWrap = isWrapp;
+ this.isWrap = isWrap;
}
@SuppressWarnings("unchecked")
diff --git
a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/ResponseRootSerializer.java
b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/ResponseRootSerializer.java
index 07c2e1d63..8af18a4a0 100644
---
a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/ResponseRootSerializer.java
+++
b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/ResponseRootSerializer.java
@@ -29,10 +29,10 @@ public class ResponseRootSerializer {
private final boolean isWrap;
- public ResponseRootSerializer(RootSerializer serializer, boolean isWrapp,
boolean noTypesInfo) {
+ public ResponseRootSerializer(RootSerializer serializer, boolean isWrap,
boolean noTypesInfo) {
this.rootSerializer = serializer;
this.noTypesInfo = noTypesInfo;
- this.isWrap = isWrapp;
+ this.isWrap = isWrap;
}
public byte[] serialize(Object value) throws IOException {
diff --git
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/RestConst.java
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/RestConst.java
index 82df77dee..bc598f973 100644
---
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/RestConst.java
+++
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/RestConst.java
@@ -44,13 +44,13 @@ public final class RestConst {
public static final String BODY_PARAMETER = "servicecomb-body";
//in invocation response
- public static final String INVOCATION_HANDLER_RESPONSE =
"servicecomb-invocation-hanlder-response";
+ public static final String INVOCATION_HANDLER_RESPONSE =
"servicecomb-invocation-handler-response";
//in invocation response
- public static final String INVOCATION_HANDLER_PROCESSOR =
"servicecomb-invocation-hanlder-processor";
+ public static final String INVOCATION_HANDLER_PROCESSOR =
"servicecomb-invocation-handler-processor";
//in invocation response
- public static final String INVOCATION_HANDLER_REQUESTCLIENT =
"servicecomb-invocation-hanlder-requestclient";
+ public static final String INVOCATION_HANDLER_REQUESTCLIENT =
"servicecomb-invocation-handler-requestclient";
public static final String REST_PRODUCER_INVOCATION =
"servicecomb-rest-producer-invocation";
diff --git
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestObjectMapper.java
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestObjectMapper.java
index d2f17f5fe..57da9440e 100644
---
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestObjectMapper.java
+++
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestObjectMapper.java
@@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test;
public class TestRestObjectMapper {
@Test
- public void testFormateDate() throws Exception {
+ public void testFormatDate() throws Exception {
RestObjectMapper mapper = new RestObjectMapper();
// must read/write ISO 8061 dates
Date date = mapper.readValue("\"2017-07-21T17:32:28Z\"".getBytes(),
Date.class);
diff --git
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
index db0f04e86..361a3844d 100644
---
a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
+++
b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/fix/TestDoSFix.java
@@ -79,7 +79,7 @@ public class TestDoSFix {
long start = System.currentTimeMillis();
try {
Object ret = callable.call();
- Assertions.fail("expect failed, but succes to be " + ret);
+ Assertions.fail("expect failed, but success to be " + ret);
} catch (AssertionError e) {
throw e;
} catch (Throwable e) {
diff --git
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/URIEndpointObject.java
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/URIEndpointObject.java
index 7d4b8a00b..78b633c11 100644
---
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/URIEndpointObject.java
+++
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/URIEndpointObject.java
@@ -45,7 +45,7 @@ public class URIEndpointObject extends IpPort {
private boolean websocketEnabled;
- private final Map<String, List<String>> querys;
+ private final Map<String, List<String>> queries;
private final String schema;
@@ -58,7 +58,7 @@ public class URIEndpointObject extends IpPort {
throw new IllegalArgumentException("port not specified.");
}
setPort(uri.getPort());
- querys = splitQuery(uri);
+ queries = splitQuery(uri);
sslEnabled = Boolean.parseBoolean(getFirst(SSL_ENABLED_KEY));
websocketEnabled = Boolean.parseBoolean(getFirst(WEBSOCKET_ENABLED_KEY));
String httpVersion = getFirst(PROTOCOL_KEY);
@@ -94,11 +94,11 @@ public class URIEndpointObject extends IpPort {
}
public List<String> getQuery(String key) {
- return querys.get(key);
+ return queries.get(key);
}
public String getFirst(String key) {
- List<String> values = querys.get(key);
+ List<String> values = queries.get(key);
// it's impossible that values is not null and size is 0
if (values == null) {
return null;
diff --git
a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestURIEndpointObject.java
b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestURIEndpointObject.java
index 7651a0d39..dc3323fec 100644
---
a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestURIEndpointObject.java
+++
b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/net/TestURIEndpointObject.java
@@ -65,8 +65,8 @@ public class TestURIEndpointObject {
"cse://1.1.1.1:1234/abc?a=1&b=&country=" + URLEncoder.encode("中 国",
StandardCharsets.UTF_8.name());
URIEndpointObject ep = new URIEndpointObject(strUri);
- Map<String, List<String>> querys = Deencapsulation.getField(ep, "querys");
- Assertions.assertEquals(3, querys.size());
+ Map<String, List<String>> queries = Deencapsulation.getField(ep,
"queries");
+ Assertions.assertEquals(3, queries.size());
Assertions.assertEquals(1, ep.getQuery("a").size());
Assertions.assertEquals("1", ep.getFirst("a"));
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/Echo.java
b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/Echo.java
index 2bae2974c..68820b8c6 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/Echo.java
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/Echo.java
@@ -102,8 +102,8 @@ public class Echo {
@Path(value = "queryComplex")
@GET
- public String queryComplex(@QueryParam(value = "querys") List<User> querys) {
- return String.format("%s", querys);
+ public String queryComplex(@QueryParam(value = "queries") List<User>
queries) {
+ return String.format("%s", queries);
}
@Operation(summary = "")
diff --git
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml
index 867c35eaa..7e0fe3b59 100644
---
a/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml
+++
b/swagger/swagger-generator/generator-jaxrs/src/test/resources/schemas/echo.yaml
@@ -453,7 +453,7 @@ paths:
get:
operationId: queryComplex
parameters:
- - name: querys
+ - name: queries
in: query
schema:
type: array
diff --git
a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestSpringmvc.java
b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestSpringmvc.java
index 7c79c8034..a0bb9b996 100644
---
a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestSpringmvc.java
+++
b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestSpringmvc.java
@@ -63,7 +63,7 @@ public class TestSpringmvc {
}
@Test
- public void testClassMethodNoHttpMetod() {
+ public void testClassMethodNoHttpMethod() {
UnitTestSwaggerUtils
.testSwagger("schemas/requestMappingHttpMethod.yaml",
ClassMethodNoHttpMethod.class, "noHttpMethod");
}
