oas 3.1 - test for exclusiveMaximum and ExclusiveMinimun

Author: gracekarina

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

@@ -4053,6 +4053,26 @@ public Schema getJsonSchema(ObjectNode node, String location, ParseResult result
 			schema.setDeprecated(bool);
 		}
 
+		value = getString("$anchor", node, false, location, result);
+		if (value != null) {
+			schema.set$anchor(value);
+		}
+
+		value = getString("$id", node, false, location, result);
+		if (value != null) {
+			schema.set$id(value);
+		}
+
+		value = getString("$schema", node, false, location, result);
+		if (value != null) {
+			schema.set$schema(value);
+		}
+
+		value = getString("$comment", node, false, location, result);
+		if (value != null) {
+			schema.set$comment(value);
+		}
+
 		Map<String, Object> extensions = getExtensions(node);
 		if (extensions != null && extensions.size() > 0) {
 			schema.setExtensions(extensions);

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

@@ -240,7 +240,7 @@ public void testSiblingsReferenceObjects() {
     }
 
     @Test(description = "Test siblings with $ref for maxItems, properties, description, required")
-    public void testSiblingsReferenceJSONSchema() {
+    public void testSiblingsReferenceJSONSchema1() {
         ParseOptions options = new ParseOptions();
         String refSibling = "openapi: 3.1.0\n" +
                 "info:\n" +
@@ -274,4 +274,70 @@ public void testSiblingsReferenceJSONSchema() {
         assertTrue(profile.getProperties().containsKey("login"));
         assertTrue(profile.getProperties().containsKey("password"));
     }
+
+    @Test(description = "Test siblings with $ref for patternProperties, pattern, additionalProperties")
+    public void testSiblingsReferenceJSONSchema2() {
+        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" +
+                "      $ref: ./ex.json#user-profile\n" +
+                "      pattern: \\d\\d\\d\\d-\\d\\d-\\d\\d\n" +
+                "      patternProperties:\n" +
+                "        \"^S_\":\n" +
+                "          type: string\n" +
+                "        \"^I_\":\n" +
+                "          type: integer\n" +
+                "      additionalProperties: false";
+        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.getPattern(),"\\d\\d\\d\\d-\\d\\d-\\d\\d");
+        assertNotNull(profile.getAdditionalProperties());
+        assertTrue(profile.getPatternProperties().containsKey("^S_"));
+    }
+
+    @Test(description = "Test siblings with $ref for patternProperties, pattern, additionalProperties")
+    public void testSiblingsReferenceJSONSchema3() {
+        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" +
+                "      $id: profile-id\n" +
+                "      $anchor: foo\n" +
+                "      $schema: https://json-schema.org/draft/2020-12/schema\n" +
+                "      $comment: end user should not see this comment\n" +
+                "      type:\n" +
+                "        - string\n" +
+                "        - integer\n" +
+                "      exclusiveMaximum: 12\n" +
+                "      exclusiveMinimum: 1\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.get$anchor(),"foo");
+        assertEquals(profile.get$id(),"profile-id");
+        assertTrue(profile.getExclusiveMaximumValue().intValue()==12);
+        assertTrue(profile.getExclusiveMinimumValue().intValue()==1);
+        assertEquals(profile.get$comment(),"end user should not see this comment");
+    }
 }

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

@@ -8,14 +8,13 @@ paths: { }
 components:
   schemas:
     profile:
-      description: siblings refs
-      required:
-        - login
-        - password
-      maxItems: 2
-      $ref: ./ex.json#user-profile
-      properties:
-        login:
-          type: string
-        password:
-          type: string
+      $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
+      $ref: ./ex.json#user-profile