This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 4ae1f3e81 refactor(invocation): Refactor response mapping factory
method (#4607)
4ae1f3e81 is described below
commit 4ae1f3e818193c5ce8d3ac635da446a1732a6bbd
Author: SweetWuXiaoMei <[email protected]>
AuthorDate: Thu Nov 28 09:43:55 2024 +0800
refactor(invocation): Refactor response mapping factory method (#4607)
---
.../foundation/vertx/stream/InputStreamToReadStream.java | 8 ++++----
.../org/apache/servicecomb/qps/strategy/FixedWindowStrategy.java | 2 +-
.../org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java | 4 ++--
.../invocation/arguments/AbstractArgumentsMapperCreator.java | 8 ++++----
.../arguments/consumer/ConsumerArgumentsMapperCreator.java | 4 ++--
.../arguments/producer/ProducerArgumentsMapperCreator.java | 4 ++--
.../swagger/invocation/response/ResponseMapperFactory.java | 2 +-
.../consumer/CompletableFutureConsumerResponseMapperFactory.java | 4 ++--
.../consumer/CseResponseConsumerResponseMapperFactory.java | 2 +-
.../response/consumer/DefaultConsumerResponseMapperFactory.java | 2 +-
.../response/consumer/OptionalConsumerResponseMapperFactory.java | 4 ++--
.../producer/CompletableFutureProducerResponseMapperFactory.java | 4 ++--
.../producer/CseResponseProducerResponseMapperFactory.java | 2 +-
.../response/producer/DefaultProducerResponseMapperFactory.java | 2 +-
.../response/producer/OptionalProducerResponseMapperFactory.java | 4 ++--
.../jaxrs/response/JaxrsConsumerResponseMapperFactory.java | 2 +-
.../jaxrs/response/JaxrsProducerResponseMapperFactory.java | 2 +-
.../response/SpringmvcConsumerResponseMapperFactory.java | 4 ++--
.../response/SpringmvcProducerResponseMapperFactory.java | 4 ++--
.../springmvc/response/TestSpringmvcProducerResponseMapper.java | 2 +-
.../response/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 8ca0a6a4e..f1a5f83b2 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 class InputStreamToReadStream implements
ReadStream<Buffer> {
}
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 @@ public class InputStreamToReadStream implements
ReadStream<Buffer> {
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 65204c3a3..c95c1ab2c 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 class FixedWindowStrategy extends AbstractQpsStrategy {
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 a7851d791..655e7a2c6 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<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 class SwaggerEnvironment {
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 deb7ba5ba..28022c898 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<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 @@ public abstract class AbstractArgumentsMapperCreator {
* @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 e47a5e87e..84c7a6fa9 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<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() {
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 a58662ca0..9aea4bec3 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<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<>();
}
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 f88b7af13..917a3a835 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 @@ public interface ResponseMapperFactory<MAPPER> {
boolean isMatch(Type providerType);
- MAPPER createResponseMapper(ResponseMapperFactories<MAPPER> factorys, Type
providerType);
+ MAPPER createResponseMapper(ResponseMapperFactories<MAPPER> 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 4ba292e99..0a7d5a976 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 class CompletableFutureConsumerResponseMapperFactory
implements ConsumerR
}
@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);
}
}
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 af7fc67d0..76b90185d 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 class CseResponseConsumerResponseMapperFactory
implements ConsumerRespons
}
@Override
- public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factorys,
+ public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> 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 3d07da389..e60f05604 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 class DefaultConsumerResponseMapperFactory implements
ConsumerResponseMap
}
@Override
- public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factorys,
+ public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> 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 a6fb8bc2a..eddd30e40 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 class OptionalConsumerResponseMapperFactory
implements ConsumerResponseMa
}
@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);
}
}
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 4ac1be225..fc87f5728 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 class CompletableFutureProducerResponseMapperFactory
implements ProducerR
}
@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);
}
}
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 79d27c5fa..02f840cbb 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 class CseResponseProducerResponseMapperFactory
implements ProducerRespons
}
@Override
- public ProducerResponseMapper
createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factorys,
+ public ProducerResponseMapper
createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> 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 06418c15b..1b58d6cbb 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 class DefaultProducerResponseMapperFactory implements
ProducerResponseMap
}
@Override
- public ProducerResponseMapper
createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factorys,
+ public ProducerResponseMapper
createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> 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 06a793657..39d46b8b7 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 class OptionalProducerResponseMapperFactory
implements ProducerResponseMa
}
@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);
}
}
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 689cdcb25..307cdb26c 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 class JaxrsConsumerResponseMapperFactory implements
ConsumerResponseMappe
}
@Override
- public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factorys,
+ public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> 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 9ae523d35..a8e1e064f 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 class JaxrsProducerResponseMapperFactory implements
ProducerResponseMappe
}
@Override
- public ProducerResponseMapper
createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factorys,
+ public ProducerResponseMapper
createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> 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 89bd9a76e..0e22da391 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 class SpringmvcConsumerResponseMapperFactory
implements ConsumerResponseM
}
@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);
}
}
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 6f95ec287..cfb43f5c3 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 class SpringmvcProducerResponseMapperFactory
implements ProducerResponseM
}
@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);
}
}
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 cc029356a..c48fc62be 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 @@ public class TestSpringmvcProducerResponseMapper {
@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);
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 dddf4447d..35c84db14 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 @@ import org.springframework.http.ResponseEntity;
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 class TestSpringmvcProducerResponseMapperFactory {
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);