Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ public Boolean hasRequiredMarker(AnnotatedMember m) {
return ann.required();
}
}
ArraySchema arraySchema = m.getAnnotation(ArraySchema.class);
if (arraySchema != null) {
if (arraySchema.schema().required()) {
return arraySchema.schema().required();
}
}
return null;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import io.swagger.v3.jaxrs2.resources.Ticket2794Resource;
import io.swagger.v3.jaxrs2.resources.Ticket2806Resource;
import io.swagger.v3.jaxrs2.resources.Ticket2818Resource;
import io.swagger.v3.jaxrs2.resources.Ticket2848Resource;
import io.swagger.v3.jaxrs2.resources.UserAnnotationResource;
import io.swagger.v3.jaxrs2.resources.extensions.ExtensionsResource;
import io.swagger.v3.jaxrs2.resources.extensions.OperationExtensionsResource;
Expand Down Expand Up @@ -1220,6 +1221,39 @@ public Optional<Operation> filterOperation(Operation operation, ApiDescription a
return super.filterOperation(operation, api, params, cookies, headers);
}
}

@Test(description = "array schema required property")
public void testTicket2848() {
Reader reader = new Reader(new OpenAPI());

OpenAPI openAPI = reader.read(Ticket2848Resource.class);
String yaml = "openapi: 3.0.1\n" +
"paths:\n" +
" /:\n" +
" get:\n" +
" operationId: getter\n" +
" responses:\n" +
" default:\n" +
" description: default response\n" +
" content:\n" +
" '*/*':\n" +
" schema:\n" +
" $ref: '#/components/schemas/Town'\n" +
"components:\n" +
" schemas:\n" +
" Town:\n" +
" required:\n" +
" - streets\n" +
" type: object\n" +
" properties:\n" +
" streets:\n" +
" minItems: 1\n" +
" uniqueItems: true\n" +
" type: array\n" +
" items:\n" +
" type: string\n";
SerializationMatchers.assertEqualsToYaml(openAPI, yaml);
}
}


Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package io.swagger.v3.jaxrs2.resources;

import io.swagger.v3.oas.annotations.media.ArraySchema;
import io.swagger.v3.oas.annotations.media.Schema;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import java.util.List;

@Path("/")
public class Ticket2848Resource {
@GET
public Town getter() {
return null;
}

public static class Town {
@ArraySchema( schema = @Schema(required = true), minItems = 1,uniqueItems = true )
public List<String> streets;
}



}