adapting parser to ref changes in core

Author: gracekarina

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

@@ -107,10 +107,10 @@ public String processRefToExternalDefinition(String $ref, RefFormat refFormat) {
                         if (isAnExternalRefFormat(refModel.getRefFormat())) {
                             String joinedRef = join(file, refModel.get$ref());
                             refModel.set$ref(processRefToExternalDefinition(joinedRef, refModel.getRefFormat()));
-                        }else if (isAnExternalRefFormat(refModel.getOriginalRefFormat())) {
+                        }/*else if (isAnExternalRefFormat(refModel.getOriginalRefFormat())) {
                             String joinedRef = join(file, refModel.getOriginalRef());
                             refModel.set$ref(processRefToExternalDefinition(joinedRef, refModel.getOriginalRefFormat()));
-                        }else {
+                        }*/else {
                             processRefToExternalDefinition(file + refModel.get$ref(), RefFormat.RELATIVE);
                         }
                     } else if (allOfModel instanceof ModelImpl) {
@@ -183,9 +183,6 @@ private void processRefProperty(RefProperty subRef, String externalFile) {
         if (isAnExternalRefFormat(subRef.getRefFormat())) {
             String joinedRef = join(externalFile, subRef.get$ref());
             subRef.set$ref(processRefToExternalDefinition(joinedRef, subRef.getRefFormat()));
-        } else if (isAnExternalRefFormat(subRef.getOriginalRefFormat())) {
-            String joinedRef = join(externalFile, subRef.getOriginalRef());
-            subRef.set$ref(processRefToExternalDefinition(joinedRef, subRef.getOriginalRefFormat()));
         } else {
             processRefToExternalDefinition(externalFile + subRef.get$ref(), RefFormat.RELATIVE);
         }

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

@@ -93,9 +93,6 @@ private void processRefModel(RefModel refModel) {
 
             newRef    = externalRefProcessor.processRefToExternalDefinition(refModel.get$ref(), refModel.getRefFormat());
 
-        }else if (isAnExternalRefFormat(refModel.getOriginalRefFormat())) {
-
-            newRef = externalRefProcessor.processRefToExternalDefinition(refModel.getOriginalRef(), refModel.getOriginalRefFormat());
         }
 
         if (newRef != null) {

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

@@ -37,12 +37,9 @@ public List<Parameter> processParameters(List<Parameter> parameters) {
                  Parameter resolvedParameter = cache.loadRef(refParameter.get$ref(), refParameter.getRefFormat(), Parameter.class);
 
                 if(resolvedParameter == null) {
-                    resolvedParameter = cache.loadRef(refParameter.getOriginalRef(), refParameter.getOriginalRefFormat(), Parameter.class);
-                    if (resolvedParameter == null) {
-                        // can't resolve it!
-                        processedPathLevelParameters.add(refParameter);
-                        continue;
-                    }
+                    // can't resolve it!
+                    processedPathLevelParameters.add(refParameter);
+                    continue;
                 }
                 // if the parameter exists, replace it
                 boolean matched = false;

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

@@ -77,9 +77,6 @@ public void processPaths() {
             if (path instanceof RefPath) {
                 RefPath refPath = (RefPath) path;
                 Path resolvedPath = cache.loadRef(refPath.get$ref(), refPath.getRefFormat(), Path.class);
-                if (resolvedPath == null){
-                    resolvedPath = cache.loadRef(refPath.getOriginalRef(), refPath.getOriginalRefFormat(), Path.class);
-                }
 
                 // TODO: update references to the parent location
 

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

@@ -28,7 +28,7 @@ public void testIssue306() {
 
         Swagger swagger = result.getSwagger();
 
-        assertTrue(swagger.getDefinitions().size() == 5);
+        assertTrue(swagger.getDefinitions().size() == 6);
         // resolved from `$ref: './book.yaml'`
         assertNotNull(swagger.getDefinitions().get("Inventory"));
         // resolved from `$ref: 'book.yaml'`
@@ -169,13 +169,7 @@ public void testAllOfFlatAndNested() {
                 "./src/test/resources/allOf-properties-ext-ref/swagger.json")) {
             Swagger swagger = new SwaggerParser().read(path);
             assertEquals(3, swagger.getDefinitions().size());
-            assertNotNull(swagger.getDefinitions().get("record"));
-            assertTrue(swagger.getDefinitions().get("record")instanceof RefModel);
-
-            assertNotNull(swagger.getDefinitions().get("purebred_pet"));
-            assertTrue(swagger.getDefinitions().get("purebred_pet")instanceof ComposedModel);
-            ComposedModel composedModel = (ComposedModel) swagger.getDefinitions().get("purebred_pet");
-
+            ComposedModel composedModel = (ComposedModel)swagger.getDefinitions().get("record");
             assertEquals(((RefModel) composedModel.getParent()).getSimpleRef(), "pet");
             Map<String, Property> props = composedModel.getChild().getProperties();
             assertEquals(((RefProperty) props.get("mother")).getSimpleRef(), "pet");