fix: fix 3.1 schema deserialization

swagger-api · Nov 28, 2022 · d225adb · d225adb
1 parent 5485ceb
commit d225adb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/modules/swagger-core/src/main/java/io/swagger/v3/core/util/ModelDeserializer.java b/modules/swagger-core/src/main/java/io/swagger/v3/core/util/ModelDeserializer.java
@@ -152,8 +152,12 @@ private Schema deserializeJsonSchema(JsonNode node) {
  }
  if (additionalProperties != null) {
  try {
- Schema innerSchema = Json31.mapper().convertValue(additionalProperties, JsonSchema.class);
- schema.setAdditionalProperties(innerSchema);
+ if (additionalProperties.isBoolean()) {
+ schema.setAdditionalProperties(additionalProperties.booleanValue());
+ } else {
+ Schema innerSchema = deserializeJsonSchema(additionalProperties);
+ schema.setAdditionalProperties(innerSchema);
+ }
  } catch (Exception e) {
  Boolean additionalPropsBoolean = Json31.mapper().convertValue(additionalProperties, Boolean.class);
  schema.setAdditionalProperties(additionalPropsBoolean);

diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/links/LinkParameter.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/links/LinkParameter.java
@@ -7,7 +7,6 @@
 /**
  * LinkParameter
  *
- * @see "https://github.com/OAI/OpenAPI-Specification/blob/3.0.1/versions/3.0.1.md#linkOParametersbject"
  */
 
 public class LinkParameter {

diff --git a/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Schema.java b/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Schema.java
@@ -1,7 +1,6 @@
 package io.swagger.v3.oas.models.media;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.v3.oas.models.annotations.OpenAPI30;
 import io.swagger.v3.oas.models.annotations.OpenAPI31;
 import io.swagger.v3.oas.models.Components;
@@ -49,6 +48,7 @@ public class Schema<T> {
  private Integer maxProperties = null;
  private Integer minProperties = null;
  private List<String> required = null;
+ @OpenAPI30
  private String type = null;
  private Schema not = null;
  private Map<String, Schema> properties = null;