Skip to content

fix(parser): honor inferSchemaType for OAS 3.1 enum schemas #2299

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

Open
zetacollab wants to merge 1 commit into
base: master
Choose a base branch
from
+54 −1
Open

fix(parser): honor inferSchemaType for OAS 3.1 enum schemas #2299

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
2 changes: 1 addition & 1 deletion modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4020,7 +4020,7 @@ public Schema getJsonSchema(JsonNode jsonNode, String location, ParseResult resu
}
}

} else {
} else if (result.isInferSchemaType()) {
// may have an enum where type can be inferred
JsonNode enumNode = node.get("enum");
if (enumNode != null && enumNode.isArray()) {
Expand Down
53 changes: 53 additions & 0 deletions ...s/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OAI31DeserializationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,6 +1035,59 @@ public void test31Issue1821() {
assertEquals(id.getTypes().iterator().next(), "string");
}

@Test(description = "Test Issue 1964 with inferSchemaType disabled")
public void test31Issue1964InferSchemaTypeDisabled() {
ParseOptions options = new ParseOptions();
options.setInferSchemaType(false);

String yaml = "openapi: 3.1.0\n" +
"info:\n" +
" version: 1.0.0\n" +
" title: Example\n" +
"paths:\n" +
" /somePath:\n" +
" get:\n" +
" operationId: getSomePath\n" +
" responses:\n" +
" '200':\n" +
" description: OK\n" +
" content:\n" +
" application/json:\n" +
" schema: {}\n" +
"components:\n" +
" schemas:\n" +
" ArrayContainsValue:\n" +
" type: array\n" +
" contains:\n" +
" enum:\n" +
" - 1\n" +
" AdditionalpropertiesBeingFalseDoesNotAllowOtherProperties:\n" +
" $schema: https://json-schema.org/draft/2020-12/schema\n" +
" properties:\n" +
" foo: {}\n" +
" bar: {}\n" +
" patternProperties:\n" +
" ^v: {}\n" +
" additionalProperties: false\n";

SwaggerParseResult result = new OpenAPIV3Parser().readContents(yaml, null, options);
OpenAPI openAPI = result.getOpenAPI();
assertNotNull(openAPI);
assertTrue(result.getMessages().isEmpty(), String.valueOf(result.getMessages()));

Schema arrayContainsValue = openAPI.getComponents().getSchemas().get("ArrayContainsValue");
assertNotNull(arrayContainsValue.getContains());
assertNull(arrayContainsValue.getContains().getType());
assertNull(arrayContainsValue.getContains().getTypes());

Schema objectWithoutExplicitType = openAPI.getComponents().getSchemas()
.get("AdditionalpropertiesBeingFalseDoesNotAllowOtherProperties");
assertTrue(objectWithoutExplicitType.getAdditionalProperties() instanceof Schema);
assertFalse(((Schema) objectWithoutExplicitType.getAdditionalProperties()).getBooleanSchemaValue());
assertNull(objectWithoutExplicitType.getType());
assertNull(objectWithoutExplicitType.getTypes());
}

@Test(description = "Test safe resolving")
public void test31SafeURLResolving() {
ParseOptions parseOptions = new ParseOptions();
Expand Down