Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ public int reduce(int a, int b) {
return a - b;
}

public int add(String a, String b) {
return Integer.valueOf(a) + Integer.valueOf(b);
}

@Override
public Page<String> interfaceModel(Page<String> model) {
return model;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,14 @@ public void mergeFrom(InputEx input, T message) throws IOException {
n = input.readFieldNumber();
}
} catch (Throwable e) {
Field protoField = fieldSchema.getProtoField();
LOGGER.error("Failed to mergeFrom, field={}:{}, type={}",
protoField.getType().getCanonicalName(),
protoField.getName(),
protoField.getTypeName(),
e.getMessage());
if (fieldSchema != null) {
Field protoField = fieldSchema.getProtoField();
LOGGER.error("Failed to mergeFrom, field={}:{}, type={}",
protoField.getType().getCanonicalName(),
protoField.getName(),
protoField.getTypeName(),
e.getMessage());
}
throw e;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ public SwaggerProducer createProducer(Object producerInstance, Swagger swagger)
}

public SwaggerProducer createProducer(Object producerInstance, Class<?> schemaInterface, Swagger swagger) {
swagger = checkAndGenerateSwagger(producerInstance, schemaInterface, swagger);
Class<?> producerCls = targetSwaggerClass(producerInstance, schemaInterface);

swagger = checkAndGenerateSwagger(producerCls, swagger);

Map<Class<?>, ContextArgumentMapperFactory> contextFactories = SPIServiceUtils
.getOrLoadSortedService(ProducerContextArgumentMapperFactory.class)
Expand All @@ -115,7 +117,6 @@ public SwaggerProducer createProducer(Object producerInstance, Class<?> schemaIn

SwaggerOperations swaggerOperations = new SwaggerOperations(swagger);

Class<?> producerCls = BeanUtils.getImplClassFromBean(producerInstance);
Map<String, Method> visibleProducerMethods = MethodUtils.findSwaggerMethodsMapOfOperationId(producerCls);

SwaggerProducer producer = new SwaggerProducer();
Expand Down Expand Up @@ -159,15 +160,17 @@ public SwaggerProducer createProducer(Object producerInstance, Class<?> schemaIn
return producer;
}

private Swagger checkAndGenerateSwagger(Object producerInstance, Class<?> schemaInterface, Swagger swagger) {
private Swagger checkAndGenerateSwagger(Class<?> swaggerClass, Swagger swagger) {
if (swagger == null) {
if (schemaInterface != null && !Object.class.equals(schemaInterface)) {
swagger = SwaggerGenerator.generate(schemaInterface);
} else {
Class<?> producerCls = BeanUtils.getImplClassFromBean(producerInstance);
swagger = SwaggerGenerator.generate(producerCls);
}
swagger = SwaggerGenerator.generate(swaggerClass);
}
return swagger;
}

private Class<?> targetSwaggerClass(Object producerInstance, Class<?> schemaInterface) {
if (schemaInterface != null && !Object.class.equals(schemaInterface)) {
return schemaInterface;
}
return BeanUtils.getImplClassFromBean(producerInstance);
}
}