Skip to content

#1267 - fix ArrayModel parsing to handle "uniqueItems" flag #1268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 18, 2019
Merged

#1267 - fix ArrayModel parsing to handle "uniqueItems" flag #1268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,12 @@ public Model definition(ObjectNode node, String location, ParseResult result) {

Integer minItems = getInteger("minItems", node, false, location, result);
am.setMinItems(minItems);


Boolean uniqueItems = getBoolean("uniqueItems", node, false, location, result);
if(uniqueItems != null) {
am.setUniqueItems(uniqueItems);
}

// add xml specific information if available
JsonNode xml = node.get("xml");
if(xml != null) {
Expand Down
48 changes: 48 additions & 0 deletions modules/swagger-parser/src/test/java/io/swagger/parser/util/SwaggerDeserializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,54 @@ public void testArrayModelDefinition() {
assertTrue(response instanceof MapProperty);
}

@Test
public void testArrayModelWithUniqueItems() {
String json = "{\n" +
" \"swagger\": \"2.0\",\n" +
" \"info\": {\n" +
" \"title\": \"foo\"\n" +
" },\n" +
" \"paths\": {\n" +
" \"/test\": {\n" +
" \"post\": {\n" +
" \"parameters\": [\n" +
" {\n" +
" \"name\": \"AnyName\",\n" +
" \"in\": \"body\",\n" +
" \"schema\": {\n" +
" \"type\": \"array\",\n" +
" \"uniqueItems\": true,\n" +
" \"items\": {\n" +
" \"type\": \"string\"\n" +
" }\n" +
" }\n" +
" }\n" +
" ],\n" +
" \"responses\": {\n" +
" \"200\": {\n" +
" \"description\": \"ok\"\n" +
" }\n" +
" }\n" +
" }\n" +
" }\n" +
" }\n" +
"}";

SwaggerParser parser = new SwaggerParser();
SwaggerDeserializationResult result = parser.readWithInfo(json);
Parameter parameter = result.getSwagger().getPath("/test")
.getPost().getParameters().get(0);

assertTrue(parameter instanceof BodyParameter);
BodyParameter bodyParameter = (BodyParameter) parameter;

Model model = bodyParameter.getSchema();
assertTrue(model instanceof ArrayModel);
ArrayModel arrayModel = (ArrayModel) model;
assertNotNull(arrayModel.getUniqueItems());
assertTrue(arrayModel.getUniqueItems());
}

@Test
public void testArrayQueryParam() throws Exception {
String json = "{\n" +
Expand Down