Merge pull request swagger-api#374 from kevinoid/lenient-file-url

Support file URL scheme produced by java.io.File et al.

Author: fehguy

modules/swagger-parser/src/main/java/io/swagger/parser/Swagger20Parser.java

@@ -42,7 +42,7 @@ public SwaggerDeserializationResult readWithInfo(String location, List<Authoriza
             if (location.toLowerCase().startsWith("http")) {
                 data = RemoteUrl.urlToString(location, auths);
             } else {
-                final String fileScheme = "file://";
+                final String fileScheme = "file:";
                 Path path;
                 if (location.toLowerCase().startsWith(fileScheme)) {
                     path = Paths.get(URI.create(location));
@@ -80,7 +80,7 @@ public Swagger read(String location, List<AuthorizationValue> auths) throws IOEx
             if (location.toLowerCase().startsWith("http")) {
                 data = RemoteUrl.urlToString(location, auths);
             } else {
-                final String fileScheme = "file://";
+                final String fileScheme = "file:";
                 Path path;
                 if (location.toLowerCase().startsWith(fileScheme)) {
                     path = Paths.get(URI.create(location));

modules/swagger-parser/src/main/java/io/swagger/parser/util/PathUtils.java

@@ -8,7 +8,7 @@ public class PathUtils {
 
 
     public static Path getParentDirectoryOfFile(String fileStr) {
-        final String fileScheme = "file://";
+        final String fileScheme = "file:";
         Path file;
         fileStr = fileStr.replaceAll("\\\\","/");
         if (fileStr.toLowerCase().startsWith(fileScheme)) {

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

@@ -39,6 +39,22 @@ public void readUberApiFromFileWithSpaces() {
         assertNotNull(swagger);
     }
 
+    @Test(description = "it should read the uber api from Path URI")
+    public void readUberApiFromPathUri() {
+        final SwaggerParser parser = new SwaggerParser();
+        java.nio.file.Path uberPath = Paths.get("src/test/resources/uber.json");
+        final Swagger swagger = parser.read(uberPath.toUri().toString());
+        assertNotNull(swagger);
+    }
+
+    @Test(description = "it should read the uber api from File URI")
+    public void readUberApiFromFileUri() {
+        final SwaggerParser parser = new SwaggerParser();
+        java.io.File uberFile = new java.io.File("src/test/resources/uber.json");
+        final Swagger swagger = parser.read(uberFile.toURI().toString());
+        assertNotNull(swagger);
+    }
+
     @Test(description = "it should read the uber api with url string without file scheme")
     public void readUberApiFromFileNoScheme() {
         final SwaggerParser parser = new SwaggerParser();