Issue #2157 Resolve additionalProperties inside ComposedSchema correctly

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;
@@ -39,7 +40,7 @@ public void testNPE_1685() {
         SwaggerParseResult swaggerParseResult = openAPIParser.readLocation("issue1685.json", null, options);
         assertNull(swaggerParseResult.getOpenAPI());
         assertNotNull(swaggerParseResult.getMessages());
-        assertTrue(swaggerParseResult.getMessages().size() == 2);
+         assertTrue(swaggerParseResult.getMessages().size() == 2);
         assertEquals(swaggerParseResult.getMessages().get(0), "attribute notswagger is unexpected");
         assertEquals(swaggerParseResult.getMessages().get(1), "attribute swagger is missing");
     }
@@ -772,5 +773,240 @@ public void testIssue1552AdditionalProps() throws Exception {
                 "openapi31: false\n");
     }
 
+
+  @Test
+  public void testIssue2157_AllOf_SingleRefPreservesBoolean() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "issue-2157/allOf-single-ref-boolean.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 testIssue2157_AllOf_RefAndInlineMerge() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "issue-2157/allOf-ref-and-inline-merge.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 testIssue2157_AllOf_PreservesSchemaObject() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "issue-2157/allOf-preserves-schema-object.yaml", null, options);
+    assertNotNull(result.getOpenAPI());
+    RequestBody requestBody = result.getOpenAPI().getPaths().get("/pet").getPut().getRequestBody();
+    assertNotNull(requestBody);
+    Schema schema = requestBody.getContent().get("application/json").getSchema();
+    assertNotNull(schema);
+    assertNotNull(schema.getAdditionalProperties());
+    assertTrue(schema.getAdditionalProperties() instanceof Schema);
+    Schema additionalPropsSchema = (Schema) schema.getAdditionalProperties();
+    assertEquals(additionalPropsSchema.getType(), "string");
+    assertNotNull(schema.getProperties());
+    assertTrue(schema.getProperties().containsKey("id"));
+    assertTrue(schema.getProperties().containsKey("name"));
+  }
+
+  @Test
+  public void testIssue2157_AllOf_PreservesSchemaWithConstraints() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "issue-2157/allOf-preserves-schema-with-constraints.yaml", null, options);
+    assertNotNull(result.getOpenAPI());
+    Schema schema = result.getOpenAPI().getComponents().getSchemas().get("TestSchema");
+    assertNotNull(schema);
+    assertNotNull(schema.getAdditionalProperties());
+    assertTrue(schema.getAdditionalProperties() instanceof Schema);
+    Schema additionalPropsSchema = (Schema) schema.getAdditionalProperties();
+    assertEquals(additionalPropsSchema.getType(), "string");
+    assertEquals(additionalPropsSchema.getMinLength(), Integer.valueOf(1));
+    assertEquals(additionalPropsSchema.getMaxLength(), Integer.valueOf(100));
+    assertNotNull(schema.getProperties());
+    assertTrue(schema.getProperties().containsKey("id"));
+    assertTrue(schema.getProperties().containsKey("name"));
+  }
+
+  @Test
+  public void testIssue2157_AllOf_ConflictLastWinsInline() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "issue-2157/allOf-conflict-last-wins-inline.yaml", null, options);
+    assertNotNull(result.getOpenAPI());
+    Schema schema = result.getOpenAPI().getComponents().getSchemas().get("TestSchema");
+    assertNotNull(schema);
+    assertNotNull(schema.getAdditionalProperties());
+    assertFalse((Boolean) schema.getAdditionalProperties());
+  }
+
+  @Test
+  public void testIssue2157_AllOf_ConflictLastWinsRef() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "issue-2157/allOf-conflict-last-wins-ref.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 testIssue2157_AllOf_NoAggregationPreservesStructure() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    options.setResolveCombinators(false);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "issue-2157/allOf-no-aggregation-preserves-structure.yaml", null, options);
+    assertNotNull(result.getOpenAPI());
+    Schema schema = result.getOpenAPI().getComponents().getSchemas().get("TestSchema");
+    assertNotNull(schema);
+    assertNotNull(schema.getAllOf());
+    assertEquals(schema.getAllOf().size(), 2);
+    Schema firstBranch = (Schema) schema.getAllOf().get(0);
+    assertNotNull(firstBranch.getAdditionalProperties());
+    assertTrue((Boolean) firstBranch.getAdditionalProperties());
+  }
+
+  @Test
+  public void testIssue2157_AllOf_ConflictSchemaObjects() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "issue-2157/allOf-conflict-schema-objects.yaml", null, options);
+    assertNotNull(result.getOpenAPI());
+    Schema schema = result.getOpenAPI().getComponents().getSchemas().get("TestSchema");
+    assertNotNull(schema);
+    assertNotNull(schema.getAdditionalProperties());
+    assertTrue(schema.getAdditionalProperties() instanceof Schema);
+    Schema additionalPropsSchema = (Schema) schema.getAdditionalProperties();
+    assertEquals(additionalPropsSchema.getType(), "number");
+    assertNotNull(schema.getProperties());
+    assertTrue(schema.getProperties().containsKey("name"));
+    assertTrue(schema.getProperties().containsKey("id"));
+  }
+
+  @Test
+  public void testIssue2157_OneOf_PreservesBoolean() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "issue-2157/oneOf-preserves-boolean.yaml", null, options);
+    assertNotNull(result.getOpenAPI());
+    Schema schema = result.getOpenAPI().getComponents().getSchemas().get("TestSchema");
+    assertNotNull(schema);
+    assertNotNull(schema.getOneOf());
+    assertEquals(schema.getOneOf().size(), 1);
+    Schema oneOfBranch = (Schema) schema.getOneOf().get(0);
+    assertNotNull(oneOfBranch.getAdditionalProperties());
+    assertTrue((Boolean) oneOfBranch.getAdditionalProperties());
+  }
+
+  @Test
+  public void testIssue2157_OneOf_PreservesSchemaObject() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "issue-2157/oneOf-preserves-schema-object.yaml", null, options);
+    assertNotNull(result.getOpenAPI());
+    Schema schema = result.getOpenAPI().getComponents().getSchemas().get("TestSchema");
+    assertNotNull(schema);
+    assertNotNull(schema.getOneOf());
+    assertEquals(schema.getOneOf().size(), 1);
+    Schema oneOfBranch = (Schema) schema.getOneOf().get(0);
+    assertNotNull(oneOfBranch.getAdditionalProperties());
+    assertTrue(oneOfBranch.getAdditionalProperties() instanceof Schema);
+    Schema additionalPropsSchema = (Schema) oneOfBranch.getAdditionalProperties();
+    assertEquals(additionalPropsSchema.getType(), "string");
+    assertEquals(additionalPropsSchema.getMinLength(), Integer.valueOf(1));
+  }
+
+  @Test
+  public void testIssue2157_OneOf_MultipleBranchesIndependent() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "issue-2157/oneOf-multiple-branches-independent.yaml", null, options);
+    assertNotNull(result.getOpenAPI());
+    Schema schema = result.getOpenAPI().getComponents().getSchemas().get("TestSchema");
+    assertNotNull(schema);
+    assertNotNull(schema.getOneOf());
+    assertEquals(schema.getOneOf().size(), 2);
+    Schema firstBranch = (Schema) schema.getOneOf().get(0);
+    Schema secondBranch = (Schema) schema.getOneOf().get(1);
+    assertNotNull(firstBranch.getAdditionalProperties());
+    assertTrue((Boolean) firstBranch.getAdditionalProperties());
+    assertNotNull(secondBranch.getAdditionalProperties());
+    assertFalse((Boolean) secondBranch.getAdditionalProperties());
+  }
+
+  @Test
+  public void testIssue2157_AnyOf_PreservesBoolean() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "issue-2157/anyOf-preserves-boolean.yaml", null, options);
+    assertNotNull(result.getOpenAPI());
+    Schema schema = result.getOpenAPI().getComponents().getSchemas().get("TestSchema");
+    assertNotNull(schema);
+    assertNotNull(schema.getAnyOf());
+    assertEquals(schema.getAnyOf().size(), 1);
+    Schema anyOfBranch = (Schema) schema.getAnyOf().get(0);
+    assertNotNull(anyOfBranch.getAdditionalProperties());
+    assertTrue((Boolean) anyOfBranch.getAdditionalProperties());
+  }
+
+  @Test
+  public void testIssue2157_AnyOf_PreservesSchemaObject() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "issue-2157/anyOf-preserves-schema-object.yaml", null, options);
+    assertNotNull(result.getOpenAPI());
+    Schema schema = result.getOpenAPI().getComponents().getSchemas().get("TestSchema");
+    assertNotNull(schema);
+    assertNotNull(schema.getAnyOf());
+    assertEquals(schema.getAnyOf().size(), 1);
+    Schema anyOfBranch = (Schema) schema.getAnyOf().get(0);
+    assertNotNull(anyOfBranch.getAdditionalProperties());
+    assertTrue(anyOfBranch.getAdditionalProperties() instanceof Schema);
+    Schema additionalPropsSchema = (Schema) anyOfBranch.getAdditionalProperties();
+    assertEquals(additionalPropsSchema.getType(), "string");
+    assertEquals(additionalPropsSchema.getMinLength(), Integer.valueOf(1));
+  }
+
+  @Test
+  public void testIssue2157_AnyOf_MultipleBranchesIndependent() {
+    ParseOptions options = new ParseOptions();
+    options.setResolveFully(true);
+    SwaggerParseResult result = new OpenAPIParser().readLocation(
+        "issue-2157/anyOf-multiple-branches-independent.yaml", null, options);
+    assertNotNull(result.getOpenAPI());
+    Schema schema = result.getOpenAPI().getComponents().getSchemas().get("TestSchema");
+    assertNotNull(schema);
+    assertNotNull(schema.getAnyOf());
+    assertEquals(schema.getAnyOf().size(), 2);
+    Schema firstBranch = (Schema) schema.getAnyOf().get(0);
+    Schema secondBranch = (Schema) schema.getAnyOf().get(1);
+    assertNotNull(firstBranch.getAdditionalProperties());
+    assertTrue((Boolean) firstBranch.getAdditionalProperties());
+    assertNotNull(secondBranch.getAdditionalProperties());
+    assertFalse((Boolean) secondBranch.getAdditionalProperties());
+  }
 }
 

