Merge branch 'master' into issue-1292

Author: gracekarina

README.md

@@ -103,7 +103,7 @@ You can include this library from Sonatype OSS for SNAPSHOTS, or Maven central f
 <dependency>
   <groupId>io.swagger.parser.v3</groupId>
   <artifactId>swagger-parser</artifactId>
-  <version>2.0.17</version>
+  <version>2.0.18</version>
 </dependency>
 ```
 

modules/swagger-parser-core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.18-SNAPSHOT</version>
+        <version>2.0.19-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-parser-v2-converter/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.18-SNAPSHOT</version>
+        <version>2.0.19-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-parser-v3/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.parser.v3</groupId>
         <artifactId>swagger-parser-project</artifactId>
-        <version>2.0.18-SNAPSHOT</version>
+        <version>2.0.19-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -15,19 +15,19 @@ public static ObjectMapper createJson() {
     }
 
     protected static ObjectMapper createJson(boolean includePathDeserializer, boolean includeResponseDeserializer) {
-        return create(null, includePathDeserializer, includeResponseDeserializer);
+        return create(createJsonFactory(), includePathDeserializer, includeResponseDeserializer);
     }
 
     public static ObjectMapper createYaml() {
         return createYaml(true, true);
     }
 
     protected static ObjectMapper createYaml(boolean includePathDeserializer, boolean includeResponseDeserializer) {
-        return create(new YAMLFactory(), includePathDeserializer, includeResponseDeserializer);
+        return create(createYamlFactory(), includePathDeserializer, includeResponseDeserializer);
     }
 
     private static ObjectMapper create(JsonFactory jsonFactory, boolean includePathDeserializer, boolean includeResponseDeserializer) {
-        ObjectMapper mapper = jsonFactory == null ? new ObjectMapper(createJsonFactory()) : new ObjectMapper(jsonFactory);
+        ObjectMapper mapper = new ObjectMapper(jsonFactory);
 
         mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
         mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
@@ -42,4 +42,10 @@ private static JsonFactory createJsonFactory() {
           .enable(StreamReadFeature.STRICT_DUPLICATE_DETECTION)
           .build();
     }
+
+    private static JsonFactory createYamlFactory() {
+        return YAMLFactory.builder()
+          .enable(StreamReadFeature.STRICT_DUPLICATE_DETECTION)
+          .build();
+    }
 }

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

@@ -11,6 +11,7 @@
 import io.swagger.v3.oas.models.links.Link;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.ComposedSchema;
+import io.swagger.v3.oas.models.media.Discriminator;
 import io.swagger.v3.oas.models.media.MediaType;
 import io.swagger.v3.oas.models.media.ObjectSchema;
 import io.swagger.v3.oas.models.media.Schema;
@@ -156,6 +157,8 @@ public String processRefToExternalSchema(String $ref, RefFormat refFormat) {
 
             processProperties(subProps,file);
 
+            processDiscriminator(schema.getDiscriminator(),file);
+
             if(schema.getAdditionalProperties() != null && schema.getAdditionalProperties() instanceof Schema){
                 Schema additionalProperty = (Schema) schema.getAdditionalProperties();
                 if (additionalProperty.get$ref() != null) {
@@ -229,6 +232,7 @@ private void processProperties(Map<String, Schema> properties, String file) {
         }
     }
 
+
     public PathItem processRefToExternalPathItem(String $ref, RefFormat refFormat) {
 
         final PathItem pathItem = cache.loadRef($ref, refFormat, PathItem.class);
@@ -306,6 +310,22 @@ public PathItem processRefToExternalPathItem(String $ref, RefFormat refFormat) {
         return pathItem;
     }
 
+    private void processDiscriminator(Discriminator d, String file) {
+        if (d != null && d.getMapping() != null) {
+            processDiscriminatorMapping(d.getMapping(), file);
+        }
+    }
+
+    private void processDiscriminatorMapping(Map<String, String> mapping, String file) {
+        for (String key : mapping.keySet()) {
+            String ref = mapping.get(key);
+            Schema subtype = new Schema().$ref(ref);
+            processSchema(subtype, file);
+            mapping.put(key, subtype.get$ref());
+        }
+
+    }
+
     public String processRefToExternalResponse(String $ref, RefFormat refFormat) {
         String renamedRef = cache.getRenamedRef($ref);
         if(renamedRef != null) {
@@ -787,6 +807,42 @@ private void processRefContent(Map<String, MediaType> content, String $ref) {
             if(mediaType.getSchema() != null) {
                 processRefSchemaObject(mediaType.getSchema(), $ref);
             }
+            if(mediaType.getExamples() != null) {
+                processRefExamples(mediaType.getExamples(), $ref);
+            }
+        }
+    }
+
+    private void processRefExamples(Map<String, Example> examples, String $ref) {
+        String file = $ref.split("#/")[0];
+        for(Example example : examples.values()) {
+            if (example.get$ref() != null) {
+                RefFormat ref = computeRefFormat(example.get$ref());
+                if (isAnExternalRefFormat(ref)) {
+                    processRefExample(example, $ref);
+                } else {
+                    processRefToExternalExample(file + example.get$ref(), RefFormat.RELATIVE);
+                }
+            }
+        }
+    }
+
+    private void processRefExample(Example example, String externalFile) {
+        RefFormat format = computeRefFormat(example.get$ref());
+
+        if (!isAnExternalRefFormat(format)) {
+            example.set$ref(RefType.SCHEMAS.getInternalPrefix()+ processRefToExternalSchema(externalFile + example.get$ref(), RefFormat.RELATIVE));
+            return;
+        }
+        String $ref = example.get$ref();
+        String subRefExternalPath = getExternalPath(example.get$ref())
+                .orElse(null);
+
+        if (format.equals(RefFormat.RELATIVE) && !Objects.equals(subRefExternalPath, externalFile)) {
+            $ref = join(externalFile, example.get$ref());
+            example.set$ref($ref);
+        }else {
+            processRefToExternalExample($ref, format);
         }
     }
 

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/processors/SchemaProcessor.java

@@ -61,7 +61,19 @@ public void processSchemaType(Schema schema){
             processAdditionalProperties(schema);
 
         }
+        if (schema.getDiscriminator() != null) {
+            processDiscriminatorSchema(schema);
+        }
+
+    }
 
+    private void processDiscriminatorSchema(Schema schema) {
+        if (schema.getDiscriminator() != null && schema.getDiscriminator().getMapping() != null) {
+            Map<String, String> mapping = schema.getDiscriminator().getMapping();
+            for (String ref : mapping.values()) {
+                processReferenceSchema(new Schema().$ref(ref));
+            }
+        }
     }
 
     private void processAdditionalProperties(Object additionalProperties) {