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 @@ -1194,6 +1194,7 @@ public Schema convert(io.swagger.models.Model v2Model) {
composed.setTitle(composedModel.getTitle());
composed.setExtensions(convert(composedModel.getVendorExtensions()));
composed.setAllOf(composedModel.getAllOf().stream().map(this::convert).collect(Collectors.toList()));
composed.setRequired(composedModel.getRequired());

addProperties(v2Model, composed);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public class V2ConverterTest {
private static final String ISSUE_1715_YAML = "issue-1715.yaml";

private static final String ISSUE_1767_YAML = "issue-1767.yaml";
private static final String ISSUE_1796_YAML = "issue-1796.yaml";

private static final String API_BATCH_PATH = "/api/batch/";
private static final String PETS_PATH = "/pets";
Expand Down Expand Up @@ -877,6 +878,16 @@ public void testIssue1767() throws Exception {
assertNull(secondOperationSecurityRequirements);
}

@Test(description = "OpenAPI v2 converter - composed model should keep required properties")
public void testissue1796() throws Exception {
OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_1796_YAML);
assertNotNull(oas);
ComposedSchema schema = (ComposedSchema) oas.getComponents().getSchemas().get("ComposedModel");
assertNotNull(schema.getRequired());
assertEquals(schema.getRequired().size(), 1);
assertEquals(schema.getRequired().get(0), "name");
}

@Test()
public void testInlineDefinitionProperty() throws Exception {
SwaggerConverter converter = new SwaggerConverter();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
swagger: "2.0"
info:
title: composed model conversion test
version: 1.0.0
paths:
/composed:
get:
operationId: composed
responses:
"200":
description: OK
schema:
$ref: "#/definitions/ComposedModel"
definitions:
BaseModel:
type: object
required:
- uuid
properties:
uuid:
type: string
ComposedModel:
type: object
required:
- name
allOf:
- $ref: "#/definitions/BaseModel"
properties:
name:
type: string