Issue #2157 Resolve additionalProperties inside ComposedSchema correctly

Author: chinmeshatgoogle

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

@@ -683,6 +683,9 @@ private void aggregateSchemaCombinators(ComposedSchema sourceSchema, Schema targ
             if (resolved.getMinContains() != null) {
                 targetSchema.setMinContains(resolved.getMinContains());
             }
+            if (resolved.getAdditionalProperties() != null) {
+                targetSchema.setAdditionalProperties(resolved.getAdditionalProperties());
+            }
         }
 
         if (requiredProperties.size() > 0) {

modules/swagger-parser/src/test/java/io/swagger/parser/OpenAPIParserTest.java

@@ -25,6 +25,7 @@
 import java.util.List;
 
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 import static org.testng.AssertJUnit.assertNull;
@@ -772,5 +773,56 @@ public void testIssue1552AdditionalProps() throws Exception {
                 "openapi31: false\n");
     }
 
+
+  @Test
+  public void testAdditionalPropertiesWithAllOfV1() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "additionalProperties_allOf_v1.yaml", null, options);
+    assertNotNull(result.getOpenAPI());
+    Schema schema = result.getOpenAPI().getComponents().getSchemas().get("TestSchema");
+    assertNotNull(schema);
+    assertNotNull(schema.getAdditionalProperties());
+    assertTrue((Boolean) schema.getAdditionalProperties());
+  }
+    @Test
+    public void testAdditionalPropertiesWithAllOfV2() {
+        ParseOptions options = new ParseOptions();
+        options.setResolveFully(true);
+        SwaggerParseResult result = new OpenAPIParser().readLocation(
+            "additionalProperties_allOf_v2.yaml", null, options);
+        assertNotNull(result.getOpenAPI());
+        Schema schema = result.getOpenAPI().getComponents().getSchemas().get("TestSchema");
+        assertNotNull(schema);
+        assertNotNull(schema.getAdditionalProperties());
+        assertTrue((Boolean) schema.getAdditionalProperties());
+    }
+
+  @Test
+  public void testAdditionalPropertiesWithAllOfV3() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "additionalProperties_allOf_v3.yaml", null, options);
+    assertNotNull(result.getOpenAPI());
+    Schema schema = result.getOpenAPI().getComponents().getSchemas().get("TestSchema");
+    assertNotNull(schema);
+    assertNotNull(schema.getAdditionalProperties());
+    assertTrue((Boolean) schema.getAdditionalProperties());
+  }
+
+  @Test
+  public void testAdditionalPropertiesWithAllOfV4() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "additionalProperties_allOf_v4.yaml", null, options);
+    assertNotNull(result.getOpenAPI());
+    Schema schema = result.getOpenAPI().getComponents().getSchemas().get("TestSchema");
+    assertNotNull(schema);
+    assertNotNull(schema.getAdditionalProperties());
+    assertFalse((Boolean) schema.getAdditionalProperties());
+  }
 }
 

modules/swagger-parser/src/test/resources/additionalProperties_allOf_v1.yaml

@@ -0,0 +1,25 @@
+openapi: 3.0.1
+info:
+  title: Test API
+  version: 1.0.0
+paths:
+  /test:
+    get:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TestSchema'
+components:
+  schemas:
+    ObjectWithAdditionalProperties:
+      type: object
+      additionalProperties: true
+      properties:
+        name:
+          type: string
+    TestSchema:
+      allOf:
+        - $ref: '#/components/schemas/ObjectWithAdditionalProperties'

modules/swagger-parser/src/test/resources/additionalProperties_allOf_v2.yaml

@@ -0,0 +1,26 @@
+openapi: 3.0.1
+info:
+  title: Test API
+  version: 1.0.0
+paths:
+  /test:
+    get:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TestSchema'
+components:
+  schemas:
+    ObjectWithAdditionalProperties:
+      type: object
+      additionalProperties: true
+    TestSchema:
+      allOf:
+        - $ref: '#/components/schemas/ObjectWithAdditionalProperties'
+        - type: object
+          properties:
+            name:
+              type: string

modules/swagger-parser/src/test/resources/additionalProperties_allOf_v3.yaml

@@ -0,0 +1,27 @@
+openapi: 3.0.1
+info:
+  title: Test API
+  version: 1.0.0
+paths:
+  /test:
+    get:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TestSchema'
+components:
+  schemas:
+    ObjectWithAdditionalProperties:
+      type: object
+      additionalProperties: true
+    TestSchema:
+      allOf:
+        - type: object
+          properties:
+            name:
+              type: string
+          additionalProperties: false
+        - $ref: '#/components/schemas/ObjectWithAdditionalProperties'

modules/swagger-parser/src/test/resources/additionalProperties_allOf_v4.yaml

@@ -0,0 +1,27 @@
+openapi: 3.0.1
+info:
+  title: Test API
+  version: 1.0.0
+paths:
+  /test:
+    get:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TestSchema'
+components:
+  schemas:
+    ObjectWithAdditionalProperties:
+      type: object
+      additionalProperties: true
+    TestSchema:
+      allOf:
+        - $ref: '#/components/schemas/ObjectWithAdditionalProperties'
+        - type: object
+          properties:
+            name:
+              type: string
+          additionalProperties: false