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 170ddf546 chore: fix some typos (#4603)
170ddf546 is described below
commit 170ddf546f80c9d53ae0eb95e3f71968c6c64d0d
Author: SweetWuXiaoMei <[email protected]>
AuthorDate: Tue Nov 26 15:36:13 2024 +0800
chore: fix some typos (#4603)
* fix: Fixed typo in SSL options
- Change "Renegociate" to "Renegotiate"
- Updated property names and method names in several files - Added ignores
in .typos.toml files
- Fix typos in Configuration file
-Rename RuleNameExtentionsFactory to RuleNameExtensionsFactory
- Update references in relevant test files
- Added Verticle as an allowed word in .typos.toml
- Fixed typo in AbstractArgumentsMapperCreator file
- Fixed typo in FaultInjectionUtil file
Co-authored-by: ZhangJian He <[email protected]>
---
.typos.toml | 10 ++++++++++
.../servicecomb/config/cc/TransportUtils.java | 8 ++++----
.../servicecomb/config/kie/TransportUtils.java | 8 ++++----
.../servicecomb/foundation/ssl/SSLOption.java | 22 +++++++++++-----------
.../servicecomb/foundation/ssl/SSLOptionTest.java | 20 ++++++++++----------
.../src/test/resources/client.ssl.properties | 2 +-
.../src/test/resources/microservice.yaml | 2 +-
.../src/test/resources/server.ssl.properties | 2 +-
.../test/resources/server.ssl.resource.properties | 2 +-
.../faultinjection/FaultInjectionUtil.java | 2 +-
.../servicecomb/loadbalance/Configuration.java | 2 +-
.../loadbalance/LoadBalanceConfiguration.java | 4 ++--
...Factory.java => RuleNameExtensionsFactory.java} | 2 +-
.../loadbalance/TestExtensionsManager.java | 2 +-
.../loadbalance/TestLoadBalanceFilter.java | 2 +-
.../dashboard/monitor/TransportUtils.java | 8 ++++----
.../servicestage/RBACBootStrapService.java | 8 ++++----
.../arguments/AbstractArgumentsMapperCreator.java | 2 +-
18 files changed, 59 insertions(+), 49 deletions(-)
diff --git a/.typos.toml b/.typos.toml
index 7c77274d7..bee2ded44 100644
--- a/.typos.toml
+++ b/.typos.toml
@@ -22,3 +22,13 @@
"VERTX" = "VERTX"
"Vertx" = "Vertx"
"vertx" = "vertx"
+
+[files]
+ignore = [
+ "**/cobertura.ser"
+]
+
+[words]
+allow = [
+ "Verticle",
+]
diff --git
a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/cc/TransportUtils.java
b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/cc/TransportUtils.java
index 6a91ea6a2..25a4dac05 100644
---
a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/cc/TransportUtils.java
+++
b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/cc/TransportUtils.java
@@ -61,10 +61,10 @@ public class TransportUtils {
DEFAULT_OPTION.getCiphers(),
"ssl." + tag + ".checkCN.white.file",
"ssl.checkCN.white.file"));
- option.setAllowRenegociate(getBooleanProperty(environment,
- DEFAULT_OPTION.isAllowRenegociate(),
- "ssl." + tag + ".allowRenegociate",
- "ssl.allowRenegociate"));
+ option.setAllowRenegotiate(getBooleanProperty(environment,
+ DEFAULT_OPTION.isAllowRenegotiate(),
+ "ssl." + tag + ".allowRenegotiate",
+ "ssl.allowRenegotiate"));
option.setStorePath(
getStringProperty(environment,
DEFAULT_OPTION.getStorePath(),
diff --git
a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/TransportUtils.java
b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/TransportUtils.java
index 8cabafec6..8be7ec00c 100644
---
a/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/TransportUtils.java
+++
b/dynamic-config/config-kie/src/main/java/org/apache/servicecomb/config/kie/TransportUtils.java
@@ -61,10 +61,10 @@ public class TransportUtils {
DEFAULT_OPTION.getCiphers(),
"ssl." + tag + ".checkCN.white.file",
"ssl.checkCN.white.file"));
- option.setAllowRenegociate(getBooleanProperty(environment,
- DEFAULT_OPTION.isAllowRenegociate(),
- "ssl." + tag + ".allowRenegociate",
- "ssl.allowRenegociate"));
+ option.setAllowRenegotiate(getBooleanProperty(environment,
+ DEFAULT_OPTION.isAllowRenegotiate(),
+ "ssl." + tag + ".allowRenegotiate",
+ "ssl.allowRenegotiate"));
option.setStorePath(
getStringProperty(environment,
DEFAULT_OPTION.getStorePath(),
diff --git
a/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/SSLOption.java
b/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/SSLOption.java
index 77c177883..19160bb39 100644
---
a/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/SSLOption.java
+++
b/foundations/foundation-ssl/src/main/java/org/apache/servicecomb/foundation/ssl/SSLOption.java
@@ -47,7 +47,7 @@ public final class SSLOption {
DEFAULT_OPTION.setCheckCNHost(false);
DEFAULT_OPTION.setCheckCNWhite(false);
DEFAULT_OPTION.setCheckCNWhiteFile("white.list");
- DEFAULT_OPTION.setAllowRenegociate(true);
+ DEFAULT_OPTION.setAllowRenegotiate(true);
DEFAULT_OPTION.setStorePath("internal");
DEFAULT_OPTION.setTrustStore("trust.jks");
DEFAULT_OPTION.setTrustStoreType("JKS");
@@ -72,7 +72,7 @@ public final class SSLOption {
private String checkCNWhiteFile;
- private boolean allowRenegociate;
+ private boolean allowRenegotiate;
private String clientAuth;
@@ -126,8 +126,8 @@ public final class SSLOption {
this.checkCNWhiteFile = checkCNWhiteFile;
}
- public void setAllowRenegociate(boolean allowRenegociate) {
- this.allowRenegociate = allowRenegociate;
+ public void setAllowRenegotiate(boolean allowRenegotiate) {
+ this.allowRenegotiate = allowRenegotiate;
}
public void setStorePath(String storePath) {
@@ -186,8 +186,8 @@ public final class SSLOption {
return checkCNWhiteFile;
}
- public boolean isAllowRenegociate() {
- return allowRenegociate;
+ public boolean isAllowRenegotiate() {
+ return allowRenegotiate;
}
public String getStorePath() {
@@ -314,10 +314,10 @@ public final class SSLOption {
DEFAULT_OPTION.getCiphers(),
"ssl." + tag + ".checkCN.white.file",
"ssl.checkCN.white.file");
- option.allowRenegociate = getBooleanProperty(environment,
- DEFAULT_OPTION.isAllowRenegociate(),
- "ssl." + tag + ".allowRenegociate",
- "ssl.allowRenegociate");
+ option.allowRenegotiate = getBooleanProperty(environment,
+ DEFAULT_OPTION.isAllowRenegotiate(),
+ "ssl." + tag + ".allowRenegotiate",
+ "ssl.allowRenegotiate");
option.storePath =
getStringProperty(environment,
DEFAULT_OPTION.getStorePath(),
@@ -365,7 +365,7 @@ public final class SSLOption {
this.checkCNHost = propBoolean(props, "ssl.checkCN.host");
this.checkCNWhite = propBoolean(props, "ssl.checkCN.white");
this.checkCNWhiteFile = propString(props, "ssl.checkCN.white.file");
- this.allowRenegociate = propBoolean(props, "ssl.allowRenegociate");
+ this.allowRenegotiate = propBoolean(props, "ssl.allowRenegotiate");
this.storePath = propString(props, "ssl.storePath");
this.clientAuth = propString(props, "ssl.clientAuth", false);
this.trustStore = propString(props, "ssl.trustStore");
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 558fa255c..9a3eb3d6d 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
@@ -47,7 +47,7 @@ public class SSLOptionTest {
Mockito.when(environment.getProperty("ssl.checkCN.host")).thenReturn("true");
Mockito.when(environment.getProperty("ssl.checkCN.white")).thenReturn("true");
Mockito.when(environment.getProperty("ssl.checkCN.white.file")).thenReturn("white.list");
-
Mockito.when(environment.getProperty("ssl.allowRenegociate")).thenReturn("false");
+
Mockito.when(environment.getProperty("ssl.allowRenegotiate")).thenReturn("false");
Mockito.when(environment.getProperty("ssl.storePath")).thenReturn("internal");
Mockito.when(environment.getProperty("ssl.trustStore")).thenReturn("trust.jks");
Mockito.when(environment.getProperty("ssl.trustStoreType")).thenReturn("JKS");
@@ -91,9 +91,9 @@ public class SSLOptionTest {
option.setCheckCNWhiteFile(checkCNWhiteFile);
Assertions.assertEquals("white.list", checkCNWhiteFile);
- boolean allowRenegociate = option.isAllowRenegociate();
- option.setAllowRenegociate(allowRenegociate);
- Assertions.assertFalse(allowRenegociate);
+ boolean allowRenegotiate = option.isAllowRenegotiate();
+ option.setAllowRenegotiate(allowRenegotiate);
+ Assertions.assertFalse(allowRenegotiate);
String storePath = option.getStorePath();
option.setStorePath(storePath);
@@ -158,9 +158,9 @@ public class SSLOptionTest {
option.setCheckCNWhiteFile(checkCNWhiteFile);
Assertions.assertEquals("white.list", checkCNWhiteFile);
- boolean allowRenegociate = option.isAllowRenegociate();
- option.setAllowRenegociate(allowRenegociate);
- Assertions.assertFalse(allowRenegociate);
+ boolean allowRenegotiate = option.isAllowRenegotiate();
+ option.setAllowRenegotiate(allowRenegotiate);
+ Assertions.assertFalse(allowRenegotiate);
String storePath = option.getStorePath();
option.setStorePath(storePath);
@@ -264,9 +264,9 @@ public class SSLOptionTest {
option.setCheckCNWhiteFile(checkCNWhiteFile);
Assertions.assertEquals("white.list", checkCNWhiteFile);
- boolean allowRenegociate = option.isAllowRenegociate();
- option.setAllowRenegociate(allowRenegociate);
- Assertions.assertFalse(allowRenegociate);
+ boolean allowRenegotiate = option.isAllowRenegotiate();
+ option.setAllowRenegotiate(allowRenegotiate);
+ Assertions.assertFalse(allowRenegotiate);
String storePath = option.getStorePath();
option.setStorePath(storePath);
diff --git
a/foundations/foundation-ssl/src/test/resources/client.ssl.properties
b/foundations/foundation-ssl/src/test/resources/client.ssl.properties
index 828e1de6b..878084681 100644
--- a/foundations/foundation-ssl/src/test/resources/client.ssl.properties
+++ b/foundations/foundation-ssl/src/test/resources/client.ssl.properties
@@ -23,7 +23,7 @@ ssl.authPeer=true
ssl.checkCN.host=false
ssl.checkCN.white=true
ssl.checkCN.white.file=white.list
-ssl.allowRenegociate=false
+ssl.allowRenegotiate=false
#########certificates config
ssl.storePath=internal
diff --git a/foundations/foundation-ssl/src/test/resources/microservice.yaml
b/foundations/foundation-ssl/src/test/resources/microservice.yaml
index 41ca3326e..482c8e48e 100644
--- a/foundations/foundation-ssl/src/test/resources/microservice.yaml
+++ b/foundations/foundation-ssl/src/test/resources/microservice.yaml
@@ -23,7 +23,7 @@ ssl:
checkCN.host: true
checkCN.white: true
checkCN.white.file: white.list
- allowRenegociate: false
+ allowRenegotiate: false
storePath: internal
trustStore: trust.jks
trustStoreType: JKS
diff --git
a/foundations/foundation-ssl/src/test/resources/server.ssl.properties
b/foundations/foundation-ssl/src/test/resources/server.ssl.properties
index aec677c23..d2a8180ab 100644
--- a/foundations/foundation-ssl/src/test/resources/server.ssl.properties
+++ b/foundations/foundation-ssl/src/test/resources/server.ssl.properties
@@ -22,7 +22,7 @@ ssl.authPeer=true
ssl.checkCN.host=true
ssl.checkCN.white=true
ssl.checkCN.white.file=white.list
-ssl.allowRenegociate=false
+ssl.allowRenegotiate=false
#########certificates config
ssl.storePath=internal
diff --git
a/foundations/foundation-ssl/src/test/resources/server.ssl.resource.properties
b/foundations/foundation-ssl/src/test/resources/server.ssl.resource.properties
index f1327eeca..01f7380ba 100644
---
a/foundations/foundation-ssl/src/test/resources/server.ssl.resource.properties
+++
b/foundations/foundation-ssl/src/test/resources/server.ssl.resource.properties
@@ -22,7 +22,7 @@ ssl.authPeer=true
ssl.checkCN.host=true
ssl.checkCN.white=true
ssl.checkCN.white.file=white.list
-ssl.allowRenegociate=false
+ssl.allowRenegotiate=false
#########certificates config
ssl.storePath=internal
diff --git
a/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/FaultInjectionUtil.java
b/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/FaultInjectionUtil.java
index 9d96fcd1d..67c3ab869 100755
---
a/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/FaultInjectionUtil.java
+++
b/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/FaultInjectionUtil.java
@@ -39,7 +39,7 @@ public class FaultInjectionUtil {
private FaultInjectionUtil() {
}
- // key is config paramter
+ // key is config parameter
private static final Map<String, AtomicInteger> configCenterValue = new
ConcurrentHashMapEx<>();
/**
diff --git
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/Configuration.java
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/Configuration.java
index e7dabe3d5..5f766e885 100644
---
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/Configuration.java
+++
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/Configuration.java
@@ -38,7 +38,7 @@ public final class Configuration {
// 2.0 configuration items
public static final String ROOT_20 = "ribbon.";
- // SessionStickinessRule configruation
+ // SessionStickinessRule configuration
public static final String SESSION_TIMEOUT_IN_SECONDS =
"SessionStickinessRule.sessionTimeoutInSeconds";
public static final String SUCCESSIVE_FAILED_TIMES =
"SessionStickinessRule.successiveFailedTimes";
diff --git
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalanceConfiguration.java
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalanceConfiguration.java
index b8e5ecaa6..d65726e0a 100644
---
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalanceConfiguration.java
+++
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalanceConfiguration.java
@@ -43,8 +43,8 @@ public class LoadBalanceConfiguration {
}
@Bean
- public RuleNameExtentionsFactory scbRuleNameExtentionsFactory() {
- return new RuleNameExtentionsFactory();
+ public RuleNameExtensionsFactory scbRuleNameExtensionsFactory() {
+ return new RuleNameExtensionsFactory();
}
@Bean
diff --git
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/RuleNameExtentionsFactory.java
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/RuleNameExtensionsFactory.java
similarity index 97%
rename from
handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/RuleNameExtentionsFactory.java
rename to
handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/RuleNameExtensionsFactory.java
index 9315928ea..9d9b0e0da 100644
---
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/RuleNameExtentionsFactory.java
+++
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/RuleNameExtensionsFactory.java
@@ -20,7 +20,7 @@ import java.util.Collection;
import com.google.common.collect.Lists;
-public class RuleNameExtentionsFactory implements ExtensionsFactory {
+public class RuleNameExtensionsFactory implements ExtensionsFactory {
private static final Collection<String> ACCEPT_KEYS = Lists.newArrayList(
Configuration.RULE_STRATEGY_NAME);
diff --git
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestExtensionsManager.java
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestExtensionsManager.java
index 9a87ee3de..2b159d383 100644
---
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestExtensionsManager.java
+++
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestExtensionsManager.java
@@ -42,7 +42,7 @@ public class TestExtensionsManager {
@Test
public void testRuleName() {
List<ExtensionsFactory> extensionsFactories = new ArrayList<>();
- extensionsFactories.add(new RuleNameExtentionsFactory());
+ extensionsFactories.add(new RuleNameExtensionsFactory());
ExtensionsManager extensionsManager = new
ExtensionsManager(extensionsFactories);
Assertions.assertEquals(RoundRobinRuleExt.class.getName(),
diff --git
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter.java
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter.java
index dc61706f5..123f23ac5 100644
---
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter.java
+++
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter.java
@@ -114,7 +114,7 @@ public class TestLoadBalanceFilter {
};
List<ExtensionsFactory> extensionsFactories = new ArrayList<>();
- extensionsFactories.add(new RuleNameExtentionsFactory());
+ extensionsFactories.add(new RuleNameExtensionsFactory());
ExtensionsManager extensionsManager = new
ExtensionsManager(extensionsFactories);
DiscoveryTree discoveryTree = new DiscoveryTree(
diff --git
a/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/TransportUtils.java
b/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/TransportUtils.java
index f508038f9..d58482d23 100644
---
a/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/TransportUtils.java
+++
b/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/TransportUtils.java
@@ -61,10 +61,10 @@ public class TransportUtils {
DEFAULT_OPTION.getCiphers(),
"ssl." + tag + ".checkCN.white.file",
"ssl.checkCN.white.file"));
- option.setAllowRenegociate(getBooleanProperty(environment,
- DEFAULT_OPTION.isAllowRenegociate(),
- "ssl." + tag + ".allowRenegociate",
- "ssl.allowRenegociate"));
+ option.setAllowRenegotiate(getBooleanProperty(environment,
+ DEFAULT_OPTION.isAllowRenegotiate(),
+ "ssl." + tag + ".allowRenegotiate",
+ "ssl.allowRenegotiate"));
option.setStorePath(
getStringProperty(environment,
DEFAULT_OPTION.getStorePath(),
diff --git
a/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/RBACBootStrapService.java
b/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/RBACBootStrapService.java
index 2ba89f1a4..b42ea27e8 100644
---
a/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/RBACBootStrapService.java
+++
b/huawei-cloud/servicestage/src/main/java/org/apache/servicecomb/huaweicloud/servicestage/RBACBootStrapService.java
@@ -163,10 +163,10 @@ public class RBACBootStrapService implements
BootStrapService {
DEFAULT_OPTION.getCiphers(),
"ssl." + SSL_TAG + ".checkCN.white.file",
"ssl.checkCN.white.file"));
- option.setAllowRenegociate(getBooleanProperty(environment,
- DEFAULT_OPTION.isAllowRenegociate(),
- "ssl." + SSL_TAG + ".allowRenegociate",
- "ssl.allowRenegociate"));
+ option.setAllowRenegotiate(getBooleanProperty(environment,
+ DEFAULT_OPTION.isAllowRenegotiate(),
+ "ssl." + SSL_TAG + ".allowRenegotiate",
+ "ssl.allowRenegotiate"));
option.setStorePath(
getStringProperty(environment,
DEFAULT_OPTION.getStorePath(),
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/AbstractArgumentsMapperCreator.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/AbstractArgumentsMapperCreator.java
index 2978e9d31..deb7ba5ba 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/AbstractArgumentsMapperCreator.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/AbstractArgumentsMapperCreator.java
@@ -57,7 +57,7 @@ import io.swagger.v3.oas.models.parameters.RequestBody;
* int add(int x, int y)
* swagger parameters:
* x, y
- * 2) swagger only one POJO paramter, extract all field to method
parameters (POJO dev mode)
+ * 2) swagger only one POJO parameter, extract all field to method
parameters (POJO dev mode)
* interface method:
* int add(int x, int y)
* swagger parameters:
