added keys to set in oas3.1

Author: gracekarina

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

@@ -110,10 +110,8 @@ public class OpenAPIDeserializer {
 			"parameters", "examples", "requestBodies", "headers", "securitySchemes", "links", "callbacks"));
 	protected static Set<String> SCHEMA_KEYS = new LinkedHashSet<>(Arrays.asList("$ref", "title", "multipleOf",
 			"maximum", "format", "exclusiveMaximum", "minimum", "exclusiveMinimum", "maxLength", "minLength",
-			"pattern",
-			"maxItems", "minItems", "uniqueItems", "maxProperties", "minProperties", "required", "enum", "type",
-			"allOf",
-			"oneOf", "anyOf", "not", "items", "properties", "additionalProperties", "description", "format", "default",
+			"pattern", "maxItems", "minItems", "uniqueItems", "maxProperties", "minProperties", "required", "enum", "type",
+			"allOf", "oneOf", "anyOf", "not", "items", "properties", "additionalProperties", "description", "default",
 			"nullable", "discriminator", "readOnly", "writeOnly", "xml", "externalDocs", "example", "deprecated"));
 	protected static Set<String> EXAMPLE_KEYS = new LinkedHashSet<>(Arrays.asList("$ref", "summary", "description",
 			"value", "externalValue"));
