Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Fix callback request and response not being flattened to InlineObjects #3398

Merged
merged 3 commits into from
Aug 17, 2019
Merged

Fix callback request and response not being flattened to InlineObjects #3398

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bfd819
InlineResolver to flatten callback operations
lwlee2608 Jul 19, 2019
cf9c013
Merge remote-tracking branch 'origin/master'
lwlee2608 Jul 19, 2019
2dac28a
Merge remote-tracking branch 'upstream/master'
lwlee2608 Jul 19, 2019
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
15 changes: 15 additions & 0 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import io.swagger.v3.core.util.Json;
import io.swagger.v3.oas.models.*;
import io.swagger.v3.oas.models.callbacks.Callback;
import io.swagger.v3.oas.models.media.*;
import io.swagger.v3.oas.models.parameters.Parameter;
import io.swagger.v3.oas.models.parameters.RequestBody;
Expand All @@ -29,6 +30,7 @@
import org.slf4j.LoggerFactory;

import java.util.*;
import java.util.stream.Collectors;

public class InlineModelResolver {
private OpenAPI openapi;
Expand Down Expand Up @@ -64,7 +66,20 @@ private void flattenPaths(OpenAPI openAPI) {

for (String pathname : paths.keySet()) {
PathItem path = paths.get(pathname);
List<Operation> operations = new ArrayList<>(path.readOperations());

// Include callback operation as well
for (Operation operation : path.readOperations()) {
Map<String, Callback> callbacks = operation.getCallbacks();
if (callbacks != null) {
operations.addAll(callbacks.values().stream()
.flatMap(callback -> callback.values().stream())
.flatMap(pathItem -> pathItem.readOperations().stream())
.collect(Collectors.toList()));
}
}

for (Operation operation : operations) {
flattenRequestBody(openAPI, pathname, operation);
flattenParameters(openAPI, pathname, operation);
flattenResponses(openAPI, pathname, operation);
Expand Down