Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix 3.1 schema deserialization #4318

Merged
merged 1 commit into from
Nov 28, 2022
Merged

fix: fix 3.1 schema deserialization #4318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions modules/swagger-core/src/main/java/io/swagger/v3/core/util/ModelDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion modules/swagger-models/src/main/java/io/swagger/v3/oas/models/links/LinkParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Schema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand Down