Skip to content

Flatten Schema Option #541

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 9 commits into from
Oct 13, 2017
Merged

Flatten Schema Option #541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b074665
class working, 3 tests OK
Oct 1, 2017
27ddfbc
migrated class, 4out of 29 test working
Oct 1, 2017
913cc4b
Failing 5th test
Oct 2, 2017
6c8c08a
fixing moar tests
Oct 2, 2017
40af928
fixing more tests
Oct 4, 2017
183c08b
fixing tests
Oct 5, 2017
3526688
fixed all test in falttening option
Oct 5, 2017
28b7210
implementing flattening as an option with test
Oct 5, 2017
d056405
parameter support and test
Oct 5, 2017
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
5 changes: 5 additions & 0 deletions modules/swagger-parser-core/src/main/java/io/swagger/parser/models/ParseOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
public class ParseOptions {
private boolean resolve;
private boolean resolveFully;
private boolean flatten;

public boolean isResolve() {
return resolve;
Expand All @@ -19,4 +20,8 @@ public boolean isResolveFully() {
public void setResolveFully(boolean resolveFully) {
this.resolveFully = resolveFully;
}

public boolean isFlatten() { return flatten; }

public void setFlatten(boolean flatten) { this.flatten = flatten; }
}
7 changes: 7 additions & 0 deletions modules/swagger-parser-v3/src/main/java/io/swagger/parser/v3/OpenAPIV3Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import io.swagger.parser.models.SwaggerParseResult;
import io.swagger.parser.v3.util.ClasspathHelper;
import io.swagger.parser.v3.util.DeserializationUtils;
import io.swagger.parser.v3.util.InlineModelResolver;
import io.swagger.parser.v3.util.OpenAPIDeserializer;
import io.swagger.parser.v3.util.RemoteUrl;
import io.swagger.parser.v3.util.ResolverFully;
Expand Down Expand Up @@ -54,6 +55,9 @@ public SwaggerParseResult readLocation(String url, List<AuthorizationValue> auth
if (options.isResolveFully()) {
result.setOpenAPI(resolver.resolve());
new ResolverFully().resolveFully(result.getOpenAPI());
}else if (options.isFlatten()){
InlineModelResolver inlineResolver = new InlineModelResolver();
inlineResolver.flatten(result.getOpenAPI());
}
}
}
Expand Down Expand Up @@ -177,6 +181,9 @@ public SwaggerParseResult readContents(String swaggerAsString, List<Authorizatio
}if (options.isResolveFully()){
result.setOpenAPI(new OpenAPIResolver(result.getOpenAPI(), auth, null).resolve());
new ResolverFully().resolveFully(result.getOpenAPI());

}if (options.isFlatten()){
new InlineModelResolver().flatten(result.getOpenAPI());
}
}else{
try {
Expand Down
Loading