refactor(invocation): Refactor response mapping factory method

foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/InputStreamToReadStream.java

@@ -97,16 +97,16 @@ public synchronized InputStreamToReadStream handler(Handler<Buffer> 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<ReadResult> ar) {
 
     readInProgress = false;
     ReadResult readResult = ar.result();
-    if (readResult.readed < 0) {
+    if (readResult.read < 0) {
       handleEnd();
       return;
     }

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

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<Class<?>, ContextArgumentMapperFactory> contextFactorys = SPIServiceUtils
+    Map<Class<?>, 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);

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<Class<?>, ContextArgumentMapperFactory> contextFactorys;
+  protected Map<Class<?>, ContextArgumentMapperFactory> contextFactories;
 
   // consumer or producer
   protected Method providerMethod;
@@ -117,10 +117,10 @@ public abstract class AbstractArgumentsMapperCreator {
   protected Set<String> processedSwaggerParameters;
 
   public AbstractArgumentsMapperCreator(SerializationConfig serializationConfig,
-      Map<Class<?>, ContextArgumentMapperFactory> contextFactorys, Class<?> providerClass,
+      Map<Class<?>, 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;
     }

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<Class<?>, ContextArgumentMapperFactory> contextFactorys, Class<?> consumerClass,
+      Map<Class<?>, ContextArgumentMapperFactory> contextFactories, Class<?> consumerClass,
       Method consumerMethod, SwaggerOperation swaggerOperation) {
-    super(serializationConfig, contextFactorys, consumerClass, consumerMethod, swaggerOperation);
+    super(serializationConfig, contextFactories, consumerClass, consumerMethod, swaggerOperation);
   }
 
   private boolean isAllSameMapper() {

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<String, Type> swaggerParameterTypes;
 
   public ProducerArgumentsMapperCreator(SerializationConfig serializationConfig,
-      Map<Class<?>, ContextArgumentMapperFactory> contextFactorys, Class<?> producerClass,
+      Map<Class<?>, ContextArgumentMapperFactory> contextFactories, Class<?> producerClass,
       Method producerMethod, SwaggerOperation swaggerOperation) {
-    super(serializationConfig, contextFactorys, producerClass, producerMethod, swaggerOperation);
+    super(serializationConfig, contextFactories, producerClass, producerMethod, swaggerOperation);
 
     swaggerParameterTypes = new HashMap<>();
   }

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<MAPPER> factorys, Type providerType);
+  MAPPER createResponseMapper(ResponseMapperFactories<MAPPER> factories, Type providerType);
 }

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<ConsumerResponseMapper> factorys,
+  public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factories,
       Type consumerType) {
     Type realConsumerType = ((ParameterizedType) consumerType).getActualTypeArguments()[0];
-    return factorys.createResponseMapper(realConsumerType);
+    return factories.createResponseMapper(realConsumerType);
   }
 }

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<ConsumerResponseMapper> factorys,
+  public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factories,
       Type consumerType) {
     return SAME;
   }

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<ConsumerResponseMapper> factorys,
+  public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factories,
       Type consumerType) {
     return new DefaultConsumerResponseMapper();
   }

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<ConsumerResponseMapper> factorys,
+  public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factories,
       Type consumerType) {
     Type realConsumerType = ((ParameterizedType) consumerType).getActualTypeArguments()[0];
-    ConsumerResponseMapper realMapper = factorys.createResponseMapper(realConsumerType);
+    ConsumerResponseMapper realMapper = factories.createResponseMapper(realConsumerType);
     return new OptionalConsumerResponseMapper(realMapper);
   }
 }

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<ProducerResponseMapper> factorys,
+  public ProducerResponseMapper createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factories,
       Type producerType) {
     Type realProducerType = ((ParameterizedType) producerType).getActualTypeArguments()[0];
-    return factorys.createResponseMapper(realProducerType);
+    return factories.createResponseMapper(realProducerType);
   }
 }

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<ProducerResponseMapper> factorys,
+  public ProducerResponseMapper createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factories,
       Type producerType) {
     return SAME;
   }

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<ProducerResponseMapper> factorys,
+  public ProducerResponseMapper createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factories,
       Type producerType) {
     return new DefaultProducerResponseMapper();
   }

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<ProducerResponseMapper> factorys,
+  public ProducerResponseMapper createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factories,
       Type producerType) {
     Type realProducerType = ((ParameterizedType) producerType).getActualTypeArguments()[0];
-    ProducerResponseMapper realMapper = factorys.createResponseMapper(realProducerType);
+    ProducerResponseMapper realMapper = factories.createResponseMapper(realProducerType);
     return new OptionalProducerResponseMapper(realMapper);
   }
 }

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<ConsumerResponseMapper> factorys,
+  public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factories,
       Type consumerType) {
     return new JaxrsConsumerResponseMapper();
   }

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<ProducerResponseMapper> factorys,
+  public ProducerResponseMapper createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factories,
       Type producerType) {
     return new JaxrsProducerResponseMapper();
   }

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<ConsumerResponseMapper> factorys,
+  public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factories,
       Type consumerType) {
     Type realConsumerType = ((ParameterizedType) consumerType).getActualTypeArguments()[0];
-    ConsumerResponseMapper realMapper = factorys.createResponseMapper(realConsumerType);
+    ConsumerResponseMapper realMapper = factories.createResponseMapper(realConsumerType);
     return new SpringmvcConsumerResponseMapper(realMapper);
   }
 }

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<ProducerResponseMapper> factorys,
+  public ProducerResponseMapper createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factories,
       Type producerType) {
     Type realProducerType = ((ParameterizedType) producerType).getActualTypeArguments()[0];
-    ProducerResponseMapper realMapper = factorys.createResponseMapper(realProducerType);
+    ProducerResponseMapper realMapper = factories.createResponseMapper(realProducerType);
     return new SpringmvcProducerResponseMapper(realMapper);
   }
 }

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<String[]> responseEntity =
         new ResponseEntity<>(arrResult, org.springframework.http.HttpStatus.OK);
     Response response = mapper.mapResponse(null, responseEntity);

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<ProducerResponseMapper> factorys = new ResponseMapperFactories<>(
+  ResponseMapperFactories<ProducerResponseMapper> factories = new ResponseMapperFactories<>(
       ProducerResponseMapperFactory.class);
 
   public ResponseEntity<String[]> 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<String[]> responseEntity = new ResponseEntity<>(new String[] {"a", "b"}, HttpStatus.OK);