Skip to content

[openapi-normalizer] Better null check for schema types #16564

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

Merged
wing328 merged 1 commit into from
Sep 12, 2023
Merged

[openapi-normalizer] Better null check for schema types #16564

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
7 changes: 6 additions & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public void processRules(Map<String, String> inputRules) {

// loop through all the rules
for (Map.Entry<String, String> rule : inputRules.entrySet()) {
LOGGER.info("processing rule {} => {}", rule.getKey(), rule.getValue());
LOGGER.debug("processing rule {} => {}", rule.getKey(), rule.getValue());
if (!ruleNames.contains(rule.getKey())) { // invalid rule name
LOGGER.warn("Invalid openapi-normalizer rule name: ", rule.getKey());
} else if (enableAll) {
Expand Down Expand Up @@ -882,6 +882,11 @@ private Schema processNormalize31Spec(Schema schema, Set<Schema> visitedSchemas)
if (!getRule(NORMALIZE_31SPEC)) {
return schema;
}

if (schema == null || schema.getTypes() == null) {
return null;
}

// process null
if (schema.getTypes().contains("null")) {
schema.setNullable(true);
Expand Down