oas3.1 initial support

Author: frantuma

modules/swagger-parser-core/src/main/java/io/swagger/v3/parser/core/models/SwaggerParseResult.java

@@ -9,6 +9,7 @@
 public class SwaggerParseResult {
     private List<String> messages = null;
     private OpenAPI openAPI;
+    private boolean openapi31;
 
     public SwaggerParseResult messages(List<String> messages) {
         this.messages = messages;
@@ -52,4 +53,17 @@ public static SwaggerParseResult ofError(String message){
         result.setMessages(Collections.singletonList(message));
         return result;
     }
+
+    public void setOpenapi31(boolean openapi31) {
+        this.openapi31 = openapi31;
+    }
+
+    public SwaggerParseResult openapi31(boolean openapi31) {
+        this.openapi31 = openapi31;
+        return this;
+    }
+
+    public boolean isOpenapi31() {
+        return this.openapi31;
+    }
 }

modules/swagger-parser-v3/pom.xml

@@ -64,7 +64,6 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>${slf4j-version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>

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

@@ -72,6 +72,7 @@ public OpenAPI resolve() {
         pathProcessor.processPaths();
         componentsProcessor.processComponents();
 
+
         if(openApi.getPaths() != null) {
             for(String pathname : openApi.getPaths().keySet()) {
                 PathItem pathItem = openApi.getPaths().get(pathname);
@@ -82,6 +83,7 @@ public OpenAPI resolve() {
                 }
             }
         }
+
         return openApi;
     }
 

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

@@ -69,7 +69,7 @@ public class ResolverCache {
     private List<String> referencedModelKeys = new ArrayList<>();
     private Set<String> resolveValidationMessages;
     private final ParseOptions parseOptions;
-
+    protected boolean openapi31;
 
     /*
      * a map that stores original external references, and their associated renamed
@@ -86,6 +86,7 @@ public ResolverCache(OpenAPI openApi, List<AuthorizationValue> auths, String par
     }
 
     public ResolverCache(OpenAPI openApi, List<AuthorizationValue> auths, String parentFileLocation, Set<String> resolveValidationMessages, ParseOptions parseOptions) {
+        this.openapi31 = parseOptions.isOpenapi31();
         this.openApi = openApi;
         this.auths = auths;
         this.rootPath = parentFileLocation;
@@ -158,14 +159,14 @@ else if (rootPath != null) {
             externalFileCache.put(file, contents);
         }
         SwaggerParseResult deserializationUtilResult = new SwaggerParseResult();
-        JsonNode tree = DeserializationUtils.deserializeIntoTree(contents, file, parseOptions, deserializationUtilResult);
+        JsonNode tree = DeserializationUtils.deserializeIntoTree(contents, file, parseOptions, deserializationUtilResult, openapi31);
 
         if (definitionPath == null) {
             T result = null;
             if (parseOptions.isValidateExternalRefs()) {
                 result = deserializeFragment(tree, expectedType, file, "/");
             } else {
-                result = DeserializationUtils.deserialize(contents, file, expectedType);
+                result = DeserializationUtils.deserialize(contents, file, expectedType, openapi31);
             }
             resolutionCache.put(ref, result);
             if (deserializationUtilResult.getMessages() != null) {
@@ -191,9 +192,9 @@ else if (rootPath != null) {
         } else {
             if (expectedType.equals(Schema.class)) {
                 OpenAPIDeserializer deserializer = new OpenAPIDeserializer();
-                result = (T) deserializer.getSchema((ObjectNode) tree, definitionPath.replace("/", "."), null);
+                result = (T) deserializer.getSchema((ObjectNode) tree, definitionPath.replace("/", "."), null, , new OpenAPIDeserializer.ParseResult().openapi31(openapi31));
             } else {
-                result = DeserializationUtils.deserialize(tree, file, expectedType);
+                result = DeserializationUtils.deserialize(tree, file, expectedType, openapi31);
             }
         }
         updateLocalRefs(file, result);

modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/extensions/JsonSchemaParserExtension.java

@@ -0,0 +1,18 @@
+package io.swagger.v3.parser.extensions;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.parser.ResolverCache;
+import io.swagger.v3.parser.util.OpenAPIDeserializer;
+
+import java.util.Map;
+
+public interface JsonSchemaParserExtension {
+
+    Schema getSchema(ObjectNode node, String location, OpenAPIDeserializer.ParseResult result, Map<String, Object> rootMap, String basePath);
+
+
+    boolean resolveSchema(Schema schema, ResolverCache cache, OpenAPI openAPI, boolean openapi31);
+
+}

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

@@ -26,9 +26,12 @@ public class CallbackProcessor {
     private final ExternalRefProcessor externalRefProcessor;
 
     public CallbackProcessor(ResolverCache cache, OpenAPI openAPI) {
+        this(cache, openAPI, false);
+    }
+    public CallbackProcessor(ResolverCache cache, OpenAPI openAPI, boolean openapi31) {
         this.cache = cache;
-        this.operationProcessor = new OperationProcessor(cache, openAPI);
-        this.parameterProcessor = new ParameterProcessor(cache,openAPI);
+        this.operationProcessor = new OperationProcessor(cache, openAPI, openapi31);
+        this.parameterProcessor = new ParameterProcessor(cache,openAPI, openapi31);
         this.externalRefProcessor = new ExternalRefProcessor(cache, openAPI);
         this.openAPI = openAPI;
     }

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

@@ -35,21 +35,26 @@ public class ComponentsProcessor {
     private final SecuritySchemeProcessor securitySchemeProcessor;
 
     public ComponentsProcessor(OpenAPI openApi,ResolverCache cache){
+        this(openApi, cache, false);
+
+    }
+    public ComponentsProcessor(OpenAPI openApi,ResolverCache cache, boolean openapi31){
         this.cache = cache;
         this.openApi = openApi;
-        this.schemaProcessor = new SchemaProcessor(cache,openApi);
-        this.responseProcessor = new ResponseProcessor(cache, openApi);
-        this.requestBodyProcessor = new RequestBodyProcessor(cache, openApi);
-        this.parameterProcessor = new ParameterProcessor(cache, openApi);
-        this.headerProcessor = new HeaderProcessor(cache, openApi);
+        this.schemaProcessor = new SchemaProcessor(cache,openApi, openapi31);
+        this.responseProcessor = new ResponseProcessor(cache, openApi, openapi31);
+        this.requestBodyProcessor = new RequestBodyProcessor(cache, openApi, openapi31);
+        this.parameterProcessor = new ParameterProcessor(cache, openApi, openapi31);
+        this.headerProcessor = new HeaderProcessor(cache, openApi, openapi31);
         this.exampleProcessor = new ExampleProcessor(cache,openApi);
-        this.linkProcessor = new LinkProcessor(cache,openApi);
-        this.callbackProcessor = new CallbackProcessor(cache,openApi);
+        this.linkProcessor = new LinkProcessor(cache,openApi, openapi31);
+        this.callbackProcessor = new CallbackProcessor(cache,openApi, openapi31);
         this.securitySchemeProcessor = new SecuritySchemeProcessor(cache,openApi);
 
     }
 
 
+
     public void processComponents() {
         if (openApi.getComponents() == null){
             return;

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

@@ -26,13 +26,17 @@ public class HeaderProcessor {
 
 
     public HeaderProcessor(ResolverCache cache, OpenAPI openAPI) {
+        this(cache, openAPI, false);
+    }
+    public HeaderProcessor(ResolverCache cache, OpenAPI openAPI, boolean openapi31) {
         this.cache = cache;
         this.openAPI = openAPI;
-        this.schemaProcessor = new SchemaProcessor(cache,openAPI);
+        this.schemaProcessor = new SchemaProcessor(cache,openAPI, openapi31);
         this.exampleProcessor = new ExampleProcessor(cache,openAPI);
         this.externalRefProcessor = new ExternalRefProcessor(cache, openAPI);
     }
 
+
     public void processHeader(Header header) {
 
         if(header.get$ref() != null){
@@ -72,4 +76,4 @@ public void processHeader(Header header) {
             }
         }
     }
-}
+}

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

@@ -22,11 +22,13 @@ public class LinkProcessor {
     private final HeaderProcessor headerProcessor;
     private final ExternalRefProcessor externalRefProcessor;
 
-
     public LinkProcessor(ResolverCache cache, OpenAPI openAPI){
+        this (cache, openAPI, false);
+    }
+    public LinkProcessor(ResolverCache cache, OpenAPI openAPI, boolean openapi31){
         this.cache = cache;
         this.openAPI = openAPI;
-        this.headerProcessor = new HeaderProcessor(cache,openAPI);
+        this.headerProcessor = new HeaderProcessor(cache,openAPI, openapi31);
         this.externalRefProcessor = new ExternalRefProcessor(cache, openAPI);
     }
 

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

@@ -25,11 +25,14 @@ public class OperationProcessor {
     private final ExternalRefProcessor externalRefProcessor;
     private final ResolverCache cache;
 
-
     public OperationProcessor(ResolverCache cache, OpenAPI openAPI) {
-        this.parameterProcessor = new ParameterProcessor(cache, openAPI);
-        this.responseProcessor = new ResponseProcessor(cache,openAPI);
-        this.requestBodyProcessor = new RequestBodyProcessor(cache,openAPI);
+        this(cache, openAPI, false);
+    }
+
+    public OperationProcessor(ResolverCache cache, OpenAPI openAPI, boolean openapi31) {
+        this.parameterProcessor = new ParameterProcessor(cache, openAPI, openapi31);
+        this.responseProcessor = new ResponseProcessor(cache,openAPI, openapi31);
+        this.requestBodyProcessor = new RequestBodyProcessor(cache,openAPI, openapi31);
         this.externalRefProcessor = new ExternalRefProcessor(cache, openAPI);
         this.cache = cache;
     }
@@ -115,4 +118,4 @@ public void processOperation(Operation operation) {
             }
         }
     }
-}
+}