modules/swagger-parser/src/test/resources/issue-2157/allOf-conflict-last-wins-inline.yaml

@@ -0,0 +1,27 @@
+openapi: 3.0.1
+info:
+  title: Test API - Conflict with $ref first (last non-null wins)
+  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

modules/swagger-parser/src/test/resources/issue-2157/allOf-conflict-last-wins-ref.yaml

@@ -0,0 +1,27 @@
+openapi: 3.0.1
+info:
+  title: Test API - Conflict with inline first (last non-null wins)
+  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/issue-2157/allOf-conflict-schema-objects.yaml

@@ -0,0 +1,36 @@
+openapi: 3.0.1
+info:
+  title: Test API - Multiple schema-object additionalProperties conflict
+  version: 1.0.0
+paths:
+  /test:
+    get:
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TestSchema'
+components:
+  schemas:
+    SchemaWithStringAdditional:
+      type: object
+      properties:
+        name:
+          type: string
+      additionalProperties:
+        type: string
+        minLength: 1
+    SchemaWithNumberAdditional:
+      type: object
+      properties:
+        id:
+          type: integer
+      additionalProperties:
+        type: number
+        minimum: 0
+    TestSchema:
+      allOf:
+        - $ref: '#/components/schemas/SchemaWithStringAdditional'
+        - $ref: '#/components/schemas/SchemaWithNumberAdditional'

modules/swagger-parser/src/test/resources/issue-2157/allOf-no-aggregation-preserves-structure.yaml

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