Merge pull request swagger-api#419 from swagger-api/issue-418

catch invalid cast
clouderite · Mar 11, 2017 · 7d5e502 · 7d5e502
2 parents 1bf0bff + 1e1d37e
commit 7d5e502
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 4 deletions.
diff --git a/modules/swagger-compat-spec-parser/pom.xml b/modules/swagger-compat-spec-parser/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>1.0.27</version>
+        <version>1.0.28-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/swagger-parser/pom.xml b/modules/swagger-parser/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>1.0.27</version>
+        <version>1.0.28-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/swagger-parser/src/main/java/io/swagger/parser/ResolverCache.java b/modules/swagger-parser/src/main/java/io/swagger/parser/ResolverCache.java
@@ -71,7 +71,14 @@ public ResolverCache(Swagger swagger, List<AuthorizationValue> auths, String par
     public <T> T loadRef(String ref, RefFormat refFormat, Class<T> expectedType) {
         if (refFormat == RefFormat.INTERNAL) {
             //we don't need to go get anything for internal refs
-            return expectedType.cast(loadInternalRef(ref));
+            Object loadedRef = loadInternalRef(ref);
+
+            try{
+                return expectedType.cast(loadedRef);
+            }
+            catch (Exception e) {
+                return null;
+            }
         }
 
         final String[] refParts = ref.split("#/");

diff --git a/modules/swagger-parser/src/main/java/io/swagger/parser/processors/ParameterProcessor.java b/modules/swagger-parser/src/main/java/io/swagger/parser/processors/ParameterProcessor.java
@@ -37,6 +37,8 @@ public List<Parameter> processParameters(List<Parameter> parameters) {
                 final Parameter resolvedParameter = cache.loadRef(refParameter.get$ref(), refParameter.getRefFormat(), Parameter.class);
 
                 if(resolvedParameter == null) {
+                    // can't resolve it!
+                    processedPathLevelParameters.add(refParameter);
                     continue;
                 }
                 // if the parameter exists, replace it

diff --git a/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java b/modules/swagger-parser/src/test/java/io/swagger/parser/SwaggerParserTest.java
@@ -837,4 +837,34 @@ public void testIssue358() {
         assertEquals("pathParam", parms.get(0).getName());
         assertEquals("string", ((SerializableParameter)parms.get(0)).getType());
     }
+
+    @Test
+    public void testIncompatibleRefs() {
+        String yaml =
+                "swagger: '2.0'\n" +
+                "paths:\n" +
+                "  /test:\n" +
+                "    post:\n" +
+                "      parameters:\n" +
+                "        # this is not the correct reference type\n" +
+                "        - $ref: '#/definitions/Model'\n" +
+                "        - in: body\n" +
+                "          name: incorrectType\n" +
+                "          required: true\n" +
+                "          schema:\n" +
+                "            $ref: '#/definitions/Model'\n" +
+                "      responses:\n" +
+                "        200:\n" +
+                "          # this is not the correct reference type\n" +
+                "          $ref: '#/definitions/Model'\n" +
+                "        400:\n" +
+                "          definitions: this is right\n" +
+                "          schema:\n" +
+                "            $ref: '#/definitions/Model'\n" +
+                "definitions:\n" +
+                "  Model:\n" +
+                "    type: object";
+        SwaggerDeserializationResult result = new SwaggerParser().readWithInfo(yaml);
+        Json.prettyPrint(result);
+    }
 }
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.swagger</groupId>
     <artifactId>swagger-parser-project</artifactId>
-    <version>1.0.27</version>
+    <version>1.0.28-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>swagger-parser-project</name>
     <developers>