fix: reattach enumAsRef for ArraySchema in OAS 3.1

Author: ewaostrowska

modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java

@@ -540,6 +540,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
                         .propertyName(annotatedType.getPropertyName())
                         .jsonViewAnnotation(annotatedType.getJsonViewAnnotation())
                         .components(annotatedType.getComponents())
+                        .resolveEnumAsRef(annotatedType.isResolveEnumAsRef())
                         .parent(annotatedType.getParent()));
 
                 if (items == null) {

modules/swagger-core/src/test/java/io/swagger/v3/core/resolving/EnumTest.java

@@ -52,7 +52,7 @@ public void testEnumGenerics() {
     }
 
     @Test
-    public void testEnumPropertyWithSchemaAnnotation31() {
+    public void testEnumPropertyWithSchemaAnnotation() {
         final ModelResolver modelResolver = new ModelResolver(mapper()).openapi31(true);
         final ModelConverterContextImpl context = new ModelConverterContextImpl(modelResolver);
 
@@ -65,20 +65,6 @@ public void testEnumPropertyWithSchemaAnnotation31() {
         assertEquals(enumPropertySchema.getDescription(), "Property description");
     }
 
-    @Test
-    public void testEnumPropertyWithSchemaAnnotation30() {
-        final ModelResolver modelResolver = new ModelResolver(mapper()).openapi31(false);
-        final ModelConverterContextImpl context = new ModelConverterContextImpl(modelResolver);
-
-        final Schema model = context.resolve(new AnnotatedType().type(ClassWithEnumAsRefProperty.class));
-        assertBasicModelStructure(model, "ClassWithEnumAsRefProperty");
-        assertPropertyExists(model, "enumWithSchemaProperty");
-
-        final Schema enumPropertySchema = (Schema) model.getProperties().get("enumWithSchemaProperty");
-        assertEnumAsRefProperty(enumPropertySchema, "#/components/schemas/EnumWithSchemaProperty");
-
-    }
-
     @Test
     public void testEnumPropertyWithGlobalSwitchOnlyOpenApi31() {
         ModelResolver.enumsAsRef = true;
@@ -100,6 +86,36 @@ public void testEnumPropertyWithGlobalSwitchOnlyOpenApi31() {
         ModelResolver.enumsAsRef = false;
     }
 
+    @Test
+    public void testArrayOfEnumWithSchemaAnnotationOpenApi31() {
+        final ModelResolver modelResolver = new ModelResolver(mapper()).openapi31(true);
+        final ModelConverterContextImpl context = new ModelConverterContextImpl(modelResolver);
+
+        final Schema model = context.resolve(new AnnotatedType().type(ClassWithEnumArray.class));
+        assertBasicModelStructure(model, "ClassWithEnumArray");
+        assertPropertyExists(model, "enumArray");
+
+        final Schema arrayPropertySchema = (Schema) model.getProperties().get("enumArray");
+        assertArrayWithEnumRef(arrayPropertySchema);
+
+        assertEnumComponentExists(context, ClassWithEnumArray.ArrayEnum.values(), "Enum description");
+    }
+
+    @Test
+    public void testArrayOfEnumWithSchemaAnnotationOpenApi30() {
+        final ModelResolver modelResolver = new ModelResolver(mapper()).openapi31(false);
+        final ModelConverterContextImpl context = new ModelConverterContextImpl(modelResolver);
+
+        final Schema model = context.resolve(new AnnotatedType().type(ClassWithEnumArray.class));
+        assertBasicModelStructure(model, "ClassWithEnumArray");
+        assertPropertyExists(model, "enumArray");
+
+        final Schema arrayPropertySchema = (Schema) model.getProperties().get("enumArray");
+        assertArrayWithEnumRef(arrayPropertySchema);
+
+        assertEnumComponentExists(context, ClassWithEnumArray.ArrayEnum.values(), "Enum description");
+    }
+
     @Test
     public void testControlTestNoRefOpenApi31() {
         ModelResolver.enumsAsRef = false;
@@ -199,6 +215,18 @@ private void assertEnumComponentExists(ModelConverterContextImpl context, Enum<?
         assertEquals(enumComponent.getDescription(), expectedDescription);
     }
 
+    private void assertEnumComponentExistsWithDefault(ModelConverterContextImpl context, Enum<?>[] enumValues, String expectedDescription, String expectedDefault) {
+        assertEnumComponentExists(context, enumValues, expectedDescription);
+
+        Map<String, Schema> components = context.getDefinedModels();
+        Set<String> expected = Arrays.stream(enumValues)
+                .map(Enum::name)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+
+        Schema enumComponent = findEnumComponent(components, expected);
+        assertEquals(enumComponent.getDefault(), expectedDefault);
+    }
+
     private Schema findEnumComponent(Map<String, Schema> components, Set<String> expectedValues) {
         return components.values().stream()
                 .filter(Objects::nonNull)
@@ -222,6 +250,12 @@ private void assertInlineEnumProperty(Schema propertySchema) {
         assertNull(propertySchema.get$ref());
     }
 
+    private void assertArrayWithEnumRef(Schema arrayPropertySchema) {
+        assertNotNull(arrayPropertySchema.getItems());
+        assertNotNull(arrayPropertySchema.getItems().get$ref());
+    }
+
+
     public static class ClassWithEnumAsRefProperty {
 
         @io.swagger.v3.oas.annotations.media.Schema(enumAsRef = true, description = "Property description", maximum = "1923234")
@@ -238,6 +272,23 @@ public enum EnumWithSchemaProperty {
         }
     }
 
+    public static class ClassWithEnumArray {
+
+        @io.swagger.v3.oas.annotations.media.ArraySchema(schema = @io.swagger.v3.oas.annotations.media.Schema(enumAsRef = true, description = "Property Description"))
+        public final ArrayEnum[] enumArray;
+
+        public ClassWithEnumArray(ArrayEnum[] enumArray) {
+            this.enumArray = enumArray;
+        }
+
+        @io.swagger.v3.oas.annotations.media.Schema(description = "Enum description")
+        public enum ArrayEnum {
+            FIRST,
+            SECOND,
+            THIRD
+        }
+    }
+
     public static class ClassWithPlainEnum {
 
         @io.swagger.v3.oas.annotations.media.Schema(description = "Plain enum property")