Skip to content

Commit cf5b0df

Browse files
committed
Use ModelUtils.hasAnyOf/hasOneOf helpers per review
Per @jpfinne.
1 parent dedf4ea commit cf5b0df

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2759,8 +2759,7 @@ protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map<S
27592759

27602760
// For anyOf/oneOf, required fields should be the intersection across members,
27612761
// not the union. A field is only guaranteed present if ALL members require it.
2762-
boolean isAnyOfOrOneOf = (composed.getAnyOf() != null && !composed.getAnyOf().isEmpty())
2763-
|| (composed.getOneOf() != null && !composed.getOneOf().isEmpty());
2762+
boolean isAnyOfOrOneOf = ModelUtils.hasAnyOf(composed) || ModelUtils.hasOneOf(composed);
27642763
List<Set<String>> perMemberRequiredSets = isAnyOfOrOneOf ? new ArrayList<>() : null;
27652764

27662765
if (!interfaces.isEmpty()) {

0 commit comments

Comments
 (0)