Merge branch 'master' into auth-per-host

Author: gracekarina

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/OpenAPIV3Parser.java

@@ -183,12 +183,12 @@ public SwaggerParseResult readContents(String swaggerAsString, List<Authorizatio
                 if(options != null) {
                     if (options.isResolve()) {
                         OpenAPIDeserializer deserializer = new OpenAPIDeserializer();
-                        JsonNode rootNode = mapper.readTree(swaggerAsString);
+                        JsonNode rootNode = mapper.readTree(swaggerAsString.getBytes());
                         result = deserializer.deserialize(rootNode);
                         OpenAPIResolver resolver = new OpenAPIResolver(result.getOpenAPI(), auth, null);
                         result.setOpenAPI(resolver.resolve());
                     }else{
-                        JsonNode rootNode = mapper.readTree(swaggerAsString);
+                        JsonNode rootNode = mapper.readTree(swaggerAsString.getBytes());
                         result = new OpenAPIDeserializer().deserialize(rootNode);
                     }
                     if (options.isResolveFully()) {
@@ -200,7 +200,7 @@ public SwaggerParseResult readContents(String swaggerAsString, List<Authorizatio
                         inlineModelResolver.flatten(result.getOpenAPI());
                     }
                 }else{
-                    JsonNode rootNode = mapper.readTree(swaggerAsString);
+                    JsonNode rootNode = mapper.readTree(swaggerAsString.getBytes());
                     result = new OpenAPIDeserializer().deserialize(rootNode);
                 }
             } catch (Exception e) {

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/ResolverFully.java

@@ -1,19 +1,5 @@
 package io.swagger.v3.parser.util;
 
-import static io.swagger.v3.parser.util.RefUtils.computeDefinitionName;
-import static io.swagger.v3.parser.util.RefUtils.computeRefFormat;
-import static io.swagger.v3.parser.util.RefUtils.isAnExternalRefFormat;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.IdentityHashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
@@ -37,6 +23,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.IdentityHashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static io.swagger.v3.parser.util.RefUtils.computeDefinitionName;
+import static io.swagger.v3.parser.util.RefUtils.computeRefFormat;
+import static io.swagger.v3.parser.util.RefUtils.isAnExternalRefFormat;
+
 public class ResolverFully {
     private static final Logger LOGGER = LoggerFactory.getLogger(ResolverFully.class);
 
@@ -275,10 +275,14 @@ public Parameter resolveParameter(Parameter parameter){
     }
 
     public Schema resolveSchema(Schema schema) {
+        if (schema == null) {
+            return null;
+        }
+
         if(schema.get$ref() != null) {
             String ref= schema.get$ref();
             ref = ref.substring(ref.lastIndexOf("/") + 1);
-            Schema resolved = schemas.get(ref);
+            Schema resolved = schemas != null ? schemas.get(ref) : null;
 
             if (resolved != null) {