refs #1303 - compatibility and minor

Author: frantuma

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

@@ -22,9 +22,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.ServiceLoader;
@@ -97,7 +95,7 @@ public SwaggerParseResult readLocation(String url, List<AuthorizationValue> auth
 
     @Override
     public SwaggerParseResult readContents(String swaggerAsString, List<AuthorizationValue> auth,
-            ParseOptions options) {
+                                           ParseOptions options) {
         return readContents(swaggerAsString, auth, options, null);
     }
 
@@ -127,6 +125,11 @@ public OpenAPI read(String location, List<AuthorizationValue> auths, ParseOption
         return null;
     }
 
+    @Deprecated
+    public SwaggerParseResult readWithInfo(String path, JsonNode node) {
+        return parseJsonNode(path, node);
+    }
+
     public SwaggerParseResult parseJsonNode(String path, JsonNode node) {
         return new OpenAPIDeserializer().deserialize(node, path);
     }
@@ -138,30 +141,35 @@ public SwaggerParseResult readContents(String yaml) {
     }
 
     private SwaggerParseResult readContents(String swaggerAsString, List<AuthorizationValue> auth, ParseOptions options,
-            String parentFileLocation) {
+                                            String location) {
         if (swaggerAsString == null || swaggerAsString.trim().isEmpty()) {
-            return SwaggerParseResult.ofError("No swagger supplied");
+            return SwaggerParseResult.ofError("Null or empty definition");
         }
 
         try {
             final ObjectMapper mapper = getRightMapper(swaggerAsString);
             final JsonNode rootNode = mapper.readTree(swaggerAsString);
-            final SwaggerParseResult result = parseJsonNode(parentFileLocation, rootNode);
-            return resolve(result, auth, options, parentFileLocation);
+            final SwaggerParseResult result = parseJsonNode(location, rootNode);
+            return resolve(result, auth, options, location);
         } catch (JsonProcessingException e) {
             LOGGER.warn("Exception while parsing:", e);
-            final String message = getParseErrorMessage(e.getOriginalMessage(), parentFileLocation);
+            final String message = getParseErrorMessage(e.getOriginalMessage(), location);
             return SwaggerParseResult.ofError(message);
         }
     }
 
+    @Deprecated
+    public SwaggerParseResult readWithInfo(String location, List<AuthorizationValue> auths) {
+        return readContents(readContentFromLocation(location, auths), auths, null);
+    }
+
     private SwaggerParseResult resolve(SwaggerParseResult result, List<AuthorizationValue> auth, ParseOptions options,
-            String parentFileLocation) {
+            String location) {
         try {
             if (options != null) {
                 if (options.isResolve() || options.isResolveFully()) {
                     result.setOpenAPI(new OpenAPIResolver(result.getOpenAPI(), emptyListIfNull(auth),
-                            parentFileLocation).resolve());
+                            location).resolve());
                     if (options.isResolveFully()) {
                         new ResolverFully(options.isResolveCombinators()).resolveFully(result.getOpenAPI());
                     }
@@ -180,12 +188,12 @@ private SwaggerParseResult resolve(SwaggerParseResult result, List<Authorization
         return result;
     }
 
-    private String getParseErrorMessage(String originalMessage, String parentFileLocation) {
+    private String getParseErrorMessage(String originalMessage, String location) {
         if (Objects.isNull(originalMessage)) {
-            return String.format("Unable to parse `%s`", parentFileLocation);
+            return String.format("Unable to parse `%s`", location);
         }
         if (originalMessage.startsWith("Duplicate field")) {
-            return String.format(originalMessage + " in `%s`", parentFileLocation);
+            return String.format(originalMessage + " in `%s`", location);
         }
         return originalMessage;
     }
@@ -225,4 +233,35 @@ private String readContentFromLocation(String location, List<AuthorizationValue>
             throw new ReadContentException(String.format("Unable to read location `%s`", adjustedLocation), e);
         }
     }
+
+    /**
+     * Transform the swagger-model version of AuthorizationValue into a parser-specific one, to avoid
+     * dependencies across extensions
+     *
+     * @param input
+     * @return
+     */
+    @Deprecated
+    protected List<AuthorizationValue> transform(List<AuthorizationValue> input) {
+        if(input == null) {
+            return null;
+        }
+
+        List<AuthorizationValue> output = new ArrayList<>();
+
+        for(AuthorizationValue value : input) {
+            AuthorizationValue v = new AuthorizationValue();
+
+            v.setKeyName(value.getKeyName());
+            v.setValue(value.getValue());
+            v.setType(value.getType());
+            v.setUrlMatcher(value.getUrlMatcher());
+
+            output.add(v);
+        }
+
+        return output;
+    }
+
+
 }

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

@@ -33,10 +33,14 @@ public class InlineModelResolver {
 
     private final boolean flattenComposedSchemas;
     private final boolean camelCaseFlattenNaming;
-    private final boolean skipMatches;
+    private boolean skipMatches;
 
     public InlineModelResolver(){this(false, false, false);}
 
+    public InlineModelResolver(boolean flattenComposedSchemas, boolean camelCaseFlattenNaming) {
+        this(flattenComposedSchemas, camelCaseFlattenNaming, false);
+    }
+
     public InlineModelResolver(boolean flattenComposedSchemas, boolean camelCaseFlattenNaming, boolean skipMatches) {
         this.flattenComposedSchemas = flattenComposedSchemas;
         this.camelCaseFlattenNaming = camelCaseFlattenNaming;
@@ -591,4 +595,12 @@ private boolean isObjectSchema(Schema schema) {
                 || "object".equalsIgnoreCase(schema.getType())
                 || (schema.getType() == null && schema.getProperties() != null && !schema.getProperties().isEmpty());
     }
+
+    public boolean isSkipMatches() {
+        return skipMatches;
+    }
+
+    public void setSkipMatches(boolean skipMatches) {
+        this.skipMatches = skipMatches;
+    }
 }