Refactoring readWithInfo Method

Author: ralphdoe

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

@@ -20,18 +20,18 @@ public SwaggerDeserializationResult readWithInfo(String location, List<Authoriza
         if (location == null) {
             return null;
         }
-        location = location.replaceAll("\\\\","/");
+        location = location.replaceAll("\\\\", "/");
         List<SwaggerParserExtension> parserExtensions = getExtensions();
         SwaggerDeserializationResult output;
 
-        if(auths == null) {
+        if (auths == null) {
             auths = new ArrayList<AuthorizationValue>();
         }
 
         output = new Swagger20Parser().readWithInfo(location, auths);
         if (output != null) {
-            if(output.getSwagger() != null && "2.0".equals(output.getSwagger().getSwagger())) {
-                if(resolve) {
+            if (output.getSwagger() != null && "2.0".equals(output.getSwagger().getSwagger())) {
+                if (resolve) {
                     output.setSwagger(new SwaggerResolver(output.getSwagger(), auths, location).resolve());
                 }
                 return output;
@@ -43,9 +43,9 @@ public SwaggerDeserializationResult readWithInfo(String location, List<Authoriza
                 return output;
             }
         }
-        if(output == null) {
+        if (output == null) {
             output = new SwaggerDeserializationResult()
-                .message("The swagger definition could not be read");
+                    .message("The swagger definition could not be read");
         }
         return output;
     }
@@ -58,7 +58,7 @@ public Swagger read(String location, List<AuthorizationValue> auths, boolean res
         if (location == null) {
             return null;
         }
-        location = location.replaceAll("\\\\","/");
+        location = location.replaceAll("\\\\", "/");
         Swagger output;
 
         try {
@@ -87,28 +87,7 @@ public Swagger read(String location, List<AuthorizationValue> auths, boolean res
     }
 
     public SwaggerDeserializationResult readWithInfo(String swaggerAsString) {
-        if (swaggerAsString == null) {
-            return new SwaggerDeserializationResult().message("empty or null swagger supplied");
-        }
-        try {
-            JsonNode node;
-            if (swaggerAsString.trim().startsWith("{")) {
-                ObjectMapper mapper = Json.mapper();
-                node = mapper.readTree(swaggerAsString);
-            } else {
-                node = DeserializationUtils.readYamlTree(swaggerAsString);
-            }
-
-            SwaggerDeserializationResult result = new Swagger20Parser().readWithInfo(node);
-            if (result != null) {
-                result.setSwagger(new SwaggerResolver(result.getSwagger(), new ArrayList<AuthorizationValue>(), null).resolve());
-            } else {
-                result = new SwaggerDeserializationResult().message("Definition does not appear to be a valid Swagger format");
-            }
-            return result;
-        } catch (Exception e) {
-            return new SwaggerDeserializationResult().message("malformed or unreadable swagger supplied");
-        }
+        return readWithInfo(swaggerAsString, Boolean.TRUE);
     }
 
     public SwaggerDeserializationResult readWithInfo(String swaggerAsString, boolean resolve) {
@@ -173,10 +152,9 @@ public Swagger read(JsonNode node, List<AuthorizationValue> authorizationValues,
         try {
             output = new Swagger20Parser().read(node);
             if (output != null) {
-                if(resolve) {
+                if (resolve) {
                     return new SwaggerResolver(output, authorizationValues).resolve();
-                }
-                else {
+                } else {
                     return output;
                 }
             }