Merge pull request payara#5146 from AlanRoth/FISH-1158

FISH-1158 OpenAPI document creation failed when using @Schema annotation with Enum missing a nullcheck
Pandrex247 · Mar 3, 2021 · 820fd43 · 820fd43
1 parent f148dff
commit 820fd43
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...i/src/main/java/fish/payara/microprofile/openapi/impl/processor/ApplicationProcessor.java b/...i/src/main/java/fish/payara/microprofile/openapi/impl/processor/ApplicationProcessor.java
@@ -511,7 +511,7 @@ private void vistEnumClass(AnnotationModel schemaAnnotation, EnumType enumType,
         if (schema != null) {
             SchemaImpl.merge(schema, newSchema, true, context);
         }
-        if (schema == null || schema.getEnumeration().isEmpty()) {
+        if (schema == null || schema.getEnumeration() == null || schema.getEnumeration().isEmpty()) {
             //if the schema annotation does not specify enums, then all enum fields will be added
             for (FieldModel enumField : enumType.getStaticFields()) {
                 final String enumValue = enumField.getName();