Skip to content

Commit e45c539

Browse files
committed
1 parent 363489d commit e45c539

File tree

1 file changed

+10
-0
lines changed
  • core/src/main/java/org/openapitools/openapidiff/core/compare

1 file changed

+10
-0
lines changed

core/src/main/java/org/openapitools/openapidiff/core/compare/SchemaDiff.java

+10
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,16 @@ protected static Schema<?> addSchema(Schema<?> schema, Schema<?> fromSchema) {
154154
}
155155
schema.getExtensions().putAll(fromSchema.getExtensions());
156156
}
157+
if (fromSchema instanceof ComposedSchema && schema instanceof ComposedSchema) {
158+
ComposedSchema composedFromSchema = (ComposedSchema) fromSchema;
159+
ComposedSchema composedSchema = (ComposedSchema) schema;
160+
if (composedFromSchema.getOneOf() != null) {
161+
if (composedSchema.getOneOf() == null) {
162+
composedSchema.setOneOf(new ArrayList<>());
163+
}
164+
composedSchema.getOneOf().addAll(composedFromSchema.getOneOf());
165+
}
166+
}
157167
if (fromSchema.getDiscriminator() != null) {
158168
if (schema.getDiscriminator() == null) {
159169
schema.setDiscriminator(new Discriminator());

0 commit comments

Comments
 (0)