This is an automated email from the ASF dual-hosted git repository.
shoothzj 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 945f4708b chore: fix typos (#4608)
945f4708b is described below
commit 945f4708b2fa601267fa334f2c329bdbc70f93eb
Author: SweetWuXiaoMei <[email protected]>
AuthorDate: Fri Nov 29 13:36:09 2024 +0800
chore: fix typos (#4608)
---
.../provider/producer/ProducerProviderManager.java | 4 +--
.../org/apache/servicecomb/core/TestException.java | 30 +++++++++++-----------
.../common/base/ServiceCombConstants.java | 2 +-
.../common/config/PaaSResourceUtils.java | 2 +-
.../common/config/impl/PropertiesLoader.java | 2 +-
.../foundation/common/net/NetUtils.java | 2 +-
.../common/utils/TestFileNameTooLong.java | 6 ++---
.../servicecomb/foundation/ssl/SSLManager.java | 2 +-
.../foundation/ssl/TrustManagerExt.java | 2 +-
.../servicecomb/foundation/ssl/SSLOptionTest.java | 4 +--
10 files changed, 28 insertions(+), 28 deletions(-)
diff --git
a/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerProviderManager.java
b/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerProviderManager.java
index 8dac12f4c..391bc6a47 100644
---
a/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerProviderManager.java
+++
b/core/src/main/java/org/apache/servicecomb/core/provider/producer/ProducerProviderManager.java
@@ -120,8 +120,8 @@ public class ProducerProviderManager {
}
// This is special requirement by users: When service deployed in
tomcat,user want to use RestTemplate to
- // call REST service by the full url. e.g.
restTemplate.getForObejct("cse://serviceName/root/prefix/health")
- // By default, user's do not need context prefix, e.g.
restTemplate.getForObejct("cse://serviceName/health")
+ // call REST service by the full url. e.g.
restTemplate.getForObject("cse://serviceName/root/prefix/health")
+ // By default, user's do not need context prefix, e.g.
restTemplate.getForObject("cse://serviceName/health")
private void registerUrlPrefixToSwagger(OpenAPI swagger) {
String urlPrefix =
ClassLoaderScopeContext.getClassLoaderScopeProperty(DefinitionConst.URL_PREFIX);
if (!StringUtils.isEmpty(urlPrefix) &&
!SwaggerUtils.getBasePath(swagger).startsWith(urlPrefix)
diff --git a/core/src/test/java/org/apache/servicecomb/core/TestException.java
b/core/src/test/java/org/apache/servicecomb/core/TestException.java
index be6dc4519..58bce6bce 100644
--- a/core/src/test/java/org/apache/servicecomb/core/TestException.java
+++ b/core/src/test/java/org/apache/servicecomb/core/TestException.java
@@ -25,32 +25,32 @@ import org.junit.jupiter.api.Test;
public class TestException {
@Test
public void testCseException() {
- CseException oExeception = new CseException("500", "InternalServerError");
- Assertions.assertEquals("500", oExeception.getCode());
+ CseException oException = new CseException("500", "InternalServerError");
+ Assertions.assertEquals("500", oException.getCode());
Assertions.assertEquals("ServiceDefinitionException Code:500,
Message:InternalServerError",
- oExeception.toString());
+ oException.toString());
- oExeception = new CseException("503", "OwnException", new Throwable());
- Assertions.assertEquals("503", oExeception.getCode());
+ oException = new CseException("503", "OwnException", new Throwable());
+ Assertions.assertEquals("503", oException.getCode());
}
@Test
public void testExceptionUtils() {
- CseException oExeception = ExceptionUtils
+ CseException oException = ExceptionUtils
.createCseException("servicecomb.handler.ref.not.exist", new
String("test"));
- Assertions.assertEquals("servicecomb.handler.ref.not.exist",
oExeception.getCode());
+ Assertions.assertEquals("servicecomb.handler.ref.not.exist",
oException.getCode());
- oExeception =
+ oException =
ExceptionUtils.createCseException("servicecomb.handler.ref.not.exist",
new Throwable(), new String("test"));
- Assertions.assertEquals("servicecomb.handler.ref.not.exist",
oExeception.getCode());
+ Assertions.assertEquals("servicecomb.handler.ref.not.exist",
oException.getCode());
- oExeception =
ExceptionUtils.producerOperationNotExist("servicecomb.error", "unit-testing");
- Assertions.assertEquals("servicecomb.producer.operation.not.exist",
oExeception.getCode());
+ oException = ExceptionUtils.producerOperationNotExist("servicecomb.error",
"unit-testing");
+ Assertions.assertEquals("servicecomb.producer.operation.not.exist",
oException.getCode());
- oExeception =
ExceptionUtils.handlerRefNotExist("servicecomb.double.error");
- Assertions.assertEquals("servicecomb.handler.ref.not.exist",
oExeception.getCode());
+ oException = ExceptionUtils.handlerRefNotExist("servicecomb.double.error");
+ Assertions.assertEquals("servicecomb.handler.ref.not.exist",
oException.getCode());
- oExeception = ExceptionUtils.lbAddressNotFound("microServiceName", "my
rule my world", "transportChannel");
- Assertions.assertEquals("servicecomb.lb.no.available.address",
oExeception.getCode());
+ oException = ExceptionUtils.lbAddressNotFound("microServiceName", "my rule
my world", "transportChannel");
+ Assertions.assertEquals("servicecomb.lb.no.available.address",
oException.getCode());
}
}
diff --git
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/base/ServiceCombConstants.java
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/base/ServiceCombConstants.java
index 8cf6db4cd..aedae7c1a 100644
---
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/base/ServiceCombConstants.java
+++
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/base/ServiceCombConstants.java
@@ -30,7 +30,7 @@ public interface ServiceCombConstants {
String DEFAULT_TRACING_COLLECTOR_ADDRESS = "http://127.0.0.1:9411";
- String CONFIG_KEY_SPLITER = "_";
+ String CONFIG_KEY_SPLITTER = "_";
String CONFIG_FRAMEWORK_DEFAULT_NAME = "servicecomb-java-chassis";
diff --git
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/PaaSResourceUtils.java
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/PaaSResourceUtils.java
index 77270ec2d..fe11a3fe7 100644
---
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/PaaSResourceUtils.java
+++
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/PaaSResourceUtils.java
@@ -118,7 +118,7 @@ public class PaaSResourceUtils extends
org.springframework.util.ResourceUtils {
return resList;
}
- public static List<Resource> getSortedPorperties(String locationPattern) {
+ public static List<Resource> getSortedProperties(String locationPattern) {
return getSortedResources(locationPattern, PROPERTIES_SUFFIX);
}
diff --git
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/impl/PropertiesLoader.java
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/impl/PropertiesLoader.java
index 4f8827a67..ae4500e8a 100644
---
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/impl/PropertiesLoader.java
+++
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/config/impl/PropertiesLoader.java
@@ -40,7 +40,7 @@ public class PropertiesLoader extends AbstractLoader {
public <T> T load() throws Exception {
Properties props = new Properties();
for (String locationPattern : locationPatternList) {
- List<Resource> resList =
PaaSResourceUtils.getSortedPorperties(locationPattern);
+ List<Resource> resList =
PaaSResourceUtils.getSortedProperties(locationPattern);
foundResList.addAll(resList);
PaaSPropertiesLoaderUtils.fillAllProperties(props, resList);
}
diff --git
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
index 34d2d4135..fd8cc1f7a 100644
---
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
+++
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/net/NetUtils.java
@@ -262,7 +262,7 @@ public final class NetUtils {
/**
* 对于配置为0.0.0.0的地址,let it go
* schema, e.g. http
- * adddress, e.g 0.0.0.0:8080
+ * address, e.g 0.0.0.0:8080
* return 实际监听的地址
*/
public static String getRealListenAddress(String schema, String address) {
diff --git
a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestFileNameTooLong.java
b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestFileNameTooLong.java
index 7ad60568d..0ccf049ff 100644
---
a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestFileNameTooLong.java
+++
b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/utils/TestFileNameTooLong.java
@@ -55,15 +55,15 @@ public class TestFileNameTooLong {
Assertions.assertTrue(names.isEmpty());
}
- private static void findLongFileName(File folder, List<String> holder, int
baseLenght) {
+ private static void findLongFileName(File folder, List<String> holder, int
baseLength) {
if (folder.isFile()) {
- if (folder.getAbsolutePath().length() >= MAN_FILE_SIZE + baseLenght) {
+ if (folder.getAbsolutePath().length() >= MAN_FILE_SIZE + baseLength) {
holder.add(folder.getAbsolutePath());
}
} else if (folder.isDirectory() && !"target".equals(folder.getName())) {
File[] children = folder.listFiles();
for (File child : children) {
- findLongFileName(child, holder, baseLenght);
+ findLongFileName(child, holder, baseLength);
}
} else {
return;
diff --git
a/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/SSLManager.java
b/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/SSLManager.java
index 4c476cc90..b7136f775 100644
---
a/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/SSLManager.java
+++
b/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/SSLManager.java
@@ -171,7 +171,7 @@ public final class SSLManager {
setClientAuth(option, socket);
return socket;
} catch (UnknownHostException e) {
- throw new IllegalArgumentException("unkown host");
+ throw new IllegalArgumentException("unknown host");
} catch (IOException e) {
throw new IllegalArgumentException("unable create socket");
}
diff --git
a/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/TrustManagerExt.java
b/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/TrustManagerExt.java
index 117708909..597894571 100644
---
a/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/TrustManagerExt.java
+++
b/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/TrustManagerExt.java
@@ -189,7 +189,7 @@ public class TrustManagerExt extends
X509ExtendedTrustManager {
}
}
} catch (SocketException e) {
- throw new CertificateException("Get local adrress fail.");
+ throw new CertificateException("Get local address fail.");
}
} else if (cnValid(cns, ipTmp)) {
return;
diff --git
a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/SSLOptionTest.java
b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/SSLOptionTest.java
index 9a3eb3d6d..ae91fcbb6 100644
---
a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/SSLOptionTest.java
+++
b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/SSLOptionTest.java
@@ -213,7 +213,7 @@ public class SSLOptionTest {
}
@Test
- public void testSSLOptionYamlOptionWithProperyFalse() throws Exception {
+ public void testSSLOptionYamlOptionWithPropertyFalse() throws Exception {
Mockito.when(environment.getProperty("ssl.authPeer")).thenReturn("false");
SSLOption option = SSLOption.build("server", environment);
@@ -225,7 +225,7 @@ public class SSLOptionTest {
}
@Test
- public void testSSLOptionYamlOptionWithProperyTrue() throws Exception {
+ public void testSSLOptionYamlOptionWithPropertyTrue() throws Exception {
SSLOption option = SSLOption.build("server", environment);
boolean authPeer = option.isAuthPeer();