Skip to content

Fix :@Schema(type) emitting wrong type under OpenAPI 3.1 and ALL_OF sibling modes (#5233, #5235) #5304

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

Open
ewaostrowska wants to merge 8 commits into
base: master
Choose a base branch
from
+529 −2
Open

Fix :@Schema(type) emitting wrong type under OpenAPI 3.1 and ALL_OF sibling modes (#5233, #5235) #5304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
abecbe7
fix: correctly resolve schema type in ddTypeWhenSiblingsAllowed (#5235)
ewaostrowska Aug 26, 2026
d236e3f
clear derived format for explicit type
ewaostrowska Aug 27, 2026
87613ce
Revert "clear derived format for explicit type"
ewaostrowska Aug 27, 2026
df3c7f4
add tests
ewaostrowska Aug 27, 2026
e7b500b
add tests to document Schema(type) behavior
ewaostrowska Aug 28, 2026
cca7f7f
fix: apply explicit @Schema(type) to the types set under OpenAPI 3.1
Jul 15, 2026
e2f9c2d
apply explicit @Schema(type) to the types set under OpenAPI 3.1
ewaostrowska Aug 28, 2026
e0e5fb9
apply explicit @Schema(type) to the types set under OpenAPI 3.1
ewaostrowska Aug 28, 2026
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
12 changes: 10 additions & 2 deletions modules/swagger-core/src/main/java/io/swagger/v3/core/util/AnnotationsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
Expand Down Expand Up @@ -696,7 +697,11 @@ public static Optional<Schema> getSchemaFromAnnotation(
schemaObject.set$ref(schema.ref());
}
if (StringUtils.isNotBlank(schema.type())) {
schemaObject.setType(schema.type());
if (openapi31 && Void.class.equals(schema.implementation())) {
schemaObject.setTypes(new LinkedHashSet<>(Collections.singleton(schema.type())));
} else if (!openapi31) {
schemaObject.setType(schema.type());
}
}

if (schema.types().length > 0) {
Expand Down Expand Up @@ -3126,7 +3131,10 @@ public static AnnotatedType addTypeWhenSiblingsAllowed(AnnotatedType aType, io.s
if (!Void.class.equals(ctxSchema.implementation())) {
aType.setType(ctxSchema.implementation());
} else if (StringUtils.isNotBlank(ctxSchema.type())) {
aType.setType(ctxSchema.type().getClass());
Type schemaType = getSchemaType(ctxSchema, true);
if (schemaType != null) {
aType.setType(schemaType);
}
}
}
return aType;
Expand Down
Loading
Loading