Normalize refs to prevent schema duplication

Author: ctreatma

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

@@ -34,6 +34,7 @@
 import io.swagger.v3.parser.ResolverCache;
 import io.swagger.v3.parser.models.RefFormat;
 import io.swagger.v3.parser.models.RefType;
+import io.swagger.v3.parser.util.RefUtils;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -92,6 +93,21 @@ public String processRefToExternalSchema(String $ref, RefFormat refFormat) {
             return renamedRef;
         }
 
+        RefFormat format = computeRefFormat($ref);
+        String originalRef = $ref;
+        if (format.equals(RefFormat.RELATIVE)) {
+            String normalizedRef = "./" + Paths.get($ref).normalize().toString();
+            if (!normalizedRef.equals($ref)) {
+                System.out.println("Normalized " + $ref + " to " + normalizedRef);
+                renamedRef = cache.getRenamedRef($ref);
+                if (renamedRef != null) {
+                    return renamedRef;
+                } else {
+                    $ref = normalizedRef;
+                }
+            }
+        }
+
         final Schema schema = cache.loadRef($ref, refFormat, Schema.class);
 
         if(schema == null) {
@@ -114,6 +130,9 @@ public String processRefToExternalSchema(String $ref, RefFormat refFormat) {
         final String possiblyConflictingDefinitionName = computeDefinitionName($ref);
         newRef = finalNameRec(schemas, possiblyConflictingDefinitionName, schema, 0);
         cache.putRenamedRef($ref, newRef);
+        if (!$ref.equals(originalRef)) {
+            cache.putRenamedRef(originalRef, newRef);
+        }
         Schema existingModel = schemas.get(newRef);
        if(existingModel != null && existingModel.get$ref() != null) {
             // use the new model