Issue 901 v1.039

modules/swagger-parser/src/main/java/io/swagger/parser/processors/ExternalRefProcessor.java

@@ -7,6 +7,7 @@
 import io.swagger.models.properties.Property;
 import io.swagger.models.properties.RefProperty;
 import io.swagger.models.refs.RefFormat;
+import io.swagger.models.refs.RefType;
 import io.swagger.parser.ResolverCache;
 import io.swagger.parser.util.RefUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -244,7 +245,8 @@ private void processRefProperty(RefProperty subRef, String externalFile) {
             String joinedRef = join(externalFile, subRef.get$ref());
             subRef.set$ref(processRefToExternalDefinition(joinedRef, subRef.getRefFormat()));
         } else {
-            subRef.set$ref(processRefToExternalDefinition(externalFile + subRef.get$ref(), RefFormat.RELATIVE));
+            String processRef = processRefToExternalDefinition(externalFile + subRef.get$ref(), RefFormat.RELATIVE);
+            subRef.set$ref(RefType.DEFINITION.getInternalPrefix()+processRef);
         }
     }
 

modules/swagger-parser/src/main/java/io/swagger/parser/processors/ModelProcessor.java

@@ -7,6 +7,7 @@
 import io.swagger.models.RefModel;
 import io.swagger.models.Swagger;
 import io.swagger.models.properties.Property;
+import io.swagger.models.refs.RefType;
 import io.swagger.parser.ResolverCache;
 
 import java.util.List;
@@ -96,7 +97,8 @@ private void processRefModel(RefModel refModel) {
         }
 
         if (newRef != null) {
-            refModel.set$ref(newRef);
+            refModel.set$ref(RefType.DEFINITION.getInternalPrefix() + newRef);
+
         }
 
     }

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

@@ -69,6 +69,20 @@ public void testIssueRelativeRefs2(){
         assertEquals(refProperty.get$ref(),"#/definitions/simpleIDType_v01");
     }
 
+    @Test
+    public void testIssue901_2() {
+        Swagger swagger = new SwaggerParser().read("issue-901/spec2.yaml");
+        assertNotNull(swagger);
+        Yaml.prettyPrint(swagger);
+    }
+
+    @Test
+    public void testIssue901() {
+        Swagger swagger = new SwaggerParser().read("issue-901/spec.yaml");
+        assertNotNull(swagger);
+
+    }
+
     @Test
     public void testIssue435() {
         Swagger swagger = new SwaggerParser().read("issue-435/main.yaml");

modules/swagger-parser/src/test/resources/issue-901/ref.yaml

@@ -0,0 +1,33 @@
+### Domains, a place to put your reusable components
+
+
+info:
+  title: "aa"
+  description: "swos552"
+  version: '1.0.0'
+
+definitions:
+  Test.Definition:
+    type: object
+    properties:
+      stuff:
+        type: array
+        items:
+          $ref: '#/definitions/TESTTHING'
+  TESTTHING:
+    type: object
+    properties:
+      prop:
+        type: string
+pathitems:
+  path-test:
+    put:
+      description: test ref
+      operationId: test
+      produces:
+      - application/json
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/Test.Definition'

modules/swagger-parser/src/test/resources/issue-901/ref2.yaml

@@ -0,0 +1,35 @@
+### Domains, a place to put your reusable components
+
+
+info:
+  title: "aa"
+  description: "swos55"
+  version: '1.0.0'
+
+definitions:
+  Test.Definition:
+    type: object
+    properties:
+      stuff:
+        type: array
+        items:
+          $ref: '#/definitions/TEST.THING.OUT.Stuff'
+  TEST.THING.OUT.Stuff:
+    type: object
+    properties:
+      prop:
+        type: string
+pathitems:
+  path-test:
+    put:
+      description: test ref
+      operationId: test
+      produces:
+      - application/json
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/Test.Definition'
+
+

modules/swagger-parser/src/test/resources/issue-901/spec.yaml

@@ -0,0 +1,9 @@
+swagger: '2.0'
+info:
+  version: '1.01'
+  title: testswos55
+  description: testswos55
+basePath: /test
+paths:
+  '/test':
+    $ref: 'ref.yaml/#/pathitems/path-test'

modules/swagger-parser/src/test/resources/issue-901/spec2.yaml

@@ -0,0 +1,9 @@
+swagger: '2.0'
+info:
+  version: '1.01'
+  title: testswos55
+  description: testswos55
+basePath: /test
+paths:
+  '/test':
+    $ref: 'ref2.yaml/#/pathitems/path-test'