Skip to content

Commit 90e0536

Browse files
prevent false positives when no zconExtension present
1 parent 05f1db9 commit 90e0536

File tree

1 file changed

+2
-2
lines changed
  • dev/io.openliberty.microprofile.openapi.2.0.internal/src/io/openliberty/microprofile/openapi20/internal/merge

1 file changed

+2
-2
lines changed

dev/io.openliberty.microprofile.openapi.2.0.internal/src/io/openliberty/microprofile/openapi20/internal/merge/MergeProcessorImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,8 +679,8 @@ private static boolean serverEndsWithContextRoot(Server server, String contextRo
679679

680680
private static boolean isZConRolesAllowedIdentical(List<InProgressModel> models) {
681681
List<Object> zconExtensions = models.stream().map(d -> d.model.getExtensions())
682-
.filter(Objects::nonNull).map(e -> e.get("x-ibm-zcon-roles-allowed")).collect(toList());
683-
return models.size() == zconExtensions.size() && allEqual(zconExtensions, ModelEquality::equals);
682+
.filter(Objects::nonNull).map(e -> e.get("x-ibm-zcon-roles-allowed")).filter(Objects::nonNull).collect(toList());
683+
return zconExtensions.size() >= 1 && models.size() == zconExtensions.size() && allEqual(zconExtensions, ModelEquality::equals);
684684
}
685685

686686
private static boolean isSecurityIdentical(List<InProgressModel> models) {

0 commit comments

Comments
 (0)