Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,13 @@
"VERTX" = "VERTX"
"Vertx" = "Vertx"
"vertx" = "vertx"

[files]
ignore = [
"**/cobertura.ser"
]

[words]
allow = [
"Verticle",
]
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ public static SSLProperties createSSLProperties(boolean sslEnabled, Environment
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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ public static SSLProperties createSSLProperties(boolean sslEnabled, Environment
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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -72,7 +72,7 @@ public final class SSLOption {

private String checkCNWhiteFile;

private boolean allowRenegociate;
private boolean allowRenegotiate;

private String clientAuth;

Expand Down Expand Up @@ -126,8 +126,8 @@ public void setCheckCNWhiteFile(String checkCNWhiteFile) {
this.checkCNWhiteFile = checkCNWhiteFile;
}

public void setAllowRenegociate(boolean allowRenegociate) {
this.allowRenegociate = allowRenegociate;
public void setAllowRenegotiate(boolean allowRenegotiate) {
this.allowRenegotiate = allowRenegotiate;
}

public void setStorePath(String storePath) {
Expand Down Expand Up @@ -186,8 +186,8 @@ public String getCheckCNWhiteFile() {
return checkCNWhiteFile;
}

public boolean isAllowRenegociate() {
return allowRenegociate;
public boolean isAllowRenegotiate() {
return allowRenegotiate;
}

public String getStorePath() {
Expand Down Expand Up @@ -314,10 +314,10 @@ public static SSLOption build(String tag, Environment environment) {
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(),
Expand Down Expand Up @@ -365,7 +365,7 @@ private void fromProperty(Properties props) {
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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void setUp() throws Exception {
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");
Expand Down Expand Up @@ -91,9 +91,9 @@ public void testSSLOption() {
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);
Expand Down Expand Up @@ -158,9 +158,9 @@ public void testSSLOptionYaml() {
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);
Expand Down Expand Up @@ -264,9 +264,9 @@ public void testSSLOptionYamlOption() throws Exception {
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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<>();

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public LoadBalanceFilter scbLoadBalanceFilter(ExtensionsManager extensionsManage
}

@Bean
public RuleNameExtentionsFactory scbRuleNameExtentionsFactory() {
return new RuleNameExtentionsFactory();
public RuleNameExtensionsFactory scbRuleNameExtensionsFactory() {
return new RuleNameExtensionsFactory();
}

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public void tearDown() {
@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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Transport findTransport(String transportName) {
};

List<ExtensionsFactory> extensionsFactories = new ArrayList<>();
extensionsFactories.add(new RuleNameExtentionsFactory());
extensionsFactories.add(new RuleNameExtensionsFactory());
ExtensionsManager extensionsManager = new ExtensionsManager(extensionsFactories);

DiscoveryTree discoveryTree = new DiscoveryTree(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ public static SSLProperties createSSLProperties(boolean sslEnabled, Environment
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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@ private SSLProperties createSSLProperties(Environment environment) {
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(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
* 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:
Expand Down
Loading