Commit eb27ae45 authored by xie.qin's avatar xie.qin

Bug fixed for supporting more sanity tests.

parent d88f2d46
...@@ -343,10 +343,10 @@ public class OpenApiParser { ...@@ -343,10 +343,10 @@ public class OpenApiParser {
} }
else if (eachRespNodeSchemaValue.has("type") && eachRespNodeSchemaValue.get("type").asText().equalsIgnoreCase("object") && eachRespNodeSchemaValue.has("additionalProperties")) { else if (eachRespNodeSchemaValue.has("type") && eachRespNodeSchemaValue.get("type").asText().equalsIgnoreCase("object") && eachRespNodeSchemaValue.has("additionalProperties")) {
if (eachRespNodeSchemaValue.get("additionalProperties").has("format")){ if (eachRespNodeSchemaValue.get("additionalProperties").has("format")){
respJsonBody.put("type", "array.object." + eachRespNodeSchemaValue.get("additionalProperties").get("format").asText().toLowerCase()); respJsonBody.put("type", "object." + eachRespNodeSchemaValue.get("additionalProperties").get("format").asText().toLowerCase());
} }
else { else {
respJsonBody.put("type", "array.object." + eachRespNodeSchemaValue.get("type").asText().toLowerCase()); respJsonBody.put("type", "object." + eachRespNodeSchemaValue.get("type").asText().toLowerCase());
} }
} }
else{ else{
...@@ -589,7 +589,8 @@ public class OpenApiParser { ...@@ -589,7 +589,8 @@ public class OpenApiParser {
if (refField.equals(refKey)){ if (refField.equals(refKey)){
Map<String, String> tmpObj = new HashMap<>(); Map<String, String> tmpObj = new HashMap<>();
reqJsonBody.put(property.getKey(), tmpObj); reqJsonBody.put(property.getKey(), tmpObj);
return reqJsonBody; //return reqJsonBody;
break;
} }
if (definitionNode.has(refField) && definitionNode.get(refField).has("properties")){ if (definitionNode.has(refField) && definitionNode.get(refField).has("properties")){
Map<String, Object> subReqJsonBody = translatePropertyToJsonBody(refField, definitionNode.get(refField).get("properties"), definitionNode); Map<String, Object> subReqJsonBody = translatePropertyToJsonBody(refField, definitionNode.get(refField).get("properties"), definitionNode);
...@@ -661,7 +662,8 @@ public class OpenApiParser { ...@@ -661,7 +662,8 @@ public class OpenApiParser {
if (refField.equals(refKey)){ if (refField.equals(refKey)){
List<String> tmpArr = new ArrayList<>(); List<String> tmpArr = new ArrayList<>();
reqJsonBody.put(property.getKey(), tmpArr); reqJsonBody.put(property.getKey(), tmpArr);
return reqJsonBody; //return reqJsonBody;
break;
} }
if (definitionNode.has(refField) && definitionNode.get(refField).has("properties")){ if (definitionNode.has(refField) && definitionNode.get(refField).has("properties")){
Map<String, Object> subReqJsonBody = translatePropertyToJsonBody(refField, definitionNode.get(refField).get("properties"), definitionNode); Map<String, Object> subReqJsonBody = translatePropertyToJsonBody(refField, definitionNode.get(refField).get("properties"), definitionNode);
...@@ -684,7 +686,8 @@ public class OpenApiParser { ...@@ -684,7 +686,8 @@ public class OpenApiParser {
if (refField.equals(refKey)){ if (refField.equals(refKey)){
List<String> tmpArr = new ArrayList<>(); List<String> tmpArr = new ArrayList<>();
reqJsonBody.put(property.getKey(), tmpArr); reqJsonBody.put(property.getKey(), tmpArr);
return reqJsonBody; //return reqJsonBody;
break;
} }
if (definitionNode.has(refField) && definitionNode.get(refField).has("properties")){ if (definitionNode.has(refField) && definitionNode.get(refField).has("properties")){
Map<String, Object> subReqJsonBody = translatePropertyToJsonBody(refField, definitionNode.get(refField).get("properties"), definitionNode); Map<String, Object> subReqJsonBody = translatePropertyToJsonBody(refField, definitionNode.get(refField).get("properties"), definitionNode);
...@@ -722,7 +725,8 @@ public class OpenApiParser { ...@@ -722,7 +725,8 @@ public class OpenApiParser {
String refField = property.getValue().get("additionalProperties").get("originalRef").asText(); String refField = property.getValue().get("additionalProperties").get("originalRef").asText();
if (refField.equals(refKey)){ if (refField.equals(refKey)){
respJsonBody.put(property.getKey(), "object"); respJsonBody.put(property.getKey(), "object");
return respJsonBody; //return respJsonBody;
break;
} }
if (definitionNode.has(refField) && definitionNode.get(refField).has("properties")){ if (definitionNode.has(refField) && definitionNode.get(refField).has("properties")){
Map<String, Object> objRespJsonBody = produceExpectedResponseBody(refField, definitionNode.get(refField), definitionNode); Map<String, Object> objRespJsonBody = produceExpectedResponseBody(refField, definitionNode.get(refField), definitionNode);
...@@ -759,7 +763,8 @@ public class OpenApiParser { ...@@ -759,7 +763,8 @@ public class OpenApiParser {
String refField = property.getValue().get("items").get("originalRef").asText(); String refField = property.getValue().get("items").get("originalRef").asText();
if (refField.equals(refKey)){ if (refField.equals(refKey)){
respJsonBody.put(property.getKey(), "array"); respJsonBody.put(property.getKey(), "array");
return respJsonBody; //return respJsonBody;
break;
} }
if (definitionNode.has(refField) && definitionNode.get(refField).has("properties")){ if (definitionNode.has(refField) && definitionNode.get(refField).has("properties")){
List<Map<String, Object>> tmpArrayObject = new ArrayList<>(); List<Map<String, Object>> tmpArrayObject = new ArrayList<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment