Skip to content

Commit 298a243

Browse files
gracekarinafrantuma
authored andcommitted
updating new JsonSchema in deserializer
1 parent 4eb43fb commit 298a243

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3629,7 +3629,7 @@ public Schema getJsonSchema(ObjectNode node, String location, ParseResult result
36293629
ObjectNode itemsNode = getObject("items", node, false, location, result);
36303630

36313631
if ((allOfArray != null) || (anyOfArray != null) || (oneOfArray != null)) {
3632-
Schema composedSchema = new Schema();
3632+
JsonSchema composedSchema = new JsonSchema();
36333633

36343634
if (allOfArray != null) {
36353635

@@ -3663,7 +3663,7 @@ public Schema getJsonSchema(ObjectNode node, String location, ParseResult result
36633663
}
36643664
}
36653665
if (itemsNode != null && result.isDefaultSchemaTypeObject()) {
3666-
ArraySchema items = new ArraySchema();
3666+
ArraySchema items = new ArraySchema();
36673667
if (itemsNode.getNodeType().equals(JsonNodeType.OBJECT)) {
36683668
items.setItems(getSchema(itemsNode, location, result));
36693669
} else if (itemsNode.getNodeType().equals(JsonNodeType.ARRAY)) {
@@ -3675,7 +3675,7 @@ public Schema getJsonSchema(ObjectNode node, String location, ParseResult result
36753675
}
36763676
schema = items;
36773677
}else if (itemsNode != null) {
3678-
JsonSchema items = new JsonSchema();
3678+
ArraySchema items = new ArraySchema();
36793679
if (itemsNode.getNodeType().equals(JsonNodeType.OBJECT)) {
36803680
items.setItems(getJsonSchema(itemsNode, location, result));
36813681
} else if (itemsNode.getNodeType().equals(JsonNodeType.ARRAY)) {
@@ -3733,13 +3733,13 @@ public Schema getJsonSchema(ObjectNode node, String location, ParseResult result
37333733
schema =
37343734
unevaluatedProperties.equals(Boolean.FALSE)
37353735
? new ObjectSchema()
3736-
: new Schema();
3736+
: new JsonSchema();
37373737
}
37383738
schema.setUnevaluatedProperties(unevaluatedProperties);
37393739
}
37403740

37413741
if (schema == null) {
3742-
schema = new Schema();
3742+
schema = new JsonSchema();
37433743
}
37443744

37453745
JsonNode ref = node.get("$ref");

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OAI31DeserializationTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public void testSchemaKeysOAS31() {
5454
Schema patternProperties = (Schema)schema2020_12.getPatternProperties().get("^S_");
5555
assertTrue(schema2020_12.getUnevaluatedItems().getTypes().contains("object"));
5656
assertTrue(patternProperties.getTypes().contains("string"));
57+
System.out.println(schema2020_12);
5758
}
5859

5960
@Test(description = "Test basic OAS31 deserialization/validation")

0 commit comments

Comments
 (0)