Merge branch 'master' into ISSUE-1745

Author: gracekarina

modules/swagger-parser-v2-converter/src/main/java/io/swagger/v3/parser/converter/SwaggerConverter.java

@@ -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);
 

modules/swagger-parser-v2-converter/src/test/java/io/swagger/parser/test/V2ConverterTest.java

@@ -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";
@@ -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();

modules/swagger-parser-v2-converter/src/test/resources/issue-1796.yaml

@@ -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

modules/swagger-parser-v3/pom.xml

@@ -39,6 +39,10 @@
             <artifactId>commons-io</artifactId>
             <version>${commons-io-version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>

modules/swagger-parser/pom.xml

@@ -22,6 +22,10 @@
             <artifactId>swagger-parser-v3</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jmockit</groupId>
             <artifactId>jmockit</artifactId>

pom.xml

@@ -402,24 +402,20 @@
         </repository>
     </repositories>
     <properties>
-        <snakeyaml-version>1.32</snakeyaml-version>
-        <swagger-parser-v2-version>1.0.62</swagger-parser-v2-version>
+        <snakeyaml-version>1.33</snakeyaml-version>
+        <swagger-parser-v2-version>1.0.63-SNAPSHOT</swagger-parser-v2-version>
         <commons-io-version>2.11.0</commons-io-version>
         <slf4j-version>1.7.30</slf4j-version>
-        <swagger-core-version>2.2.3</swagger-core-version>
-        <swagger-core-v2-version>1.6.7</swagger-core-v2-version>
+        <swagger-core-version>2.2.4-SNAPSHOT</swagger-core-version>
+        <swagger-core-v2-version>1.6.8-SNAPSHOT</swagger-core-v2-version>
         <junit-version>4.13.2</junit-version>
         <testng-version>6.14.2</testng-version>
         <jmockit-version>1.35</jmockit-version>
         <wiremock-version>2.15.0</wiremock-version>
         <surefire-version>2.22.2</surefire-version>
         <commons-lang-version>3.2.1</commons-lang-version>
-        <jackson-version>2.13.2</jackson-version>
-        <!--
-          2.13.2 is still affected by CVE-2020-36518.
-          This version pin for jackson-databind can be removed when bumping jackson to 2.14
-          -->
-        <jackson-databind-version>2.13.2.2</jackson-databind-version>
+        <jackson-version>2.13.4</jackson-version>
+        <jackson-databind-version>2.13.4.2</jackson-databind-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <sonatypeOssDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/snapshots/</sonatypeOssDistMgmtSnapshotsUrl>
     </properties>