From c7dc06e4c6add023acca07873c65a07b21c87ac9 Mon Sep 17 00:00:00 2001 From: SweetWuXiaoMei Date: Tue, 26 Nov 2024 17:24:48 +0800 Subject: [PATCH 1/3] refactor(invocation): Refactor response mapping factory method - Modify the names of factories variables in multiple classes to factories to unify the naming style - Update the factories parameter in the method signature to factories to maintain consistency - Fixed typos in some variables and methods --- .../foundation/vertx/stream/InputStreamToReadStream.java | 8 ++++---- .../servicecomb/qps/strategy/FixedWindowStrategy.java | 2 +- .../servicecomb/swagger/engine/SwaggerEnvironment.java | 4 ++-- .../arguments/AbstractArgumentsMapperCreator.java | 8 ++++---- .../consumer/ConsumerArgumentsMapperCreator.java | 4 ++-- .../producer/ProducerArgumentsMapperCreator.java | 4 ++-- .../invocation/response/ResponseMapperFactory.java | 2 +- .../CompletableFutureConsumerResponseMapperFactory.java | 4 ++-- .../CseResponseConsumerResponseMapperFactory.java | 2 +- .../consumer/DefaultConsumerResponseMapperFactory.java | 2 +- .../consumer/OptionalConsumerResponseMapperFactory.java | 4 ++-- .../CompletableFutureProducerResponseMapperFactory.java | 4 ++-- .../CseResponseProducerResponseMapperFactory.java | 2 +- .../producer/DefaultProducerResponseMapperFactory.java | 2 +- .../producer/OptionalProducerResponseMapperFactory.java | 4 ++-- .../response/JaxrsConsumerResponseMapperFactory.java | 2 +- .../response/JaxrsProducerResponseMapperFactory.java | 2 +- .../response/SpringmvcConsumerResponseMapperFactory.java | 4 ++-- .../response/SpringmvcProducerResponseMapperFactory.java | 4 ++-- .../response/TestSpringmvcProducerResponseMapper.java | 2 +- .../TestSpringmvcProducerResponseMapperFactory.java | 4 ++-- 21 files changed, 37 insertions(+), 37 deletions(-) diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/InputStreamToReadStream.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/InputStreamToReadStream.java index 8ca0a6a4ee5..f1a5f83b2ce 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/InputStreamToReadStream.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/InputStreamToReadStream.java @@ -97,16 +97,16 @@ public synchronized InputStreamToReadStream handler(Handler handler) { } class ReadResult { - int readed; + int read; byte[] bytes = new byte[readBufferSize]; void doRead() throws IOException { - readed = inputStream.read(bytes); + read = inputStream.read(bytes); } Buffer toBuffer() { - return Buffer.buffer(Unpooled.wrappedBuffer(bytes).writerIndex(readed)); + return Buffer.buffer(Unpooled.wrappedBuffer(bytes).writerIndex(read)); } } @@ -143,7 +143,7 @@ private synchronized void afterReadInEventloop(AsyncResult ar) { readInProgress = false; ReadResult readResult = ar.result(); - if (readResult.readed < 0) { + if (readResult.read < 0) { handleEnd(); return; } diff --git a/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/strategy/FixedWindowStrategy.java b/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/strategy/FixedWindowStrategy.java index 65204c3a304..c95c1ab2cba 100644 --- a/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/strategy/FixedWindowStrategy.java +++ b/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/strategy/FixedWindowStrategy.java @@ -52,7 +52,7 @@ public boolean isLimitNewRequest() { msCycleBegin = msNow; } - // Configuration update and use is at the situation of multi-threaded concurrency + // Configuration update and use is at the situation of multi-thread concurrency // It is possible that operation level updated to null,but schema level or microservice level does not updated boolean isLimitRequest = newCount - lastRequestCount >= this.getQpsLimit(); if (isLimitRequest){ diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java index a7851d791ff..655e7a2c6a1 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java @@ -54,7 +54,7 @@ public class SwaggerEnvironment { public SwaggerConsumer createConsumer(Class consumerIntf, OpenAPI swagger) { swagger = checkAndGenerateSwagger(consumerIntf, swagger); - Map, ContextArgumentMapperFactory> contextFactorys = SPIServiceUtils + Map, ContextArgumentMapperFactory> contextFactories = SPIServiceUtils .getOrLoadSortedService(ConsumerContextArgumentMapperFactory.class) .stream() .collect(Collectors.toMap(ConsumerContextArgumentMapperFactory::getContextClass, Function.identity())); @@ -79,7 +79,7 @@ public SwaggerConsumer createConsumer(Class consumerIntf, OpenAPI swagger) { ConsumerArgumentsMapperCreator creator = new ConsumerArgumentsMapperCreator( Json.mapper().getSerializationConfig(), - contextFactorys, + contextFactories, consumerIntf, consumerMethod, swaggerOperation); 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 deb7ba5baea..28022c898ed 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 @@ -96,7 +96,7 @@ public abstract class AbstractArgumentsMapperCreator { protected SerializationConfig serializationConfig; // key is context class - protected Map, ContextArgumentMapperFactory> contextFactorys; + protected Map, ContextArgumentMapperFactory> contextFactories; // consumer or producer protected Method providerMethod; @@ -117,10 +117,10 @@ public abstract class AbstractArgumentsMapperCreator { protected Set processedSwaggerParameters; public AbstractArgumentsMapperCreator(SerializationConfig serializationConfig, - Map, ContextArgumentMapperFactory> contextFactorys, Class providerClass, + Map, ContextArgumentMapperFactory> contextFactories, Class providerClass, Method providerMethod, SwaggerOperation swaggerOperation) { this.serializationConfig = serializationConfig; - this.contextFactorys = contextFactorys; + this.contextFactories = contextFactories; this.providerClass = providerClass; this.providerMethod = providerMethod; this.swaggerOperation = swaggerOperation; @@ -198,7 +198,7 @@ protected void doCreateArgumentsMapper() { * @return true means processed */ protected boolean processContextParameter(java.lang.reflect.Parameter providerParameter) { - ContextArgumentMapperFactory contextFactory = contextFactorys.get(providerParameter.getType()); + ContextArgumentMapperFactory contextFactory = contextFactories.get(providerParameter.getType()); if (contextFactory == null) { return false; } diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/ConsumerArgumentsMapperCreator.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/ConsumerArgumentsMapperCreator.java index e47a5e87e60..84c7a6fa926 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/ConsumerArgumentsMapperCreator.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/ConsumerArgumentsMapperCreator.java @@ -47,9 +47,9 @@ public class ConsumerArgumentsMapperCreator extends AbstractArgumentsMapperCreat private int unknownConsumerParams = 0; public ConsumerArgumentsMapperCreator(SerializationConfig serializationConfig, - Map, ContextArgumentMapperFactory> contextFactorys, Class consumerClass, + Map, ContextArgumentMapperFactory> contextFactories, Class consumerClass, Method consumerMethod, SwaggerOperation swaggerOperation) { - super(serializationConfig, contextFactorys, consumerClass, consumerMethod, swaggerOperation); + super(serializationConfig, contextFactories, consumerClass, consumerMethod, swaggerOperation); } private boolean isAllSameMapper() { diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/producer/ProducerArgumentsMapperCreator.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/producer/ProducerArgumentsMapperCreator.java index a58662ca015..9aea4bec37d 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/producer/ProducerArgumentsMapperCreator.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/producer/ProducerArgumentsMapperCreator.java @@ -49,9 +49,9 @@ public class ProducerArgumentsMapperCreator extends AbstractArgumentsMapperCreat private final Map swaggerParameterTypes; public ProducerArgumentsMapperCreator(SerializationConfig serializationConfig, - Map, ContextArgumentMapperFactory> contextFactorys, Class producerClass, + Map, ContextArgumentMapperFactory> contextFactories, Class producerClass, Method producerMethod, SwaggerOperation swaggerOperation) { - super(serializationConfig, contextFactorys, producerClass, producerMethod, swaggerOperation); + super(serializationConfig, contextFactories, producerClass, producerMethod, swaggerOperation); swaggerParameterTypes = new HashMap<>(); } diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactory.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactory.java index f88b7af13ca..917a3a835b9 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactory.java @@ -25,5 +25,5 @@ default int getOrder() { boolean isMatch(Type providerType); - MAPPER createResponseMapper(ResponseMapperFactories factorys, Type providerType); + MAPPER createResponseMapper(ResponseMapperFactories factories, Type providerType); } diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CompletableFutureConsumerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CompletableFutureConsumerResponseMapperFactory.java index 4ba292e99b5..0a7d5a976ed 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CompletableFutureConsumerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CompletableFutureConsumerResponseMapperFactory.java @@ -33,9 +33,9 @@ public boolean isMatch(Type consumerType) { } @Override - public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories factorys, + public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories factories, Type consumerType) { Type realConsumerType = ((ParameterizedType) consumerType).getActualTypeArguments()[0]; - return factorys.createResponseMapper(realConsumerType); + return factories.createResponseMapper(realConsumerType); } } diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CseResponseConsumerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CseResponseConsumerResponseMapperFactory.java index af7fc67d011..76b90185dcd 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CseResponseConsumerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CseResponseConsumerResponseMapperFactory.java @@ -30,7 +30,7 @@ public boolean isMatch(Type consumerType) { } @Override - public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories factorys, + public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories factories, Type consumerType) { return SAME; } diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/DefaultConsumerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/DefaultConsumerResponseMapperFactory.java index 3d07da3896a..e60f05604e0 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/DefaultConsumerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/DefaultConsumerResponseMapperFactory.java @@ -32,7 +32,7 @@ public boolean isMatch(Type consumerType) { } @Override - public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories factorys, + public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories factories, Type consumerType) { return new DefaultConsumerResponseMapper(); } diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/OptionalConsumerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/OptionalConsumerResponseMapperFactory.java index a6fb8bc2ac9..eddd30e407a 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/OptionalConsumerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/OptionalConsumerResponseMapperFactory.java @@ -33,10 +33,10 @@ public boolean isMatch(Type consumerType) { } @Override - public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories factorys, + public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories factories, Type consumerType) { Type realConsumerType = ((ParameterizedType) consumerType).getActualTypeArguments()[0]; - ConsumerResponseMapper realMapper = factorys.createResponseMapper(realConsumerType); + ConsumerResponseMapper realMapper = factories.createResponseMapper(realConsumerType); return new OptionalConsumerResponseMapper(realMapper); } } diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CompletableFutureProducerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CompletableFutureProducerResponseMapperFactory.java index 4ac1be225a9..fc87f5728b7 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CompletableFutureProducerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CompletableFutureProducerResponseMapperFactory.java @@ -33,9 +33,9 @@ public boolean isMatch(Type producerType) { } @Override - public ProducerResponseMapper createResponseMapper(ResponseMapperFactories factorys, + public ProducerResponseMapper createResponseMapper(ResponseMapperFactories factories, Type producerType) { Type realProducerType = ((ParameterizedType) producerType).getActualTypeArguments()[0]; - return factorys.createResponseMapper(realProducerType); + return factories.createResponseMapper(realProducerType); } } diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CseResponseProducerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CseResponseProducerResponseMapperFactory.java index 79d27c5fac8..02f840cbb59 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CseResponseProducerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CseResponseProducerResponseMapperFactory.java @@ -30,7 +30,7 @@ public boolean isMatch(Type producerType) { } @Override - public ProducerResponseMapper createResponseMapper(ResponseMapperFactories factorys, + public ProducerResponseMapper createResponseMapper(ResponseMapperFactories factories, Type producerType) { return SAME; } diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/DefaultProducerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/DefaultProducerResponseMapperFactory.java index 06418c15bb6..1b58d6cbb08 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/DefaultProducerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/DefaultProducerResponseMapperFactory.java @@ -32,7 +32,7 @@ public boolean isMatch(Type producerType) { } @Override - public ProducerResponseMapper createResponseMapper(ResponseMapperFactories factorys, + public ProducerResponseMapper createResponseMapper(ResponseMapperFactories factories, Type producerType) { return new DefaultProducerResponseMapper(); } diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/OptionalProducerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/OptionalProducerResponseMapperFactory.java index 06a793657f2..39d46b8b777 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/OptionalProducerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/OptionalProducerResponseMapperFactory.java @@ -33,10 +33,10 @@ public boolean isMatch(Type producerType) { } @Override - public ProducerResponseMapper createResponseMapper(ResponseMapperFactories factorys, + public ProducerResponseMapper createResponseMapper(ResponseMapperFactories factories, Type producerType) { Type realProducerType = ((ParameterizedType) producerType).getActualTypeArguments()[0]; - ProducerResponseMapper realMapper = factorys.createResponseMapper(realProducerType); + ProducerResponseMapper realMapper = factories.createResponseMapper(realProducerType); return new OptionalProducerResponseMapper(realMapper); } } diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapperFactory.java index 689cdcb2559..307cdb26c20 100644 --- a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapperFactory.java @@ -31,7 +31,7 @@ public boolean isMatch(Type consumerType) { } @Override - public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories factorys, + public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories factories, Type consumerType) { return new JaxrsConsumerResponseMapper(); } diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapperFactory.java index 9ae523d358d..a8e1e064fdd 100644 --- a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapperFactory.java @@ -31,7 +31,7 @@ public boolean isMatch(Type producerType) { } @Override - public ProducerResponseMapper createResponseMapper(ResponseMapperFactories factorys, + public ProducerResponseMapper createResponseMapper(ResponseMapperFactories factories, Type producerType) { return new JaxrsProducerResponseMapper(); } diff --git a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcConsumerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcConsumerResponseMapperFactory.java index 89bd9a76e90..0e22da39176 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcConsumerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcConsumerResponseMapperFactory.java @@ -35,10 +35,10 @@ public boolean isMatch(Type consumerType) { } @Override - public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories factorys, + public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories factories, Type consumerType) { Type realConsumerType = ((ParameterizedType) consumerType).getActualTypeArguments()[0]; - ConsumerResponseMapper realMapper = factorys.createResponseMapper(realConsumerType); + ConsumerResponseMapper realMapper = factories.createResponseMapper(realConsumerType); return new SpringmvcConsumerResponseMapper(realMapper); } } diff --git a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcProducerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcProducerResponseMapperFactory.java index 6f95ec287d9..cfb43f5c3b2 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcProducerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcProducerResponseMapperFactory.java @@ -35,10 +35,10 @@ public boolean isMatch(Type producerType) { } @Override - public ProducerResponseMapper createResponseMapper(ResponseMapperFactories factorys, + public ProducerResponseMapper createResponseMapper(ResponseMapperFactories factories, Type producerType) { Type realProducerType = ((ParameterizedType) producerType).getActualTypeArguments()[0]; - ProducerResponseMapper realMapper = factorys.createResponseMapper(realProducerType); + ProducerResponseMapper realMapper = factories.createResponseMapper(realProducerType); return new SpringmvcProducerResponseMapper(realMapper); } } diff --git a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapper.java b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapper.java index cc029356aa1..c48fc62be8c 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapper.java +++ b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapper.java @@ -63,7 +63,7 @@ Response mapResponse(StatusType status, Object response) { @SuppressWarnings("unchecked") @Test - public void mapResponse_withoutHeader_sucess() { + public void mapResponse_withoutHeader_success() { ResponseEntity responseEntity = new ResponseEntity<>(arrResult, org.springframework.http.HttpStatus.OK); Response response = mapper.mapResponse(null, responseEntity); diff --git a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapperFactory.java index dddf4447d54..35c84db148f 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapperFactory.java @@ -34,7 +34,7 @@ public class TestSpringmvcProducerResponseMapperFactory { SpringmvcProducerResponseMapperFactory factory = new SpringmvcProducerResponseMapperFactory(); - ResponseMapperFactories factorys = new ResponseMapperFactories<>( + ResponseMapperFactories factories = new ResponseMapperFactories<>( ProducerResponseMapperFactory.class); public ResponseEntity responseEntity() { @@ -67,7 +67,7 @@ public void createResponseMapper() { Method responseEntityMethod = ReflectUtils.findMethod(this.getClass(), "responseEntity"); ProducerResponseMapper mapper = factory - .createResponseMapper(factorys, responseEntityMethod.getGenericReturnType()); + .createResponseMapper(factories, responseEntityMethod.getGenericReturnType()); MatcherAssert.assertThat(mapper, Matchers.instanceOf(SpringmvcProducerResponseMapper.class)); ResponseEntity responseEntity = new ResponseEntity<>(new String[] {"a", "b"}, HttpStatus.OK); From 5f2788bac00215a75f98afcbe5f2fa2695203d3e Mon Sep 17 00:00:00 2001 From: SweetWuXiaoMei Date: Tue, 26 Nov 2024 18:07:30 +0800 Subject: [PATCH 2/3] ci: fix typos and optimize code format - Fixed spelling errors in multiple files, such as "prefex" being changed to "prefix", "ser" being changed to "serialize", etc. - Optimize some code formats to improve readability - Update the test result display format to make the data clearer --- .typos.toml | 10 ++- .../resources/test/test/microservice.yaml | 2 +- .../servicecomb/samples/HelloWorldIT.java | 4 +- demo/demo-cse-v2/README.md | 4 +- .../org/apache/servicecomb/demo/TestMgr.java | 12 +-- .../client/UploadDownloadSchemaTest.java | 4 +- .../CodeFirstRestTemplateSpringmvc.java | 18 ++--- .../springmvc/server/CodeFirstSpringmvc.java | 2 +- .../server/CodeFirstSpringmvcForSchema.java | 2 +- .../schemas/CodeFirstSpringmvcForSchema.yaml | 2 +- .../src/main/resources/application.yml | 4 +- .../apache/servicecomb/config/YAMLUtil.java | 4 +- .../src/test/resources/test1.yaml | 2 +- foundations/foundation-protobuf/README.md | 73 ++++++++++--------- .../internal/parser/ContentFileReader.java | 6 +- .../schema/scalar/TestBoolSchema.java | 2 +- .../protobuf/performance/TestBase.java | 10 +-- .../performance/TestEngineResult.java | 10 +-- .../performance/TestProtoPerformance.java | 20 ++--- .../foundation/ssl/TestSSLOptionFactory.java | 2 +- pom.xml | 2 +- 21 files changed, 99 insertions(+), 96 deletions(-) diff --git a/.typos.toml b/.typos.toml index 7ea0a05971e..884666a340d 100644 --- a/.typos.toml +++ b/.typos.toml @@ -24,13 +24,15 @@ "vertx" = "vertx" [files] -ignore = [ - "**/cobertura.ser" +extend-exclude = [ + "**/cobertura.ser" # 排除该路径 ] -[words] -allow = [ +[default] +extend-ignore-words-re = [ "Verticle", "verticle", "VERTICLE", "Prelease", + "cobertura", + "ser", ] diff --git a/core/src/test/resources/test/test/microservice.yaml b/core/src/test/resources/test/test/microservice.yaml index a82dcd3f036..7ec47b07b63 100644 --- a/core/src/test/resources/test/test/microservice.yaml +++ b/core/src/test/resources/test/test/microservice.yaml @@ -18,7 +18,7 @@ service_description: name: default version: 0.0.1 - propertyExtentedClass: org.apache.servicecomb.serviceregistry.MicroServicePropertyExtendedStub + propertyExtendedClass: org.apache.servicecomb.serviceregistry.MicroServicePropertyExtendedStub servicecomb: service: registry: diff --git a/demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/HelloWorldIT.java b/demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/HelloWorldIT.java index 423d3b58d03..691ee47a162 100644 --- a/demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/HelloWorldIT.java +++ b/demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/HelloWorldIT.java @@ -39,7 +39,7 @@ public void testRestTransport() throws Exception { testHelloWorld(); testHelloWorldCanary(); testHelloWorldEmptyProtectionCloseWeight100(); - testHelloWorldeEptyProtectionCloseWeightLess100(); + testHelloWorldeEmptyProtectionCloseWeightLess100(); testHelloWorldEmptyProtectionCloseFallback(); testHelloWorldEmptyProtectionCloseWeight100Two(); } @@ -142,7 +142,7 @@ private void testHelloWorldEmptyProtectionCloseWeight100() { TestMgr.check(failCount == 20, true); } - private void testHelloWorldeEptyProtectionCloseWeightLess100() { + private void testHelloWorldeEmptyProtectionCloseWeightLess100() { int failCount = 0; int succCount = 0; diff --git a/demo/demo-cse-v2/README.md b/demo/demo-cse-v2/README.md index f5c751f38a8..dda7dee702e 100644 --- a/demo/demo-cse-v2/README.md +++ b/demo/demo-cse-v2/README.md @@ -60,7 +60,7 @@ cse: priority1: v1 ``` -* 服务级配置：consumerSer.yaml，微服务性选择consumer。类型为 yaml。 +* 服务级配置：consumerService.yaml，微服务性选择consumer。类型为 yaml。 ```yaml cse: v2: @@ -115,7 +115,7 @@ cse: * 执行 tests-client 里面的集成测试用例 （成功） * 修改 - * 服务级配置：consumerSer.yaml。 + * 服务级配置：consumerService.yaml。 ```yaml cse: v2: diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/TestMgr.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/TestMgr.java index 9cfffaa5c2f..c90fe8bc1a5 100644 --- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/TestMgr.java +++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/TestMgr.java @@ -32,7 +32,7 @@ public class TestMgr { private static String msg = ""; - private static final AtomicLong checkes = new AtomicLong(0); + private static final AtomicLong checks = new AtomicLong(0); public static void setMsg(String msg) { TestMgr.msg = msg; @@ -47,7 +47,7 @@ public static void check(Object expect, Object real) { } public static void check(Object expect, Object real, Throwable error) { - checkes.incrementAndGet(); + checks.incrementAndGet(); if (expect == real) { return; @@ -66,7 +66,7 @@ public static void check(Object expect, Object real, Throwable error) { } public static void checkNotEmpty(String real) { - checkes.incrementAndGet(); + checks.incrementAndGet(); if (StringUtils.isEmpty(real)) { errorList.add(new Error(msg + " | unexpected null result, method is " + getCaller())); @@ -78,7 +78,7 @@ public static void fail(String desc) { } public static void failed(String desc, Throwable e) { - checkes.incrementAndGet(); + checks.incrementAndGet(); Error error = new Error(msg + " | " + desc + ", method is " + getCaller()); if (e != null) { @@ -94,12 +94,12 @@ public static boolean isSuccess() { public static void summary() { if (errorList.isEmpty()) { LOGGER.info("............. test finished ............"); - LOGGER.info("............. total checks : " + checkes.get()); + LOGGER.info("............. total checks : " + checks.get()); return; } LOGGER.info("............. test not finished ............"); - LOGGER.info("............. total checks : " + checkes.get()); + LOGGER.info("............. total checks : " + checks.get()); LOGGER.info("............. total errors : " + errorList.size()); LOGGER.info("............. error details: "); for (Throwable e : errorList) { diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/src/main/java/org/apache/servicecomb/springboot/springmvc/client/UploadDownloadSchemaTest.java b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/src/main/java/org/apache/servicecomb/springboot/springmvc/client/UploadDownloadSchemaTest.java index 60f61f1c55b..18054cf4f4a 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/src/main/java/org/apache/servicecomb/springboot/springmvc/client/UploadDownloadSchemaTest.java +++ b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/src/main/java/org/apache/servicecomb/springboot/springmvc/client/UploadDownloadSchemaTest.java @@ -38,10 +38,10 @@ public class UploadDownloadSchemaTest implements CategorizedTestCase { @Override public void testRestTransport() throws Exception { testEmptyFileUploadWork(); - testNonEmptyFileUploadWorkd(); + testNonEmptyFileUploadWork(); } - private void testNonEmptyFileUploadWorkd() throws Exception { + private void testNonEmptyFileUploadWork() throws Exception { String file2Content = " bonjour"; File someFile = File.createTempFile("upload2", ".txt"); FileUtils.writeStringToFile(someFile, file2Content, StandardCharsets.UTF_8, false); diff --git a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java index f561b954fdb..d30edc6b495 100644 --- a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java +++ b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java @@ -213,12 +213,12 @@ private void testCodeFirstTestForm(RestOperations template, String cseUrlPrefix) Map map = new HashMap<>(); String code = "servicecomb%2bwelcome%40%23%24%25%5e%26*()%3d%3d"; map.put("form1", code); - HttpEntity> formEntiry = new HttpEntity<>(map, formHeaders); + HttpEntity> formEntry = new HttpEntity<>(map, formHeaders); TestMgr.check(code + "null", - template.postForEntity(cseUrlPrefix + "/testform", formEntiry, String.class).getBody()); + template.postForEntity(cseUrlPrefix + "/testform", formEntry, String.class).getBody()); map.put("form2", "hello"); TestMgr - .check(code + "hello", template.postForEntity(cseUrlPrefix + "/testform", formEntiry, String.class).getBody()); + .check(code + "hello", template.postForEntity(cseUrlPrefix + "/testform", formEntry, String.class).getBody()); } private void testCodeFirstTestFormHighway(RestOperations template, String cseUrlPrefix) { @@ -228,16 +228,16 @@ private void testCodeFirstTestFormHighway(RestOperations template, String cseUrl String code = "servicecomb%2bwelcome%40%23%24%25%5e%26*()%3d%3d"; map.put("form1", code); map.put("form2", ""); - HttpEntity> formEntiry = new HttpEntity<>(map, formHeaders); - TestMgr.check(code + "", template.postForEntity(cseUrlPrefix + "/testform", formEntiry, String.class).getBody()); + HttpEntity> formEntry = new HttpEntity<>(map, formHeaders); + TestMgr.check(code + "", template.postForEntity(cseUrlPrefix + "/testform", formEntry, String.class).getBody()); map = new HashMap<>(); code = "servicecomb%2bwelcome%40%23%24%25%5e%26*()%3d%3d"; map.put("form1", code); map.put("form2", null); - formEntiry = new HttpEntity<>(map, formHeaders); + formEntry = new HttpEntity<>(map, formHeaders); TestMgr.check(code + "null", - template.postForEntity(cseUrlPrefix + "/testform", formEntiry, String.class).getBody()); + template.postForEntity(cseUrlPrefix + "/testform", formEntry, String.class).getBody()); } private void testCodeFirstTestFormRest(RestOperations template, String cseUrlPrefix) { @@ -247,8 +247,8 @@ private void testCodeFirstTestFormRest(RestOperations template, String cseUrlPre String code = "servicecomb%2bwelcome%40%23%24%25%5e%26*()%3d%3d"; map.put("form1", code); map.put("form2", ""); - HttpEntity> formEntiry = new HttpEntity<>(map, formHeaders); + HttpEntity> formEntry = new HttpEntity<>(map, formHeaders); // Rest will have empty string, but users will try to avoid depend on this, This is different from highway - TestMgr.check(code + "", template.postForEntity(cseUrlPrefix + "/testform", formEntiry, String.class).getBody()); + TestMgr.check(code + "", template.postForEntity(cseUrlPrefix + "/testform", formEntry, String.class).getBody()); } } diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java index ded1680b211..c49d8879d92 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java @@ -302,7 +302,7 @@ public String addString(@RequestParam(name = "s") List s) { } // Using 490, 590 error code, the response type should be CommonExceptionData. Or we need - // complex ExceptionConverters to deal with exceptions thrown by Hanlders, etc. + // complex ExceptionConverters to deal with exceptions thrown by Handlers, etc. @RequestMapping(path = "/fallback/returnnull/{name}", method = RequestMethod.GET) @ApiResponses(value = {@ApiResponse(responseCode = "200", content = @Content(schema = @Schema(implementation = String.class)), description = "xxx"), diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvcForSchema.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvcForSchema.java index fd5ddcecf28..7b5c7e4f30b 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvcForSchema.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvcForSchema.java @@ -32,7 +32,7 @@ * only checksum is validated to make sure schema is not changed. */ @RestSchema(schemaId = "CodeFirstSpringmvcForSchema") -@RequestMapping(path = "/forScheam") +@RequestMapping(path = "/forSchema") public class CodeFirstSpringmvcForSchema { /* * Using http://editor.swagger.io/ . Listing errors not handled: diff --git a/demo/demo-springmvc/springmvc-server/src/main/resources/schemas/CodeFirstSpringmvcForSchema.yaml b/demo/demo-springmvc/springmvc-server/src/main/resources/schemas/CodeFirstSpringmvcForSchema.yaml index 5e2fd957ba1..2263730b56a 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/resources/schemas/CodeFirstSpringmvcForSchema.yaml +++ b/demo/demo-springmvc/springmvc-server/src/main/resources/schemas/CodeFirstSpringmvcForSchema.yaml @@ -21,7 +21,7 @@ info: title: swagger definition for org.apache.servicecomb.demo.springmvc.server.CodeFirstSpringmvcForSchema version: 1.0.0 servers: -- url: /forScheam +- url: /forSchema paths: /uploadFile: post: diff --git a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/src/main/resources/application.yml b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/src/main/resources/application.yml index 192d48653cc..af6c2946515 100644 --- a/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/src/main/resources/application.yml +++ b/demo/demo-zeroconfig-registry/demo-zeroconfig-registry-client/src/main/resources/application.yml @@ -52,7 +52,7 @@ servicecomb: matches: - apiPath: exact: "/governance/retry" - demo-retry-no-prefex: | + demo-retry-no-prefix: | matches: - apiPath: exact: "/noPrefixRetry" @@ -82,7 +82,7 @@ servicecomb: maxAttempts: 3 ## services is optional in configuration file services: demo-zeroconfig-registry-client - demo-retry-no-prefex: | + demo-retry-no-prefix: | maxAttempts: 3 ## services is optional in configuration file services: demo-zeroconfig-registry-client diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/YAMLUtil.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/YAMLUtil.java index a83dd03eab1..2dc116a304b 100644 --- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/YAMLUtil.java +++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/YAMLUtil.java @@ -98,13 +98,13 @@ public static T parserObject(String yamlContent, Class clazz) { } @SuppressWarnings("unchecked") - public static Map retrieveItems(String prefix, Map propertieMap) { + public static Map retrieveItems(String prefix, Map propertiesMap) { Map result = new LinkedHashMap<>(); if (!prefix.isEmpty()) { prefix += "."; } - for (Map.Entry entry : propertieMap.entrySet()) { + for (Map.Entry entry : propertiesMap.entrySet()) { if (entry.getValue() instanceof Map) { result.putAll(retrieveItems(prefix + entry.getKey(), (Map) entry.getValue())); } else { diff --git a/foundations/foundation-config/src/test/resources/test1.yaml b/foundations/foundation-config/src/test/resources/test1.yaml index bface267f05..e171487901f 100644 --- a/foundations/foundation-config/src/test/resources/test1.yaml +++ b/foundations/foundation-config/src/test/resources/test1.yaml @@ -38,7 +38,7 @@ shutDownHandler: enabled: true timeLimit: 30000 -hsa: +has: manager: url: 127.0.0.1 serializer: diff --git a/foundations/foundation-protobuf/README.md b/foundations/foundation-protobuf/README.md index e37a1f4143b..c225e89dc87 100644 --- a/foundations/foundation-protobuf/README.md +++ b/foundations/foundation-protobuf/README.md @@ -53,7 +53,6 @@ public class User { // getter and setter } ``` -```java RootSerializer serializer = protoMapper.createRootSerializer("User", User.class); User user = new User(); @@ -63,6 +62,8 @@ byte[] pojoBytes= serializer.serialize(user); Map map = new HashMap<>(); map.put("name", "userName"); byte[] mapBytes = serializer.serialize(map); +```java + // pojoBytes equals mapBytes ``` @@ -96,57 +97,57 @@ Map map = mapDeserializer.deserialize(bytes); Empty: Protostuff ScbStrong ScbWeak Protobuf Jackson -ser time(ms) : 519 515 240 288 1242 -ser len : 36 0 0 0 56 -deser time(ms): 161 69 10 516 486 -deser->ser len: 36 0 0 0 56 -ser+deser(ms) : 680 584 250 804 1728 +serialize time(ms) : 519 515 240 288 1242 +serialize len : 36 0 0 0 56 +deserialize time(ms): 161 69 10 516 486 +deserialize->serialize len: 36 0 0 0 56 +serialize+deserialize(ms) : 680 584 250 804 1728 Scalars: Protostuff ScbStrong ScbWeak Protobuf Jackson -ser time(ms) : 557 529 328 262 1357 -ser len : 56 24 24 24 76 -deser time(ms): 181 141 115 527 504 -deser->ser len: 56 24 24 24 76 -ser+deser(ms) : 738 670 443 789 1861 +serialize time(ms) : 557 529 328 262 1357 +serialize len : 56 24 24 24 76 +deserialize time(ms): 181 141 115 527 504 +deserialize->serialize len: 56 24 24 24 76 +serialize+deserialize(ms) : 738 670 443 789 1861 Pojo: Protostuff ScbStrong ScbWeak Protobuf Jackson -ser time(ms) : 571 574 276 309 1304 -ser len : 46 10 10 10 66 -deser time(ms): 230 69 112 668 537 -deser->ser len: 46 10 10 10 66 -ser+deser(ms) : 801 643 388 977 1841 +serialize time(ms) : 571 574 276 309 1304 +serialize len : 46 10 10 10 66 +deserialize time(ms): 230 69 112 668 537 +deserialize->serialize len: 46 10 10 10 66 +serialize+deserialize(ms) : 801 643 388 977 1841 SimpleList: Protostuff ScbStrong ScbWeak Protobuf Jackson -ser time(ms) : 590 609 296 637 1320 -ser len : 68 32 32 32 88 -deser time(ms): 233 105 122 2226 541 -deser->ser len: 68 32 32 32 88 -ser+deser(ms) : 823 714 418 2863 1861 +serialize time(ms) : 590 609 296 637 1320 +serialize len : 68 32 32 32 88 +deserialize time(ms): 233 105 122 2226 541 +deserialize->serialize len: 68 32 32 32 88 +serialize+deserialize(ms) : 823 714 418 2863 1861 PojoList: Protostuff ScbStrong ScbWeak Protobuf Jackson -ser time(ms) : 609 632 319 2777 1407 -ser len : 56 20 20 20 76 -deser time(ms): 244 134 173 2287 679 -deser->ser len: 56 20 20 20 76 -ser+deser(ms) : 853 766 492 5064 2086 +serialize time(ms) : 609 632 319 2777 1407 +serialize len : 56 20 20 20 76 +deserialize time(ms): 244 134 173 2287 679 +deserialize->serialize len: 56 20 20 20 76 +serialize+deserialize(ms) : 853 766 492 5064 2086 Map: Protostuff ScbStrong ScbWeak Protobuf Jackson -ser time(ms) : 746 772 491 1079 1298 -ser len : 92 54 54 54 56 -deser time(ms): 522 427 468 1031 422 -deser->ser len: 92 54 54 54 56 -ser+deser(ms) : 1268 1199 959 2110 1720 +serialize time(ms) : 746 772 491 1079 1298 +serialize len : 92 54 54 54 56 +deserialize time(ms): 522 427 468 1031 422 +deserialize->serialize len: 92 54 54 54 56 +serialize+deserialize(ms) : 1268 1199 959 2110 1720 Mixed: Protostuff ScbStrong ScbWeak Protobuf Jackson -ser time(ms) : 1686 1999 2034 2112 2537 -ser len : 479 505 505 505 489 -deser time(ms): 1969 2154 2923 2984 3316 -deser->ser len: 479 505 505 505 489 -ser+deser(ms) : 3655 4153 4957 5096 5853 +serialize time(ms) : 1686 1999 2034 2112 2537 +serialize len : 479 505 505 505 489 +deserialize time(ms): 1969 2154 2923 2984 3316 +deserialize->serialize len: 479 505 505 505 489 +serialize+deserialize(ms) : 3655 4153 4957 5096 5853 ``` diff --git a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java index 3a1aad2640f..89bf2b43282 100644 --- a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java +++ b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java @@ -26,7 +26,7 @@ public class ContentFileReader implements FileReader { private final String content; - private boolean contentReaded; + private boolean contentRead; public ContentFileReader(FileReader importReader, String content) { this.importReader = importReader; @@ -35,8 +35,8 @@ public ContentFileReader(FileReader importReader, String content) { @Override public CharStream read(String contentOrName) { - if (!contentReaded) { - contentReaded = true; + if (!contentRead) { + contentRead = true; return CharStreams.fromString(this.content); } diff --git a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestBoolSchema.java b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestBoolSchema.java index 461900db5bf..5862c723bfc 100644 --- a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestBoolSchema.java +++ b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/internal/schema/scalar/TestBoolSchema.java @@ -36,7 +36,7 @@ public void testTrue() throws Throwable { // equalsIgnoreCase doTestFromString("true"); - doTestFromString("trUe"); + doTestFromString("true"); } @Test diff --git a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestBase.java b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestBase.java index c8c810c6505..c73caf9a327 100644 --- a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestBase.java +++ b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestBase.java @@ -79,25 +79,25 @@ private TestEngineResult runOneEngine(ProtubufCodecEngine engine, Object model, { long msStart = System.currentTimeMillis(); for (int idx = 0; idx < count; idx++) { - engineResult.serBytes = engine.serialize(model); + engineResult.serializeBytes = engine.serialize(model); } long msEnd = System.currentTimeMillis(); - engineResult.msSerTime = msEnd - msStart; + engineResult.msSerializeTime = msEnd - msStart; } // deserialize { long msStart = System.currentTimeMillis(); for (int idx = 0; idx < count; idx++) { - engineResult.deserResult = engine.deserialize(engineResult.serBytes); + engineResult.deserializeResult = engine.deserialize(engineResult.serializeBytes); } long msEnd = System.currentTimeMillis(); - engineResult.msDeserTime = msEnd - msStart; + engineResult.msDeserializeTime = msEnd - msStart; } - engineResult.deserResultBytes = engine.serialize(engineResult.deserResult); + engineResult.deserializeResultBytes = engine.serialize(engineResult.deserializeResult); return engineResult; } } diff --git a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestEngineResult.java b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestEngineResult.java index ffa08506df7..f02ee12092a 100644 --- a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestEngineResult.java +++ b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestEngineResult.java @@ -20,14 +20,14 @@ public class TestEngineResult { public String engineName; // serialize - public long msSerTime; + public long msSerializeTime; - public byte[] serBytes; + public byte[] serializeBytes; // deserialize - public long msDeserTime; + public long msDeserializeTime; - public Object deserResult; + public Object deserializeResult; - public byte[] deserResultBytes; + public byte[] deserializeResultBytes; } diff --git a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestProtoPerformance.java b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestProtoPerformance.java index eea36041283..98e2f5b7855 100644 --- a/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestProtoPerformance.java +++ b/foundations/foundation-protobuf/src/test/java/org/apache/servicecomb/foundation/protobuf/performance/TestProtoPerformance.java @@ -65,17 +65,17 @@ private static void printResult(TestResult result) { System.out.printf(" " + strFmt + "\n", result.engineResults.stream().map(r -> r.engineName).toArray()); - System.out.printf("ser time(ms) : " + numberFmt + "\n", - result.engineResults.stream().map(r -> r.msSerTime).toArray()); - System.out.printf("ser len : " + numberFmt + "\n", - result.engineResults.stream().map(r -> r.serBytes.length).toArray()); + System.out.printf("serialize time(ms) : " + numberFmt + "\n", + result.engineResults.stream().map(r -> r.msSerializeTime).toArray()); + System.out.printf("serialize len : " + numberFmt + "\n", + result.engineResults.stream().map(r -> r.serializeBytes.length).toArray()); - System.out.printf("deser time(ms): " + numberFmt + "\n", - result.engineResults.stream().map(r -> r.msDeserTime).toArray()); - System.out.printf("deser->ser len: " + numberFmt + "\n", - result.engineResults.stream().map(r -> r.deserResultBytes.length).toArray()); + System.out.printf("deserialize time(ms): " + numberFmt + "\n", + result.engineResults.stream().map(r -> r.msDeserializeTime).toArray()); + System.out.printf("deserialize->serialize len: " + numberFmt + "\n", + result.engineResults.stream().map(r -> r.deserializeResultBytes.length).toArray()); - System.out.printf("ser+deser(ms) : " + numberFmt + "\n\n", - result.engineResults.stream().map(r -> r.msSerTime + r.msDeserTime).toArray()); + System.out.printf("serialize+deserialize(ms) : " + numberFmt + "\n\n", + result.engineResults.stream().map(r -> r.msSerializeTime + r.msDeserializeTime).toArray()); } } diff --git a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TestSSLOptionFactory.java b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TestSSLOptionFactory.java index ca65b057e94..1d3b1b8b229 100644 --- a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TestSSLOptionFactory.java +++ b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/TestSSLOptionFactory.java @@ -51,7 +51,7 @@ public void testSSLOptionFactoryWrong(@Mocked SSLOption option) { } @Test - public void testSSLOptionFactoryCorrent() { + public void testSSLOptionFactoryCurrent() { new MockUp() { @Mock public String getStringProperty(Environment environment, String defaultValue, diff --git a/pom.xml b/pom.xml index f30bbabd117..5cb03fdcdd4 100644 --- a/pom.xml +++ b/pom.xml @@ -243,7 +243,7 @@ **/etc/eclipse-java-google-style.xml **/etc/intellij-java-google-style.xml - **/resources/ssl/** + **/resources/ssl/** **/src/release/licenses/** From 45faa8a31b22a31d65fc995c653ca7247362ea38 Mon Sep 17 00:00:00 2001 From: SweetWuXiaoMei Date: Fri, 29 Nov 2024 17:45:25 +0800 Subject: [PATCH 3/3] style(typos): Update spell check configuration file - Removed Chinese characters in .typos.toml file --- .typos.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.typos.toml b/.typos.toml index 884666a340d..e8b6eb33f39 100644 --- a/.typos.toml +++ b/.typos.toml @@ -25,7 +25,7 @@ [files] extend-exclude = [ - "**/cobertura.ser" # 排除该路径 + "**/cobertura.ser" ] [default] extend-ignore-words-re = [