oas 3.1 - test ref siblings: const, contentEncoding, contentMediaType

Author: gracekarina

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

@@ -4004,10 +4004,20 @@ public Schema getJsonSchema(ObjectNode node, String location, ParseResult result
 			}
 		}
 
-		//sets const value according to the schema type
-		// TODO check types
-		if (node.get("const") != null) {
-			schema.setConst(node.get("const"));
+		//const is a String
+		value = getString("const", node, false, location, result);
+		if (value != null) {
+			schema.setConst(value);
+		}
+
+		value = getString("contentEncoding", node, false, location, result);
+		if (value != null) {
+			schema.setContentEncoding(value);
+		}
+
+		value = getString("contentMediaType", node, false, location, result);
+		if (value != null) {
+			schema.setContentMediaType(value);
 		}
 
 		bool = getBoolean("readOnly", node, false, location, result);

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

@@ -280,7 +280,7 @@ public void testSiblingsReferenceJSONSchema2() {
         ParseOptions options = new ParseOptions();
         String refSibling = "openapi: 3.1.0\n" +
                 "info:\n" +
-                "  title: siblings JSONschema\n" +
+                "  title: siblings JSONSchema\n" +
                 "  version: 1.0.0\n" +
                 "servers:\n" +
                 "  - url: /\n" +
@@ -311,7 +311,7 @@ public void testSiblingsReferenceJSONSchema3() {
         ParseOptions options = new ParseOptions();
         String refSibling = "openapi: 3.1.0\n" +
                 "info:\n" +
-                "  title: siblings JSONschema\n" +
+                "  title: siblings JSONSchema\n" +
                 "  version: 1.0.0\n" +
                 "servers:\n" +
                 "  - url: /\n" +
@@ -339,5 +339,34 @@ public void testSiblingsReferenceJSONSchema3() {
         assertTrue(profile.getExclusiveMaximumValue().intValue()==12);
         assertTrue(profile.getExclusiveMinimumValue().intValue()==1);
         assertEquals(profile.get$comment(),"end user should not see this comment");
+        assertTrue(profile.getTypes().contains("string"));
+        assertTrue(profile.getTypes().contains("integer"));
+    }
+
+    @Test(description = "Test siblings with $ref for const, contentEncoding, contentMediaType")
+    public void testSiblingsReferenceJSONSchema4() {
+        ParseOptions options = new ParseOptions();
+        String refSibling = "openapi: 3.1.0\n" +
+                "info:\n" +
+                "  title: siblings JSONSchema\n" +
+                "  version: 1.0.0\n" +
+                "servers:\n" +
+                "  - url: /\n" +
+                "paths: { }\n" +
+                "components:\n" +
+                "  schemas:\n" +
+                "    profile:\n" +
+                "      const: sales\n" +
+                "      contentEncoding: base64\n" +
+                "      contentMediaType: text/html\n" +
+                "      $ref: ./ex.json#user-profile";
+        SwaggerParseResult result = new OpenAPIV3Parser().readContents( refSibling , null, options);
+        OpenAPI openAPI = result.getOpenAPI();
+        assertNotNull(openAPI);
+        Schema profile = openAPI.getComponents().getSchemas().get("profile");
+        assertNotNull(profile.get$ref());
+        assertEquals(profile.getConst(),"sales");
+        assertEquals(profile.getContentEncoding(),"base64");
+        assertEquals(profile.getContentMediaType(),"text/html");
     }
 }

modules/swagger-parser-v3/src/test/resources/3.1.0/schemaSiblings.yaml

@@ -8,13 +8,9 @@ paths: { }
 components:
   schemas:
     profile:
-      $id: profile-id
-      $anchor: foo
-      $schema: https://json-schema.org/draft/2020-12/schema
-      $comment: end user should not see this comment
-      type:
-        - string
-        - integer
-      exclusiveMaximum: 12
-      exclusiveMinimum: 1
+      const: sales
+      contentEncoding: base64
+      contentMediaType: text/html
+      contentSchema:
+        type: string
       $ref: ./ex.json#user-profile