Merge pull request #1681 from jbbenoist/issue#1266

Fix the issue of not merging the extensions in allOf

Author: gracekarina

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

@@ -496,10 +496,10 @@ private void aggregateSchemaCombinators(ComposedSchema sourceSchema, Schema targ
             if (resolved.getExample() != null) {
                 examples.add(resolved.getExample());
             }
-            if (sourceSchema.getExtensions() != null) {
-                Map<String, Object> extensions = sourceSchema.getExtensions();
+            if (resolved.getExtensions() != null) {
+                Map<String, Object> extensions = resolved.getExtensions();
                 for (String key : extensions.keySet()) {
-                    targetSchema.addExtension(key, sourceSchema.getExtensions().get(key));
+                    targetSchema.addExtension(key, extensions.get(key));
                 }
             }
         }

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OpenAPIV3ParserTest.java

@@ -3021,6 +3021,18 @@ public void testIssue1592() throws Exception {
         assertNotNull(openAPI);
     }
 
+    @Test
+    public void testIssue1266() throws Exception{
+        String yamlString = FileUtils.readFileToString(new File("src/test/resources/issue-1266/issue-1266.yaml"), "UTF-8");
+        String yamlStringResolved = FileUtils.readFileToString(new File("src/test/resources/issue-1266/issue-1266-resolved.yaml"), "UTF-8");
+        ParseOptions options = new ParseOptions();
+        options.setResolveFully(true);
+        options.setResolveCombinators(true);
+        OpenAPI openAPI = new OpenAPIV3Parser().readContents(yamlString, null, options).getOpenAPI();
+        Assert.assertNotNull(openAPI);
+        assertEquals(Yaml.pretty(openAPI), yamlStringResolved);
+    }
+
     @Test(description = "option true, adds Original Location to messages when ref is relative/local")
     public void testValidateExternalRefsTrue() {
         ParseOptions options = new ParseOptions();

modules/swagger-parser-v3/src/test/resources/issue-1266/issue-1266-resolved.yaml

@@ -0,0 +1,33 @@
+openapi: 3.0.2
+info:
+  title: Extension not inherited
+  version: "1"
+servers:
+- url: /
+paths:
+  /test/extensions/not/inherited:
+    get:
+      responses:
+        "200":
+          description: A test failing on the merge of extensions in a allOf
+          content:
+            application/json:
+              schema:
+                required:
+                - data
+                properties:
+                  data:
+                    type: string
+                  data2:
+                    type: string
+                x-extension-ref: 1
+components:
+  schemas:
+    ResponseModel:
+      required:
+      - data
+      type: object
+      properties:
+        data:
+          type: string
+      x-extension-ref: 1

modules/swagger-parser-v3/src/test/resources/issue-1266/issue-1266.yaml

@@ -0,0 +1,31 @@
+openapi: "3.0.2"
+info:
+  version: "1"
+  title: "Extension not inherited"
+
+components:
+  schemas:
+    ResponseModel:
+      x-extension-ref: 1
+      type: object
+      required:
+        - data
+      properties:
+        data:
+          type: "string"
+
+paths:
+  /test/extensions/not/inherited:
+    get:
+      responses:
+        200:
+          description: "A test failing on the merge of extensions in a allOf"
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: "#/components/schemas/ResponseModel"
+                  - type: "object"
+                    properties:
+                      data2:
+                        type: "string"