Merge pull request #1241 from swagger-api/issue1143

refs - issue #1143 - changes in converter to support properties in Composed Model

Author: frantuma

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

@@ -1172,6 +1172,9 @@ 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()));
+
+            addProperties(v2Model, composed);
+
             result = composed;
         } else {
             String v2discriminator = null;
@@ -1185,14 +1188,7 @@ public Schema convert(io.swagger.models.Model v2Model) {
 
             result = Json.mapper().convertValue(v2Model, Schema.class);
 
-            if ((v2Model.getProperties() != null) && (v2Model.getProperties().size() > 0)) {
-                Map<String, Property> properties = v2Model.getProperties();
-
-                properties.forEach((k, v) -> {
-                    result.addProperties(k, convert(v));
-                });
-
-            }
+            addProperties(v2Model, result);
 
             if (v2Model instanceof ModelImpl) {
                 ModelImpl model = (ModelImpl) v2Model;
@@ -1225,5 +1221,16 @@ public Schema convert(io.swagger.models.Model v2Model) {
 
         return result;
     }
+
+    private void addProperties(Model v2Model, Schema schema) {
+        if ((v2Model.getProperties() != null) && (v2Model.getProperties().size() > 0)) {
+            Map<String, Property> properties = v2Model.getProperties();
+
+            properties.forEach((k, v) -> {
+                schema.addProperties(k, convert(v));
+            });
+
+        }
+    }
 }
 

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

@@ -1,5 +1,6 @@
 package io.swagger.parser;
 
+import io.swagger.util.Yaml;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.media.ArraySchema;
@@ -27,6 +28,16 @@
 
 public class OpenAPIParserTest {
 
+    @Test
+    public void testIssue1143(){
+        ParseOptions options = new ParseOptions();
+        options.setResolve(true);
+        SwaggerParseResult result = new OpenAPIParser().readLocation("issue-1143.json",null,options);
+        assertNotNull(result.getOpenAPI());
+        assertNotNull(result.getOpenAPI().getComponents().getSchemas().get("RedisResource"));
+        assertNotNull(result.getOpenAPI().getComponents().getSchemas().get("identificacion_usuario_aplicacion"));
+    }
+
     @Test
     public void testIssue749() {
         ParseOptions options = new ParseOptions();