Skip to content

Empty strings #1619

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 4 commits into from
Oct 19, 2021
Merged

Empty strings #1619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f64ed37
empty strings validation
gracekarina Oct 9, 2021
2d129e7
option to allow empty string as valid for deserialization
gracekarina Oct 12, 2021
ce26cf1
make changes in comments
gracekarina Oct 14, 2021
dd311de
improve validation
gracekarina Oct 14, 2021
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
9 changes: 9 additions & 0 deletions modules/swagger-parser-core/src/main/java/io/swagger/v3/parser/core/models/ParseOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public class ParseOptions {
private boolean flattenComposedSchemas;
private boolean camelCaseFlattenNaming;
private boolean skipMatches;
private boolean allowEmptyStrings = true;

public boolean isResolve() {
return resolve;
Expand Down Expand Up @@ -59,4 +60,12 @@ public boolean isCamelCaseFlattenNaming() {
public void setCamelCaseFlattenNaming(boolean camelCaseFlattenNaming) {
this.camelCaseFlattenNaming = camelCaseFlattenNaming;
}

public boolean isAllowEmptyString() {
return allowEmptyStrings;
}

public void setAllowEmptyString(boolean allowEmptyStrings) {
this.allowEmptyStrings = allowEmptyStrings;
}
}
12 changes: 10 additions & 2 deletions modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/OpenAPIV3Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,10 @@ public SwaggerParseResult readWithInfo(String path, JsonNode node) {
}

public SwaggerParseResult parseJsonNode(String path, JsonNode node) {
return new OpenAPIDeserializer().deserialize(node, path);
return new OpenAPIDeserializer().deserialize(node, path,new ParseOptions());
}
public SwaggerParseResult parseJsonNode(String path, JsonNode node, ParseOptions options) {
return new OpenAPIDeserializer().deserialize(node, path, options);
}

public SwaggerParseResult readContents(String yaml) {
Expand All @@ -149,7 +152,12 @@ private SwaggerParseResult readContents(String swaggerAsString, List<Authorizati
try {
final ObjectMapper mapper = getRightMapper(swaggerAsString);
final JsonNode rootNode = mapper.readTree(swaggerAsString);
final SwaggerParseResult result = parseJsonNode(location, rootNode);
final SwaggerParseResult result;
if (options != null) {
result = parseJsonNode(location, rootNode, options);
}else {
result = parseJsonNode(location, rootNode);
}
if (result.getOpenAPI() != null) {
return resolve(result, auth, options, location);
}
Expand Down
Loading