Skip to content

Fix for issue 664 #747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 20, 2018
Merged

Fix for issue 664 #747

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 36 additions & 8 deletions modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/ResolverFully.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
import io.swagger.v3.oas.models.media.ObjectSchema;
import io.swagger.v3.oas.models.media.Schema;
import io.swagger.v3.oas.models.parameters.Parameter;
import io.swagger.v3.oas.models.parameters.RequestBody;
import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.parser.models.RefFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -25,6 +27,10 @@
import java.util.Set;
import java.util.stream.Collectors;

import static io.swagger.v3.parser.util.RefUtils.computeDefinitionName;
import static io.swagger.v3.parser.util.RefUtils.computeRefFormat;
import static io.swagger.v3.parser.util.RefUtils.isAnExternalRefFormat;

public class ResolverFully {
private static final Logger LOGGER = LoggerFactory.getLogger(ResolverFully.class);

Expand All @@ -41,10 +47,17 @@ public ResolverFully(boolean aggregateCombinators) {
private Map<String, Schema> schemas;
private Map<String, Schema> resolvedModels = new HashMap<>();
private Map<String, Example> examples;

private Map<String, RequestBody> requestBodies;


public void resolveFully(OpenAPI openAPI) {
if (openAPI.getComponents() != null && openAPI.getComponents().getRequestBodies() != null) {
requestBodies = openAPI.getComponents().getRequestBodies();
if (requestBodies == null) {
requestBodies = new HashMap<>();
}
}

if (openAPI.getComponents() != null && openAPI.getComponents().getSchemas() != null) {
schemas = openAPI.getComponents().getSchemas();
if (schemas == null) {
Expand Down Expand Up @@ -108,13 +121,17 @@ public void resolvePath(PathItem pathItem){
}
}

if (op.getRequestBody() != null && op.getRequestBody().getContent() != null){
Map<String,MediaType> content = op.getRequestBody().getContent();
for (String key: content.keySet()){
if (content.get(key) != null && content.get(key).getSchema() != null ){
Schema resolved = resolveSchema(content.get(key).getSchema());
if (resolved != null) {
content.get(key).setSchema(resolved);
RequestBody refRequestBody = op.getRequestBody();
if (refRequestBody != null){
RequestBody requestBody = refRequestBody.get$ref() != null ? resolveRequestBody(refRequestBody) : refRequestBody;
if (requestBody.getContent() != null) {
Map<String, MediaType> content = requestBody.getContent();
for (String key : content.keySet()) {
if (content.get(key) != null && content.get(key).getSchema() != null) {
Schema resolved = resolveSchema(content.get(key).getSchema());
if (resolved != null) {
content.get(key).setSchema(resolved);
}
}
}
}
Expand Down Expand Up @@ -142,6 +159,17 @@ public void resolvePath(PathItem pathItem){
}
}

public RequestBody resolveRequestBody(RequestBody requestBody){
RefFormat refFormat = computeRefFormat(requestBody.get$ref());
String $ref = requestBody.get$ref();
if (!isAnExternalRefFormat(refFormat)){
if (requestBodies != null && !requestBodies.isEmpty()) {
String referenceKey = computeDefinitionName($ref);
return requestBodies.getOrDefault(referenceKey, requestBody);
}
}
return requestBody;
}

public Schema resolveSchema(Schema schema) {
if(schema.get$ref() != null) {
Expand Down