test for new keys in schema 202012

Author: gracekarina

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

@@ -133,7 +133,6 @@ public class OpenAPIDeserializer {
 			"explode", "allowReserved"));
 
 	// 3.1
-	// TODO use a map instead for 3.0 and 3.1. Care about compatibility
 	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-")); 
@@ -170,7 +169,7 @@ public class OpenAPIDeserializer {
 			"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",
+			"const", "examples", "$id", "$comment", "if", "then", "else", "unevaluatedProperties","unevaluatedItems", "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",

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/test/OAI31DeserializationTest.java

@@ -1,5 +1,7 @@
 package io.swagger.v3.parser.test;
 
+import io.swagger.v3.core.util.Yaml;
+import io.swagger.v3.core.util.Yaml31;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
@@ -14,6 +16,46 @@
 
 public class OAI31DeserializationTest {
 
+    @Test(description = "Test OAS31 new Schema keys deserialization")
+    public void testSchemaKeysOAS31() {
+        SwaggerParseResult result = new OpenAPIV3Parser().readLocation( "3.1.0/petstore-3.1_more.yaml", null, null);
+        assertNotNull(result.getOpenAPI());
+        OpenAPI openAPI = result.getOpenAPI();
+
+        assertTrue(result.getMessages().size() == 0);
+        Schema schema2020_12 = openAPI.getComponents().getSchemas().get("Schema2020_12");
+        assertEquals(schema2020_12.getConst(), "const text");
+        assertEquals(schema2020_12.get$id(), "schemaId");
+        assertEquals(schema2020_12.get$comment(), "comment for testing");
+        assertNotNull(schema2020_12.getIf().getProperties().get("country"));
+        assertNotNull(schema2020_12.getThen().getProperties().get("maple_trees"));
+        assertNotNull(schema2020_12.getElse().getProperties().get("accept"));
+        assertTrue(schema2020_12.getUnevaluatedProperties() instanceof Schema);
+        Schema unevaluatedProperty = (Schema)schema2020_12.getUnevaluatedProperties();
+        assertTrue(unevaluatedProperty.getTypes().contains("object"));
+        assertEquals(schema2020_12.getContentMediaType(), "text/html");
+        assertEquals(schema2020_12.get$anchor(), "anchor text");
+        assertEquals(schema2020_12.get$schema(), "https://json-schema.org/draft/2020-12/schema");
+        assertNotNull(schema2020_12.getExamples().get(0));
+        assertEquals(schema2020_12.getContentEncoding(), "base64");
+        assertEquals(schema2020_12.getMinContains(), Integer.valueOf(2));
+        assertEquals(schema2020_12.getMaxContains(), Integer.valueOf(4));
+        assertTrue(schema2020_12.getPrefixItems().get(0) instanceof Schema);
+        Schema prefixItems = (Schema)schema2020_12.getPrefixItems().get(0);
+        assertEquals(prefixItems.getDescription(), "Name");
+        assertTrue(schema2020_12.getContains().getTypes().contains("integer"));
+        assertTrue(schema2020_12.getContentSchema().getTypes().contains("string"));
+        assertEquals(schema2020_12.getPropertyNames().getPattern(), "^[A-Za-z_][A-Za-z0-9_]*$");
+        assertTrue(schema2020_12.getDependentSchemas().get("credit_card") instanceof Schema);
+        Schema dependantSchema = (Schema)schema2020_12.getDependentSchemas().get("credit_card");
+        assertEquals(dependantSchema.getRequired().get(0), "billing_address");
+        assertTrue(schema2020_12.getDependentRequired().containsKey("credit_card"));
+        assertTrue(schema2020_12.getPatternProperties().get("^S_") instanceof Schema);
+        Schema patternProperties = (Schema)schema2020_12.getPatternProperties().get("^S_");
+        assertTrue(schema2020_12.getUnevaluatedItems().getTypes().contains("object"));
+        assertTrue(patternProperties.getTypes().contains("string"));
+    }
+
     @Test(description = "Test basic OAS31 deserialization/validation")
     public void testBasicOAS31() {
         SwaggerParseResult result = new OpenAPIV3Parser().readLocation( "3.1.0/test/basicOAS31.yaml", null, null);
@@ -67,7 +109,6 @@ public void testBasicOAS31() {
         //$ref siblings
         assertNotNull(openAPI.getComponents().getSchemas().get("Pet").get$ref());
         assertNotNull(openAPI.getComponents().getSchemas().get("Pet").getProperties());
-
     }
 
     @Test(description = "Test basic OAS30 deserialization/validation if added the fields of OAS3.1")
@@ -558,9 +599,9 @@ public void testSiblingsReferenceJSONSchema5() {
         assertNotNull(patientPersonSchema.getUnevaluatedProperties());
         assertTrue(patientPersonSchema.getUnevaluatedProperties() instanceof Boolean);
         assertFalse(((Boolean)patientPersonSchema.getUnevaluatedProperties()).booleanValue());
-
         //unevaluatedItems
         assertNotNull(profile.getUnevaluatedItems());
+
     }
 
     @Test(description = "Test siblings with $ref for if - then - else, dependentRequired, dependentSchemas")
@@ -656,6 +697,7 @@ public void testSiblingsReferenceJSONSchema6() {
         //dependentSchemas
         assertNotNull(openAPI.getComponents().getSchemas().get("PaymentMethod"));
         Schema paymentMethod = openAPI.getComponents().getSchemas().get("PaymentMethod");
+
     }
 
     @Test(description = "Test examples in JSONSchema")

modules/swagger-parser-v3/src/test/resources/3.1.0/petstore-3.1_more.yaml

@@ -119,6 +119,78 @@ components:
         $ref: "#/components/schemas/Pet"
         description: desc
         format: int32
+    Schema2020_12:
+      type: object
+      title: schema 2020-12
+      required:
+        - country
+      properties:
+        country:
+          enum:
+            - usa
+            - canada
+            - eu
+          default: eu
+          type: string
+          widget: Select
+      if:
+        properties:
+          country:
+            const: canada
+            type: string
+      then:
+        properties:
+          maple_trees:
+            type: number
+      else:
+        required:
+          - accept
+        properties:
+          accept:
+            const: "true"
+            type: boolean
+      const: const text
+      examples:
+        - sample1 
+        - sample2
+      $id: schemaId
+      $comment: comment for testing
+      propertyNames:
+        pattern: "^[A-Za-z_][A-Za-z0-9_]*$"
+      unevaluatedProperties:
+        type: object
+      unevaluatedItems:
+        type: object
+      prefixItems:
+        - description: Name
+          type: string
+        - description: Age
+          type: integer
+      contains:
+        type: integer
+      maxContains: 4
+      minContains: 2
+      $anchor: anchor text
+      $schema: https://json-schema.org/draft/2020-12/schema
+      contentSchema:
+        type: string
+      dependentSchemas:
+        credit_card:
+          required:
+            - billing_address
+          properties:
+            billing_address:
+              type: string
+      dependentRequired:
+        credit_card:
+          - billing_address
+      patternProperties:
+        ^S_:
+          type: string
+        ^I_:
+          type: integer
+      contentEncoding: base64
+      contentMediaType: text/html
     Error:
       required:
         - code