Skip to content

Commit 78a11e9

Browse files
committed
refs #4610 - deprecate and fix ArraySchema.items processing (switch to ArraySchema.schema)
1 parent 0d067d0 commit 78a11e9

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/media/ArraySchema.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@
3939
*
4040
* @since 2.2.12
4141
*
42+
* @deprecated since 2.2.21, use {@link #schema()} instead. Marked for removal in future versions.
4243
* @return items
4344
*/
44-
45+
@Deprecated
4546
Schema items() default @Schema;
4647

4748
/**

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2936,11 +2936,17 @@ private void resolveArraySchema(AnnotatedType annotatedType, ArraySchema schema,
29362936
schema.addPrefixItem(prefixItem);
29372937
}
29382938
}
2939+
// TODO `ArraySchema.items` is deprecated, when removed, remove this block
29392940
if (schema.getItems() != null && AnnotationsUtils.hasSchemaAnnotation(resolvedArrayAnnotation.items())) {
29402941
for (String type : resolvedArrayAnnotation.items().types()) {
29412942
schema.getItems().addType(type);
29422943
}
29432944
}
2945+
if (schema.getItems() != null && AnnotationsUtils.hasSchemaAnnotation(resolvedArrayAnnotation.schema())) {
2946+
for (String type : resolvedArrayAnnotation.schema().types()) {
2947+
schema.getItems().addType(type);
2948+
}
2949+
}
29442950
}
29452951
}
29462952
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
unevaluatedItems = @Schema(
1313
types = { "number" }
1414
),
15-
items = @Schema(
15+
schema = @Schema(
1616
types = { "string" }
1717
),
1818
prefixItems = {

0 commit comments

Comments
 (0)