added fix for issue-1261

Author: r-sreesaran

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

@@ -20,14 +20,7 @@
 import io.swagger.models.parameters.BodyParameter;
 import io.swagger.models.parameters.RefParameter;
 import io.swagger.models.parameters.SerializableParameter;
-import io.swagger.models.properties.AbstractNumericProperty;
-import io.swagger.models.properties.ArrayProperty;
-import io.swagger.models.properties.FileProperty;
-import io.swagger.models.properties.MapProperty;
-import io.swagger.models.properties.ObjectProperty;
-import io.swagger.models.properties.Property;
-import io.swagger.models.properties.RefProperty;
-import io.swagger.models.properties.StringProperty;
+import io.swagger.models.properties.*;
 import io.swagger.parser.SwaggerParser;
 import io.swagger.parser.SwaggerResolver;
 import io.swagger.parser.util.SwaggerDeserializationResult;
@@ -210,9 +203,27 @@ public SwaggerParseResult convert(SwaggerDeserializationResult parse) {
                     ref.set$ref(updatedRef);
                 }
             }
+
+            if (property instanceof ComposedProperty) {
+                ComposedProperty comprop = (ComposedProperty) property;
+                if (comprop.getAllOf() != null) {
+                    for (Property item : comprop.getAllOf()) {
+                        if (item instanceof RefProperty) {
+                            RefProperty ref = (RefProperty) item;
+                            if (ref.get$ref().indexOf("#/definitions") == 0) {
+                                String updatedRef = "#/components/schemas" + ref.get$ref().substring("#/definitions".length());
+                                ref.set$ref(updatedRef);
+                            }
+
+
+                        }
+
+                    }
+                }
+            }
         }
 
-        if (swagger.getParameters() != null) {
+            if (swagger.getParameters() != null) {
             globalV2Parameters.putAll(swagger.getParameters());
             swagger.getParameters().forEach((k, v) -> {
                 if ("body".equals(v.getIn())) {

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

@@ -94,6 +94,8 @@ public class V2ConverterTest {
     private static final String ISSUE_1032_YAML = "issue-1032.yaml";
     private static final String ISSUE_1113_YAML = "issue-1113.yaml";
     private static final String ISSUE_1164_YAML = "issue-1164.yaml";
+    private static final String ISSUE_1261_YAML = "issue-1261.yaml";
+
 
     private static final String API_BATCH_PATH = "/api/batch/";
     private static final String PETS_PATH = "/pets";
@@ -840,4 +842,13 @@ private OpenAPI getConvertedOpenAPIFromJsonFile(String file) throws IOException,
         assertNotNull(result);
         return result.getOpenAPI();
     }
+
+    @Test(description = "")
+    public void testissue1261() throws Exception {
+        OpenAPI oas = getConvertedOpenAPIFromJsonFile(ISSUE_1261_YAML);
+        assertNotNull(oas);
+        ComposedSchema schema = (ComposedSchema) oas.getComponents().getSchemas().get("Bar").getProperties().get("bar2");
+        assertEquals(schema.getAllOf().get(0).get$ref(),"#/components/schemas/Foo");
+
+    }
 }

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

@@ -0,0 +1,20 @@
+swagger: '2.0'
+info:
+  title: Conversion test
+  version: '1.0.0'
+paths: {}
+
+definitions:
+  Foo:
+    type: object
+    properties:
+      foo:
+        type: string
+  Bar:
+    type: object
+    properties:
+      bar1:
+        $ref: '#/definitions/Foo'     # This $ref is converted properly to `#/components/schemas`
+      bar2:
+        allOf:
+          - $ref: '#/definitions/Foo' # This $ref remains as `#/definitions`