diff --git a/.typos.toml b/.typos.toml index bee2ded44ae..1029beacb3e 100644 --- a/.typos.toml +++ b/.typos.toml @@ -27,8 +27,9 @@ ignore = [ "**/cobertura.ser" ] - [words] allow = [ "Verticle", + "verticle", + "VERTICLE", ] diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/KeyPairUtils.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/KeyPairUtils.java index d77067df88f..91fed2ce1c8 100644 --- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/KeyPairUtils.java +++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/KeyPairUtils.java @@ -72,7 +72,7 @@ public static KeyPairEntry generateALGKeyPair() { PrivateKey privKey = keyPair.getPrivate(); return new KeyPairEntry(privKey, pubKey, encoder.encodeToString(pubKey.getEncoded())); } catch (NoSuchAlgorithmException e) { - LOGGER.error("generate rsa keypair faild"); + LOGGER.error("generate rsa keypair failed"); throw new IllegalStateException("perhaps error occurred on jre"); } } diff --git a/governance/src/main/java/org/apache/servicecomb/governance/properties/GovernanceProperties.java b/governance/src/main/java/org/apache/servicecomb/governance/properties/GovernanceProperties.java index f8bda95510e..05f42dfa5b1 100644 --- a/governance/src/main/java/org/apache/servicecomb/governance/properties/GovernanceProperties.java +++ b/governance/src/main/java/org/apache/servicecomb/governance/properties/GovernanceProperties.java @@ -199,8 +199,8 @@ private boolean servicesMatch(String services) { return true; } - return Arrays.stream(services.split(",")).anyMatch(ser -> { - String[] serviceAndVersion = ser.split(":"); + return Arrays.stream(services.split(",")).anyMatch(service -> { + String[] serviceAndVersion = service.split(":"); if (serviceAndVersion.length == 1) { return microserviceMeta.getName().equals(serviceAndVersion[0]); } else if (serviceAndVersion.length == 2) { diff --git a/governance/src/test/java/org/apache/servicecomb/governance/CustomMatchTest.java b/governance/src/test/java/org/apache/servicecomb/governance/CustomMatchTest.java index 92890baa663..a0e0c2d8ab9 100644 --- a/governance/src/test/java/org/apache/servicecomb/governance/CustomMatchTest.java +++ b/governance/src/test/java/org/apache/servicecomb/governance/CustomMatchTest.java @@ -90,7 +90,7 @@ public void test_should_pass_when_multiple_value() { public void test_should_throw_exception_when_not_implements_interface() { GovernanceRequest request = new GovernanceRequest(); try { - Matcher mockMatcher = generateMatcher("classNotImplments", "bill,bill2"); + Matcher mockMatcher = generateMatcher("classNotImplements", "bill,bill2"); this.requestProcessor.match(request, mockMatcher); Assertions.fail("an exception is expected!"); } catch (Exception e) { diff --git a/governance/src/test/java/org/apache/servicecomb/governance/handler/ext/RetryExtensionTest.java b/governance/src/test/java/org/apache/servicecomb/governance/handler/ext/RetryExtensionTest.java index 1fbde35e059..41157a9b079 100644 --- a/governance/src/test/java/org/apache/servicecomb/governance/handler/ext/RetryExtensionTest.java +++ b/governance/src/test/java/org/apache/servicecomb/governance/handler/ext/RetryExtensionTest.java @@ -134,7 +134,7 @@ public void testRetryNoRouteToHostException() { @Test public void testRetryEqualTen() { - Exception target = new ConnectException("connectin refused"); + Exception target = new ConnectException("connection refused"); for (int i = 0; i < 8; i++) { target = new Exception("Level" + i, target); } @@ -145,7 +145,7 @@ public void testRetryEqualTen() { @Test public void testRetryOverTen() { - Exception target = new ConnectException("connectin refused"); + Exception target = new ConnectException("connection refused"); for (int i = 0; i < 9; i++) { target = new Exception("Level" + i, target); } diff --git a/governance/src/test/java/org/apache/servicecomb/governance/mockclasses/ClassNotImplments.java b/governance/src/test/java/org/apache/servicecomb/governance/mockclasses/ClassNotImplements.java similarity index 96% rename from governance/src/test/java/org/apache/servicecomb/governance/mockclasses/ClassNotImplments.java rename to governance/src/test/java/org/apache/servicecomb/governance/mockclasses/ClassNotImplements.java index 85d14fe0834..51336e60ed5 100644 --- a/governance/src/test/java/org/apache/servicecomb/governance/mockclasses/ClassNotImplments.java +++ b/governance/src/test/java/org/apache/servicecomb/governance/mockclasses/ClassNotImplements.java @@ -21,7 +21,7 @@ import org.apache.servicecomb.governance.marker.GovernanceRequest; @Component -public class ClassNotImplments { +public class ClassNotImplements { public boolean matchRequest(GovernanceRequest request, String parameters) { return true; } diff --git a/governance/src/test/resources/application.yaml b/governance/src/test/resources/application.yaml index f0969b2c2be..ce981ac1ea2 100644 --- a/governance/src/test/resources/application.yaml +++ b/governance/src/test/resources/application.yaml @@ -103,7 +103,7 @@ servicecomb: rate: 1 demo-rateLimiting-servicename: | rate: 1 - wrongIngored: | + wrongIgnored: | rate: 0 identifierRateLimiting: demo-rateLimiting: | @@ -131,7 +131,7 @@ servicecomb: retry: demo-retry: | maxAttempts: 3 - wrongIngored: | + wrongIgnored: | maxAttempts: -1 circuitBreaker: demo-circuitBreaker: | @@ -139,7 +139,7 @@ servicecomb: slidingWindowSize: 2 slidingWindowType: COUNT_BASED services: myself:1.0,other - wrongIngored: | + wrongIgnored: | rules: match: demo-circuitBreaker.xx minimumNumberOfCalls: -1 @@ -158,7 +158,7 @@ servicecomb: maxConcurrentCalls: 1 maxWaitDuration: 3000 services: other:1.0 - wrongIngored: | + wrongIgnored: | rules: match: demo-bulkhead.xx maxWaitDuration: -1 @@ -191,7 +191,7 @@ servicecomb: type: abort percentage: 50 errorCode: 500 - wrongIngored: | + wrongIgnored: | delayTime: -1 type: ERROR faultInjection2: diff --git a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestSessionSticknessRule.java b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestSessionStickinessRule.java similarity index 99% rename from handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestSessionSticknessRule.java rename to handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestSessionStickinessRule.java index 0b8c904503b..9a60b18657c 100644 --- a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestSessionSticknessRule.java +++ b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestSessionStickinessRule.java @@ -37,7 +37,7 @@ import mockit.Mock; import mockit.MockUp; -public class TestSessionSticknessRule { +public class TestSessionStickinessRule { @Test public void testServerWithoutTimeoutAndWithThreshold() { diff --git a/service-registry/registry-etcd/src/main/java/org/apache/servicecomb/registry/etcd/EtcdDiscovery.java b/service-registry/registry-etcd/src/main/java/org/apache/servicecomb/registry/etcd/EtcdDiscovery.java index 407bc1d7d81..ddbb4cb755c 100644 --- a/service-registry/registry-etcd/src/main/java/org/apache/servicecomb/registry/etcd/EtcdDiscovery.java +++ b/service-registry/registry-etcd/src/main/java/org/apache/servicecomb/registry/etcd/EtcdDiscovery.java @@ -89,7 +89,7 @@ public boolean enabled(String application, String serviceName) { public List findServiceInstances(String application, String serviceName) { String prefixPath = basePath + "/" + application + "/" + serviceName; - watchMap.computeIfAbsent(prefixPath, serName -> { + watchMap.computeIfAbsent(prefixPath, listenServiceName -> { Watch watchClient = client.getWatchClient(); try { ByteSequence prefixByteSeq = ByteSequence.from(prefixPath, Charset.defaultCharset()); diff --git a/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalDiscoveryInstance.java b/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalDiscoveryInstance.java index 8fb0e57f334..ff8e10794f1 100644 --- a/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalDiscoveryInstance.java +++ b/service-registry/registry-local/src/main/java/org/apache/servicecomb/localregistry/LocalDiscoveryInstance.java @@ -56,12 +56,12 @@ public LocalDiscoveryInstance(LocalOpenAPIRegistry localOpenAPIRegistry, SwaggerGenerator generator = SwaggerGenerator.create(v); OpenAPI openAPI = generator.generate(); if (openAPI == null) { - throw new IllegalStateException(String.format("Generate schema for %s/%s/%s faild.", + throw new IllegalStateException(String.format("Generate schema for %s/%s/%s failed.", registryBean.getAppId(), registryBean.getServiceName(), k)); } String schemaContent = SwaggerUtils.swaggerToString(openAPI); if (StringUtils.isEmpty(schemaContent)) { - throw new IllegalStateException(String.format("Generate schema for %s/%s/%s faild.", + throw new IllegalStateException(String.format("Generate schema for %s/%s/%s failed.", registryBean.getAppId(), registryBean.getServiceName(), k)); } localOpenAPIRegistry.registerOpenAPI(registryBean.getAppId(), registryBean.getServiceName(), diff --git a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java index 037f4c9e626..7aa346a63c0 100644 --- a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java +++ b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java @@ -121,7 +121,7 @@ public void start(Promise startPromise) throws Exception { SPIServiceUtils.getAllService(HttpServerExceptionHandler.class); httpServer.exceptionHandler(e -> { if (e instanceof ClosedChannelException) { - // This is quite normal in between browser and ege, so do not print out. + // This is quite normal in between browser and edge, so do not print out. LOGGER.debug("Unexpected error in server.{}", ExceptionUtils.getExceptionMessageWithoutTrace(e)); } else { LOGGER.error("Unexpected error in server.{}", ExceptionUtils.getExceptionMessageWithoutTrace(e)); diff --git a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java index b3c1f7108f1..8df4aa0f1f1 100644 --- a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java +++ b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestRestServerVerticle.java @@ -201,14 +201,14 @@ public void testRestServerVerticleWithRouter(@Mocked Transport transport, @Mocke result = endpointObject; } }; - Endpoint endpiont = new Endpoint(transport, "http://127.0.0.1:8080"); + Endpoint endpoint = new Endpoint(transport, "http://127.0.0.1:8080"); new Expectations() { { context.config(); result = jsonObject; jsonObject.getValue(AbstractTransport.ENDPOINT_KEY); - result = endpiont; + result = endpoint; } }; RestServerVerticle server = new RestServerVerticle(); @@ -228,14 +228,14 @@ public void testRestServerVerticleWithRouterSSL(@Mocked Transport transport, @Mo result = endpointObject; } }; - Endpoint endpiont = new Endpoint(transport, "http://127.0.0.1:8080?sslEnabled=true"); + Endpoint endpoint = new Endpoint(transport, "http://127.0.0.1:8080?sslEnabled=true"); new Expectations() { { context.config(); result = jsonObject; jsonObject.getValue(AbstractTransport.ENDPOINT_KEY); - result = endpiont; + result = endpoint; } }; RestServerVerticle server = new RestServerVerticle();