提交 cd424698 编写于 作者: C chenjianxing

fix(接口测试): swagger 导入报错

上级 7b0045d1
...@@ -159,32 +159,34 @@ public class Swagger2Parser extends ApiImportAbstractParser { ...@@ -159,32 +159,34 @@ public class Swagger2Parser extends ApiImportAbstractParser {
private JSONObject getBodyJSONObjectParameters(Map<String, Property> properties, Map<String, Model> definitions, HashSet<String> refSet) { private JSONObject getBodyJSONObjectParameters(Map<String, Property> properties, Map<String, Model> definitions, HashSet<String> refSet) {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
properties.forEach((key, value) -> { if (properties != null) {
if (value instanceof ObjectProperty) { properties.forEach((key, value) -> {
ObjectProperty objectProperty = (ObjectProperty) value; if (value instanceof ObjectProperty) {
jsonObject.put(key, getBodyJSONObjectParameters(objectProperty.getProperties(), definitions, refSet)); ObjectProperty objectProperty = (ObjectProperty) value;
} else if (value instanceof ArrayProperty) { jsonObject.put(key, getBodyJSONObjectParameters(objectProperty.getProperties(), definitions, refSet));
ArrayProperty arrayProperty = (ArrayProperty) value; } else if (value instanceof ArrayProperty) {
Property items = arrayProperty.getItems(); ArrayProperty arrayProperty = (ArrayProperty) value;
if (items instanceof RefProperty) { Property items = arrayProperty.getItems();
RefProperty refProperty = (RefProperty) items; if (items instanceof RefProperty) {
String simpleRef = refProperty.getSimpleRef(); RefProperty refProperty = (RefProperty) items;
if (refSet.contains(simpleRef)) { String simpleRef = refProperty.getSimpleRef();
jsonObject.put(key, new JSONArray()); if (refSet.contains(simpleRef)) {
return; jsonObject.put(key, new JSONArray());
return;
}
refSet.add(simpleRef);
Model model = definitions.get(simpleRef);
JSONArray propertyList = new JSONArray();
propertyList.add(getBodyJSONObjectParameters(model.getProperties(), definitions, refSet));
jsonObject.put(key, propertyList);
} else {
jsonObject.put(key, new ArrayList<>());
} }
refSet.add(simpleRef);
Model model = definitions.get(simpleRef);
JSONArray propertyList = new JSONArray();
propertyList.add(getBodyJSONObjectParameters(model.getProperties(), definitions, refSet));
jsonObject.put(key, propertyList);
} else { } else {
jsonObject.put(key, new ArrayList<>()); jsonObject.put(key, Optional.ofNullable(value.getDescription()).orElse(""));
} }
} else { });
jsonObject.put(key, Optional.ofNullable(value.getDescription()).orElse("")); }
}
});
return jsonObject; return jsonObject;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册