Skip to content

fixes #46 update openapi and inject merge to return inject if openapi… #47

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
merged 1 commit into from
Apr 4, 2024
Merged

fixes #46 update openapi and inject merge to return inject if openapi… #47

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
10 changes: 8 additions & 2 deletions src/main/java/com/networknt/openapi/OpenApiHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,19 @@ public OpenApiHelper(String spec) {
* @param openapi {@link Map} openapi
* @param inject {@link Map} openapi
*/
public static void merge(Map<String, Object> openapi, Map<String, Object> inject) {
public static Map<String, Object> merge(Map<String, Object> openapi, Map<String, Object> inject) {
if(openapi == null) {
// in the case of light-gateway with multiple specs disabled, openapi is null,
// but we still need the validation for the admin endpoint access.
return inject;
}
if (inject == null) {
return;
return openapi;
}
for (Map.Entry<String, Object> entry : inject.entrySet()) {
openapi.merge(entry.getKey(), entry.getValue(), new Merger());
}
return openapi;
}

// merge in case of map, add in case of list
Expand Down