Skip to content

[openapi, openapi-yaml] - option not to flatten resolved spec, refactor #9817

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
frantuma merged 1 commit into from
Oct 30, 2019
Merged

[openapi, openapi-yaml] - option not to flatten resolved spec, refactor #9817

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,4 +233,8 @@ public interface CodegenConfig {
List<CodegenArgument> getLanguageArguments();

void setLanguageArguments(List<CodegenArgument> codegenArguments);

boolean needsUnflattenedSpec();

void setUnflattenedOpenAPI(OpenAPI unflattenedOpenAPI);
}
17 changes: 17 additions & 0 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/config/CodegenConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,14 @@ public ClientOptInput toClientOptInput() {
SwaggerParseResult result = new OpenAPIParser().readContents(inputSpec, authorizationValues, options);
OpenAPI openAPI = result.getOpenAPI();

if (config.needsUnflattenedSpec()) {
ParseOptions optionsUnflattened = new ParseOptions();
optionsUnflattened.setResolve(true);
SwaggerParseResult resultUnflattened = new OpenAPIParser().readContents(inputSpec, authorizationValues, optionsUnflattened);
OpenAPI openAPIUnflattened = resultUnflattened.getOpenAPI();
config.setUnflattenedOpenAPI(openAPIUnflattened);
}

input.opts(new ClientOpts())
.openAPI(openAPI);

Expand Down Expand Up @@ -497,6 +505,15 @@ public ClientOptInput toClientOptInput() {
LOGGER.debug("getClientOptInput - parsed inputSpecURL " + inputSpecURL);
input.opts(new ClientOpts())
.openAPI(openAPI);

if (config.needsUnflattenedSpec()) {
ParseOptions optionsUnflattened = new ParseOptions();
optionsUnflattened.setResolve(true);
SwaggerParseResult resultUnflattened = new OpenAPIParser().readLocation(inputSpecURL, authorizationValues, optionsUnflattened);
OpenAPI openAPIUnflattened = resultUnflattened.getOpenAPI();
config.setUnflattenedOpenAPI(openAPIUnflattened);
}

}

config.setOutputDir(outputDir);
Expand Down