@@ -136,64 +134,63 @@ public class OpenAPIDeserializer {
 
 	// 3.1
 	// TODO use a map instead for 3.0 and 3.1. Care about compatibility
-    // TODO OAS3.1 - ensure all OAS 3.1 new keywords are added to the various sets
 	protected static Set<String> ROOT_KEYS_31 = new LinkedHashSet<>(Arrays.asList("openapi", "info", "servers", "paths",
 			"components", "security", "tags", "externalDocs", "webhooks", "jsonSchemaDialect"));
-	protected static Set<String> RESERVED_KEYWORDS_31 = new LinkedHashSet<>(Arrays.asList("x-oai-","x-oas-"));
+	protected static Set<String> RESERVED_KEYWORDS_31 = new LinkedHashSet<>(Arrays.asList("x-oai-","x-oas-")); 
 	protected static Set<String> INFO_KEYS_31 = new LinkedHashSet<>(Arrays.asList("title","summary", "description", "termsOfService"
 			, "contact", "license", "version"));
 	protected static Set<String> CONTACT_KEYS_31 = new LinkedHashSet<>(Arrays.asList("name", "url", "email"));
 	protected static Set<String> LICENSE_KEYS_31 = new LinkedHashSet<>(Arrays.asList("name", "url", "identifier"));
-	protected static Set<String> TAG_KEYS_31 = new LinkedHashSet<>(Arrays.asList("description", "name", "externalDocs"));
+	protected static Set<String> TAG_KEYS_31 = new LinkedHashSet<>(Arrays.asList("description", "name", "externalDocs")); 
 	protected static Set<String> RESPONSE_KEYS_31 = new LinkedHashSet<>(Arrays.asList("$ref", "description", "headers",
-			"content", "links"));
+			"content", "links")); 
 	protected static Set<String> SERVER_KEYS_31 = new LinkedHashSet<>(Arrays.asList("url", "description", "variables"));
 	protected static Set<String> SERVER_VARIABLE_KEYS_31 = new LinkedHashSet<>(Arrays.asList("enum", "default",
-			"description"));
+			"description")); 
 	protected static Set<String> PATHITEM_KEYS_31 = new LinkedHashSet<>(Arrays.asList("$ref", "summary", "description",
-			"get", "put", "post", "delete", "head", "patch", "options", "trace", "servers", "parameters"));
+			"get", "put", "post", "delete", "head", "patch", "options", "trace", "servers", "parameters")); 
 	protected static Set<String> OPERATION_KEYS_31 = new LinkedHashSet<>(Arrays.asList("tags", "summary", "description",
 			"externalDocs", "operationId", "parameters", "requestBody", "responses", "callbacks", "deprecated",
 			"security",
-			"servers"));
+			"servers")); 
 	protected static Set<String> PARAMETER_KEYS_31 = new LinkedHashSet<>(Arrays.asList("$ref", "name", "in", "description"
 			, "required", "deprecated", "allowEmptyValue", "style", "explode", "allowReserved", "schema", "example",
 			"examples"
-			, "content"));
+			, "content")); 
 	protected static Set<String> REQUEST_BODY_KEYS_31 = new LinkedHashSet<>(Arrays.asList("$ref", "description", "content"
-			, "required"));
+			, "required")); 
 	protected static Set<String> SECURITY_SCHEME_KEYS_31 = new LinkedHashSet<>(Arrays.asList("$ref", "type", "name", "in"
-			, "description", "flows", "scheme", "bearerFormat", "openIdConnectUrl"));
-	protected static Set<String> EXTERNAL_DOCS_KEYS_31 = new LinkedHashSet<>(Arrays.asList("description", "url"));
+			, "description", "flows", "scheme", "bearerFormat", "openIdConnectUrl")); 
+	protected static Set<String> EXTERNAL_DOCS_KEYS_31 = new LinkedHashSet<>(Arrays.asList("description", "url")); 
 	protected static Set<String> COMPONENTS_KEYS_31 = new LinkedHashSet<>(Arrays.asList("schemas", "responses", "pathItems",
-			"parameters", "examples", "requestBodies", "headers", "securitySchemes", "links", "callbacks"));
-    // TODO OAS3.1 - ensure all schema 2020/12 + OAS 3.1 vocabulary keys are added
+			"parameters", "examples", "requestBodies", "headers", "securitySchemes", "links", "callbacks")); 
+
 	protected static Set<String> SCHEMA_KEYS_31 = new LinkedHashSet<>(Arrays.asList("$ref", "title", "multipleOf",
 			"maximum", "format", "exclusiveMaximum", "minimum", "exclusiveMinimum", "maxLength", "minLength",
-			"pattern",
-			"maxItems", "minItems", "uniqueItems", "maxProperties", "minProperties", "required", "enum", "type",
-			"allOf",
-			"oneOf", "anyOf", "not", "items", "properties", "additionalProperties", "patternProperties", "description",
-			"format", "default", "discriminator", "readOnly", "writeOnly", "xml", "externalDocs", "example", "deprecated",
-			"const", "examples", "$id", "$comment", "if", "then", "else", "unevaluatedProperties", "prefixItems"));
+			"pattern", "maxItems", "minItems", "uniqueItems", "maxProperties", "minProperties", "required", "enum", "type",
+			"allOf", "oneOf", "anyOf", "not", "items", "properties", "additionalProperties", "description",
+            "default", "discriminator", "readOnly", "writeOnly", "xml", "externalDocs", "example", "deprecated",
+			"const", "examples", "$id", "$comment", "if", "then", "else", "unevaluatedProperties", "prefixItems",
+            "contains","contentEncoding","contentMediaType","$anchor","$schema","contentSchema","propertyNames",
+            "dependentSchemas","dependentRequired","minContains","maxContains","patternProperties"));
 	protected static Set<String> EXAMPLE_KEYS_31 = new LinkedHashSet<>(Arrays.asList("$ref", "summary", "description",
-			"value", "externalValue"));
+			"value", "externalValue")); 
 	protected static Set<String> HEADER_KEYS_31 = new LinkedHashSet<>(Arrays.asList("$ref", "name", "in", "description",
 			"required", "deprecated", "allowEmptyValue", "style", "explode", "allowReserved", "schema", "example",
 			"examples",
 			"content"));
 	protected static Set<String> LINK_KEYS_31 = new LinkedHashSet<>(Arrays.asList("$ref", "operationRef", "operationId",
-			"parameters", "requestBody", "description", "server"));
+			"parameters", "requestBody", "description", "server")); 
 	protected static Set<String> MEDIATYPE_KEYS_31 = new LinkedHashSet<>(Arrays.asList("schema", "example", "examples",
-			"encoding"));
+			"encoding")); 
 	protected static Set<String> XML_KEYS_31 = new LinkedHashSet<>(Arrays.asList("name", "namespace", "prefix",
-			"attribute", "wrapped"));
+			"attribute", "wrapped")); 
 	protected static Set<String> OAUTHFLOW_KEYS_31 = new LinkedHashSet<>(Arrays.asList("authorizationUrl", "tokenUrl",
-			"refreshUrl", "scopes"));
+			"refreshUrl", "scopes")); 
 	protected static Set<String> OAUTHFLOWS_KEYS_31 = new LinkedHashSet<>(Arrays.asList("implicit", "password",
-			"clientCredentials", "authorizationCode"));
+			"clientCredentials", "authorizationCode")); 
 	protected static Set<String> ENCODING_KEYS_31 = new LinkedHashSet<>(Arrays.asList("contentType", "headers", "style",
-			"explode", "allowReserved"));
+			"explode", "allowReserved")); 
 
 	protected static Map<String, Map<String, Set<String>>> KEYS = new LinkedHashMap<>();