Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ protected void normalizeProperties(Map<String, Schema> properties, Set<Schema> v
}
for (Map.Entry<String, Schema> propertiesEntry : properties.entrySet()) {
Schema property = propertiesEntry.getValue();

// remove x-internal if needed (same logic as normalizeComponentsSchemas)
if (property.getExtensions() != null && getRule(REMOVE_X_INTERNAL)) {
Object xInternalValue = property.getExtensions().get(X_INTERNAL);
Expand Down Expand Up @@ -1777,6 +1777,7 @@ protected Schema processNormalize31Spec(Schema schema, Set<Schema> visitedSchema
ArraySchema as = new ArraySchema();
as.setDescription(schema.getDescription());
as.setDefault(schema.getDefault());
as.setTitle(schema.getTitle());
if (schema.getExample() != null) {
as.setExample(schema.getExample());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -955,6 +955,10 @@ public void testOpenAPINormalizerProcessingArraySchema31Spec() {
assertNotEquals(((Schema) schema11.getOneOf().get(0)).getPrefixItems(), null);
assertEquals(((Schema) schema11.getOneOf().get(1)).getItems(), null);

Schema schema13 = openAPI.getComponents().getSchemas().get("OneOfArrayWithTitle");
assertEquals(((Schema) schema13.getOneOf().get(0)).getTitle(), "dog_array");
assertEquals(((Schema) schema13.getOneOf().get(1)).getTitle(), "cat_object");

Map<String, String> inputRules = Map.of("NORMALIZE_31SPEC", "true");
OpenAPINormalizer openAPINormalizer = new OpenAPINormalizer(openAPI, inputRules);
openAPINormalizer.normalize();
Expand Down Expand Up @@ -992,6 +996,12 @@ public void testOpenAPINormalizerProcessingArraySchema31Spec() {
assertNotEquals(((Schema) schema12.getOneOf().get(0)).getItems(), null);
assertEquals(((Schema) schema12.getOneOf().get(0)).getPrefixItems(), null);
assertNotEquals(((Schema) schema12.getOneOf().get(1)).getItems(), null);

Schema schema14 = openAPI.getComponents().getSchemas().get("OneOfArrayWithTitle");
assertEquals(((Schema) schema14.getOneOf().get(0)).getTitle(), "dog_array");
assertEquals(((Schema) schema14.getOneOf().get(1)).getTitle(), "cat_object");
assertTrue(ModelUtils.isArraySchema((Schema) schema14.getOneOf().get(0)));
assertEquals(((Schema) schema14.getOneOf().get(0)).getType(), "array");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,15 @@ components:
- type: integer
maxItems: 3
minItems: 3
- type: array
- type: array
OneOfArrayWithTitle:
oneOf:
- title: dog_array
type: array
items:
type: string
- title: cat_object
type: object
properties:
name:
type: string
Loading