Skip to content

Commit 4ae1f3e

Browse files
refactor(invocation): Refactor response mapping factory method (#4607)
1 parent ea07bbb commit 4ae1f3e

File tree

21 files changed

+37
-37
lines changed

21 files changed

+37
-37
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,16 @@ public synchronized InputStreamToReadStream handler(Handler<Buffer> handler) {
9797
}
9898

9999
class ReadResult {
100-
int readed;
100+
int read;
101101

102102
byte[] bytes = new byte[readBufferSize];
103103

104104
void doRead() throws IOException {
105-
readed = inputStream.read(bytes);
105+
read = inputStream.read(bytes);
106106
}
107107

108108
Buffer toBuffer() {
109-
return Buffer.buffer(Unpooled.wrappedBuffer(bytes).writerIndex(readed));
109+
return Buffer.buffer(Unpooled.wrappedBuffer(bytes).writerIndex(read));
110110
}
111111
}
112112

@@ -143,7 +143,7 @@ private synchronized void afterReadInEventloop(AsyncResult<ReadResult> ar) {
143143

144144
readInProgress = false;
145145
ReadResult readResult = ar.result();
146-
if (readResult.readed < 0) {
146+
if (readResult.read < 0) {
147147
handleEnd();
148148
return;
149149
}

handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/strategy/FixedWindowStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public boolean isLimitNewRequest() {
5252
msCycleBegin = msNow;
5353
}
5454

55-
// Configuration update and use is at the situation of multi-threaded concurrency
55+
// Configuration update and use is at the situation of multi-thread concurrency
5656
// It is possible that operation level updated to null,but schema level or microservice level does not updated
5757
boolean isLimitRequest = newCount - lastRequestCount >= this.getQpsLimit();
5858
if (isLimitRequest){

swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class SwaggerEnvironment {
5454
public SwaggerConsumer createConsumer(Class<?> consumerIntf, OpenAPI swagger) {
5555
swagger = checkAndGenerateSwagger(consumerIntf, swagger);
5656

57-
Map<Class<?>, ContextArgumentMapperFactory> contextFactorys = SPIServiceUtils
57+
Map<Class<?>, ContextArgumentMapperFactory> contextFactories = SPIServiceUtils
5858
.getOrLoadSortedService(ConsumerContextArgumentMapperFactory.class)
5959
.stream()
6060
.collect(Collectors.toMap(ConsumerContextArgumentMapperFactory::getContextClass, Function.identity()));
@@ -79,7 +79,7 @@ public SwaggerConsumer createConsumer(Class<?> consumerIntf, OpenAPI swagger) {
7979

8080
ConsumerArgumentsMapperCreator creator = new ConsumerArgumentsMapperCreator(
8181
Json.mapper().getSerializationConfig(),
82-
contextFactorys,
82+
contextFactories,
8383
consumerIntf,
8484
consumerMethod,
8585
swaggerOperation);

swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/AbstractArgumentsMapperCreator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public abstract class AbstractArgumentsMapperCreator {
9696
protected SerializationConfig serializationConfig;
9797

9898
// key is context class
99-
protected Map<Class<?>, ContextArgumentMapperFactory> contextFactorys;
99+
protected Map<Class<?>, ContextArgumentMapperFactory> contextFactories;
100100

101101
// consumer or producer
102102
protected Method providerMethod;
@@ -117,10 +117,10 @@ public abstract class AbstractArgumentsMapperCreator {
117117
protected Set<String> processedSwaggerParameters;
118118

119119
public AbstractArgumentsMapperCreator(SerializationConfig serializationConfig,
120-
Map<Class<?>, ContextArgumentMapperFactory> contextFactorys, Class<?> providerClass,
120+
Map<Class<?>, ContextArgumentMapperFactory> contextFactories, Class<?> providerClass,
121121
Method providerMethod, SwaggerOperation swaggerOperation) {
122122
this.serializationConfig = serializationConfig;
123-
this.contextFactorys = contextFactorys;
123+
this.contextFactories = contextFactories;
124124
this.providerClass = providerClass;
125125
this.providerMethod = providerMethod;
126126
this.swaggerOperation = swaggerOperation;
@@ -198,7 +198,7 @@ protected void doCreateArgumentsMapper() {
198198
* @return true means processed
199199
*/
200200
protected boolean processContextParameter(java.lang.reflect.Parameter providerParameter) {
201-
ContextArgumentMapperFactory contextFactory = contextFactorys.get(providerParameter.getType());
201+
ContextArgumentMapperFactory contextFactory = contextFactories.get(providerParameter.getType());
202202
if (contextFactory == null) {
203203
return false;
204204
}

swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/consumer/ConsumerArgumentsMapperCreator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public class ConsumerArgumentsMapperCreator extends AbstractArgumentsMapperCreat
4747
private int unknownConsumerParams = 0;
4848

4949
public ConsumerArgumentsMapperCreator(SerializationConfig serializationConfig,
50-
Map<Class<?>, ContextArgumentMapperFactory> contextFactorys, Class<?> consumerClass,
50+
Map<Class<?>, ContextArgumentMapperFactory> contextFactories, Class<?> consumerClass,
5151
Method consumerMethod, SwaggerOperation swaggerOperation) {
52-
super(serializationConfig, contextFactorys, consumerClass, consumerMethod, swaggerOperation);
52+
super(serializationConfig, contextFactories, consumerClass, consumerMethod, swaggerOperation);
5353
}
5454

5555
private boolean isAllSameMapper() {

swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/arguments/producer/ProducerArgumentsMapperCreator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public class ProducerArgumentsMapperCreator extends AbstractArgumentsMapperCreat
4949
private final Map<String, Type> swaggerParameterTypes;
5050

5151
public ProducerArgumentsMapperCreator(SerializationConfig serializationConfig,
52-
Map<Class<?>, ContextArgumentMapperFactory> contextFactorys, Class<?> producerClass,
52+
Map<Class<?>, ContextArgumentMapperFactory> contextFactories, Class<?> producerClass,
5353
Method producerMethod, SwaggerOperation swaggerOperation) {
54-
super(serializationConfig, contextFactorys, producerClass, producerMethod, swaggerOperation);
54+
super(serializationConfig, contextFactories, producerClass, producerMethod, swaggerOperation);
5555

5656
swaggerParameterTypes = new HashMap<>();
5757
}

swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ default int getOrder() {
2525

2626
boolean isMatch(Type providerType);
2727

28-
MAPPER createResponseMapper(ResponseMapperFactories<MAPPER> factorys, Type providerType);
28+
MAPPER createResponseMapper(ResponseMapperFactories<MAPPER> factories, Type providerType);
2929
}

swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CompletableFutureConsumerResponseMapperFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ public boolean isMatch(Type consumerType) {
3333
}
3434

3535
@Override
36-
public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factorys,
36+
public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factories,
3737
Type consumerType) {
3838
Type realConsumerType = ((ParameterizedType) consumerType).getActualTypeArguments()[0];
39-
return factorys.createResponseMapper(realConsumerType);
39+
return factories.createResponseMapper(realConsumerType);
4040
}
4141
}

swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CseResponseConsumerResponseMapperFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public boolean isMatch(Type consumerType) {
3030
}
3131

3232
@Override
33-
public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factorys,
33+
public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factories,
3434
Type consumerType) {
3535
return SAME;
3636
}

swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/DefaultConsumerResponseMapperFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public boolean isMatch(Type consumerType) {
3232
}
3333

3434
@Override
35-
public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factorys,
35+
public ConsumerResponseMapper createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factories,
3636
Type consumerType) {
3737
return new DefaultConsumerResponseMapper();
3838
}

0 commit comments

Comments
 (0)