From 2332744093008123bbfd17a3d08f4f6e068c7c20 Mon Sep 17 00:00:00 2001 From: frantuma Date: Mon, 26 Jun 2023 18:18:53 +0200 Subject: [PATCH] add missing 3.1 fields --- .../swagger/v3/parser/util/OpenAPIDeserializer.java | 12 +++++++++++- pom.xml | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java index a289916bf1..f193aa4c05 100644 --- a/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java +++ b/modules/swagger-parser-v3/src/main/java/io/swagger/v3/parser/util/OpenAPIDeserializer.java @@ -173,7 +173,7 @@ public class OpenAPIDeserializer { "default", "discriminator", "readOnly", "writeOnly", "xml", "externalDocs", "example", "deprecated", "const", "examples", "$id", "$comment", "if", "then", "else", "unevaluatedProperties","unevaluatedItems", "prefixItems", "contains","contentEncoding","contentMediaType","$anchor","$schema","contentSchema","propertyNames", - "dependentSchemas","dependentRequired","minContains","maxContains","patternProperties")); + "dependentSchemas","dependentRequired","minContains","maxContains","patternProperties", "$vocabulary", "$dynamicAnchor")); protected static Set EXAMPLE_KEYS_31 = new LinkedHashSet<>(Arrays.asList("$ref", "summary", "description", "value", "externalValue")); protected static Set HEADER_KEYS_31 = new LinkedHashSet<>(Arrays.asList("$ref", "name", "in", "description", @@ -4180,6 +4180,16 @@ public Schema getJsonSchema(JsonNode jsonNode, String location, ParseResult resu schema.set$anchor(value); } + value = getString("$vocabulary", node, false, location, result); + if (value != null) { + schema.set$vocabulary(value); + } + + value = getString("$dynamicAnchor", node, false, location, result); + if (value != null) { + schema.set$dynamicAnchor(value); + } + value = getString("$id", node, false, location, result); if (value != null) { schema.set$id(value); diff --git a/pom.xml b/pom.xml index 457592d0c6..005ca358c6 100644 --- a/pom.xml +++ b/pom.xml @@ -411,7 +411,7 @@ 1.0.67 2.11.0 1.7.36 - 2.2.10 + 2.2.14 1.6.11 4.13.2 7.7.1