Skip to content

feat(core): use openapi 3.1 spec fields #1931

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
timonback merged 1 commit into from
Oct 30, 2026
Merged

feat(core): use openapi 3.1 spec fields #1931

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
20 changes: 17 additions & 3 deletions ...lf-core/src/main/java/io/github/springwolf/core/asyncapi/schemas/SwaggerSchemaMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,24 @@ private static void assignType(Schema swaggerSchema, SchemaObject.SchemaObjectBu
Set<String> types = schemaTypes == null ? new HashSet<>() : new HashSet<>(schemaTypes);

String schemaType = swaggerSchema.getType();
if (schemaType == null) {
if (types.isEmpty()) {
// Leave type unset when the schema is composed and does not declare a concrete type
// (e.g. oneOf/anyOf/allOf without a base type).
return;
}
if (isNullable) {
types.add("null");
}
builder.type(types);
return;
}

if (!types.contains(schemaType)) {
// required while swagger v2 does not populate types. Leave type unset when the schema is composed
// and does not declare a concrete type (e.g. oneOf/anyOf/allOf without a base type).
if (schemaType != null) {
// required while swagger v2 does not populate types
if (isNullable) {
builder.type(Set.of(schemaType, "null"));
} else {
builder.type(Set.of(schemaType));
}
return;
Expand Down
16 changes: 15 additions & 1 deletion ...o/github/springwolf/core/asyncapi/components/DefaultComponentsServiceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,21 @@ void getStringSchemas() {
.build());
}

@Test
void getOpenApi31NullTypeSchemas() {
io.swagger.v3.oas.models.media.Schema<?> swaggerSchema = new io.swagger.v3.oas.models.media.Schema<>();
Set<String> types = Set.of(SchemaType.STRING.getValue(), SchemaType.NULL.getValue());
swaggerSchema.setTypes(types);
SwaggerSchemaMapper mapper = new SwaggerSchemaMapper(configProperties);

assertThat(mapper.mapSchema(swaggerSchema).getSchema())
.isEqualTo(SchemaObject.builder().type(types).build());

swaggerSchema.setType(SchemaType.STRING.getValue());
assertThat(mapper.mapSchema(swaggerSchema).getSchema())
.isEqualTo(SchemaObject.builder().type(types).build());
}

@Test
void getArraySchemas() {
componentsService.resolvePayloadSchema(ArrayFoo.class, CONTENT_TYPE_APPLICATION_JSON);
Expand Down Expand Up @@ -235,7 +250,6 @@ private static class NotSupportedFoo {
@Schema(
hidden = true, // currently not supported
defaultValue = "default", // currently not supported
nullable = true, // currently not supported
contains = Void.class, // currently not supported
additionalItems = Void.class, // currently not supported
additionalProperties = Schema.AdditionalPropertiesValue.TRUE, // currently not supported
Expand Down
Loading