test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(接口测试): 优化swagger文件的query参数中$ref的解析 

--story=1011415 --user=王孝刚 【Bug转需求】【接口定义】swagger 文件中中 query 参数 ref 未解析
1.20 同步提 https://www.tapd.cn/55049933/s/1359898
This commit is contained in:
wxg0103 2023-04-06 18:36:18 +08:00 committed by 刘瑞斌
parent fca4b9f8a3
commit f3000746d2
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
api-test/backend/src/main/java/io/metersphere/api/parse/api/Swagger3Parser.java
View File

@ -527,9 +527,15 @@ public class Swagger3Parser extends SwaggerAbstractParser {
} else if (schema instanceof ArraySchema) {
Schema items = ((ArraySchema) schema).getItems();
item.setType(PropertyConstant.ARRAY);
item.setItems(new ArrayList<>());
JsonSchemaItem arrayItem = parseSchema(items, refSet);
if (arrayItem != null) item.getItems().add(arrayItem);
Map<String, String> mock = new LinkedHashMap<>();
if (arrayItem != null) {
arrayItem.getProperties().forEach((k, v) -> {
mock.put(k, StringUtils.isBlank(v.getMock().get(PropertyConstant.MOCK).toString()) ? v.getType() :
v.getMock().get(PropertyConstant.MOCK).toString());
});
}
item.getMock().put(PropertyConstant.MOCK, JSONUtil.toJSONString(mock));
} else if (schema instanceof ObjectSchema) {
item.setType(PropertyConstant.OBJECT);
item.setProperties(parseSchemaProperties(schema, refSet));
@ -546,6 +552,8 @@ public class Swagger3Parser extends SwaggerAbstractParser {
}
if (schema.getExample() != null) {
item.getMock().put(PropertyConstant.MOCK, schema.getExample());
} else if (StringUtils.isNotBlank(item.getMock().get(PropertyConstant.MOCK).toString())){
item.getMock().put(PropertyConstant.MOCK, item.getMock().get(PropertyConstant.MOCK));
} else {
item.getMock().put(PropertyConstant.MOCK, StringUtils.EMPTY);
}
@ -611,7 +619,17 @@ public class Swagger3Parser extends SwaggerAbstractParser {
Schema schema = getSchema(parameter.getSchema());
Set<String> refSet = new HashSet<>();
JsonSchemaItem jsonSchemaItem = parseSchema(schema, refSet);
arguments.add(new KeyValue(queryParameter.getName(), getDefaultValue(queryParameter, jsonSchemaItem), getDefaultStringValue(queryParameter.getDescription()), parameter.getRequired(), getMin(jsonSchemaItem), getMax(jsonSchemaItem)));
if (MapUtils.isEmpty(jsonSchemaItem.getProperties())) {
arguments.add(new KeyValue(queryParameter.getName(), getDefaultValue(queryParameter, jsonSchemaItem), getDefaultStringValue(queryParameter.getDescription()), parameter.getRequired(), getMin(jsonSchemaItem), getMax(jsonSchemaItem)));
} else {
Map<String, JsonSchemaItem> properties = jsonSchemaItem.getProperties();
properties.forEach((key, value) -> {
arguments.add(new KeyValue(key, getDefaultValue(queryParameter, value),
getDefaultStringValue(value.getDescription()),
parameter.getRequired(),
getMin(value), getMax(value)));
});
}
}
private Schema getSchema(Schema schema) {
@ -644,6 +662,9 @@ public class Swagger3Parser extends SwaggerAbstractParser {
if (queryParameter.getExample() != null) {
return String.valueOf(queryParameter.getExample());
} else {
if (MapUtils.isNotEmpty(jsonSchemaItem.getMock())) {
return String.valueOf(jsonSchemaItem.getMock().get(PropertyConstant.MOCK));
}
if (jsonSchemaItem != null && jsonSchemaItem.getDefaultValue() != null) {
return String.valueOf(jsonSchemaItem.getDefaultValue());
}