fix: Fix missing items on nested @ArraySchema items in OAS 3.1 Resolves #4944 #4836

Author: ewaostrowska

modules/swagger-core/src/main/java/io/swagger/v3/core/util/AnnotationsUtils.java

@@ -548,7 +548,7 @@ public static Optional<Schema> getArraySchema(io.swagger.v3.oas.annotations.medi
 
         if (arraySchema.schema() != null) {
             if (arraySchema.schema().implementation().equals(Void.class)) {
-                getSchemaFromAnnotation(arraySchema.schema(), components, jsonViewAnnotation, openapi31).ifPresent(arraySchemaObject::setItems);
+                getSchemaFromAnnotation(arraySchema.schema(), components, jsonViewAnnotation, openapi31, arraySchemaObject.getItems()).ifPresent(arraySchemaObject::setItems);
             } else if (processSchemaImplementation) {
                 getSchema(arraySchema.schema(), arraySchema, false, arraySchema.schema().implementation(), components, jsonViewAnnotation, openapi31).ifPresent(arraySchemaObject::setItems);
             }

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

@@ -85,6 +85,26 @@ public void testOAS31Fields() {
                 "  properties:\n" +
                 "    billingAddress:\n" +
                 "      type: string\n" +
+                "    acceptingCountries:\n" +
+                "      type: array\n" +
+                "      items:\n" +
+                "        type: string\n" +
+                "        description: accepting country\n" +
+                "        enum:\n" +
+                "        - UNITED_STATES_OF_AMERICA\n" +
+                "        - CANADA\n" +
+                "      uniqueItems: true\n" +
+                "    availableCurrencies:\n" +
+                "      type: array\n" +
+                "      items:\n" +
+                "        $ref: \"#/components/schemas/Currency\"\n" +
+                "        description: available currencies\n" +
+                "      uniqueItems: true\n" +
+                "Currency:\n" +
+                "  type: object\n" +
+                "  properties:\n" +
+                "    currencyCode:\n" +
+                "      type: string\n" +
                 "ModelWithOAS31Stuff:\n" +
                 "  type: object\n" +
                 "  $comment: Random comment at schema level\n" +

modules/swagger-core/src/test/java/io/swagger/v3/core/resolving/v31/model/CreditCard.java

@@ -1,8 +1,15 @@
 package io.swagger.v3.core.resolving.v31.model;
 
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.util.Set;
+
 public class CreditCard {
 
     private String billingAddress;
+    private Set<Address.CountryEnum> acceptingCountries;
+    private Set<Currency> availableCurrencies;
 
     public String getBillingAddress() {
         return billingAddress;
@@ -11,4 +18,22 @@ public String getBillingAddress() {
     public void setBillingAddress(String billingAddress) {
         this.billingAddress = billingAddress;
     }
+
+    @ArraySchema(schema = @Schema(description = "accepting country"))
+    public Set<Address.CountryEnum> getAcceptingCountries() {
+        return acceptingCountries;
+    }
+
+    public void setAcceptingCountries(Set<Address.CountryEnum> acceptingCountries) {
+        this.acceptingCountries = acceptingCountries;
+    }
+
+    @ArraySchema(schema = @Schema(description = "available currencies"))
+    public Set<Currency> getAvailableCurrencies() {
+        return availableCurrencies;
+    }
+
+    public void setAvailableCurrencies(Set<Currency> availableCurrencies) {
+        this.availableCurrencies = availableCurrencies;
+    }
 }

modules/swagger-core/src/test/java/io/swagger/v3/core/resolving/v31/model/Currency.java

@@ -0,0 +1,14 @@
+package io.swagger.v3.core.resolving.v31.model;
+
+public class Currency {
+
+    private String currencyCode;
+
+    public String getCurrencyCode() {
+        return currencyCode;
+    }
+
+    public void setCurrencyCode(String currencyCode) {
+        this.currencyCode = currencyCode;
+    }
+}