Commit 5747fb8
committed
fix(normalizer): simplify oneOf/anyOf with a single inline const/enum sub-schema
Previously EnumUtils.simplifyComposedSchemaWithEnums bailed out whenever a
oneOf/anyOf had fewer than 2 sub-schemas, regardless of whether the lone
sub-schema was a named \ (which should be preserved) or an inline
const/enum literal (e.g. oneOf: [{const: FIAttached}]).
For the inline case, the schema fell through to
simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema, which collapses to the
sub-schema but does not convert const to enum and drops the parent's
type/default/extensions, producing a plain string field instead of a
generated enum (e.g. in C# generichost/netcore templates).
Only skip simplification now when the sole sub-schema is a \, preserving
reusable named enum schemas while correctly simplifying single-value inline
const/enum oneOf/anyOf schemas.1 parent 4242641 commit 5747fb8
11 files changed
Lines changed: 98 additions & 5 deletions
File tree
- modules/openapi-generator/src
- main/java/org/openapitools/codegen/utils
- test
- java/org/openapitools/codegen
- resources/3_1
- samples/client
- others/typescript/builds/enum-single-value
- .openapi-generator
- models
- types
- petstore/csharp/generichost/latest/AnnotatedEnum/api
Lines changed: 12 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
121 | | - | |
122 | | - | |
123 | | - | |
| 121 | + | |
124 | 122 | | |
125 | 123 | | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
126 | 135 | | |
127 | 136 | | |
128 | 137 | | |
| |||
Lines changed: 24 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1725 | 1725 | | |
1726 | 1726 | | |
1727 | 1727 | | |
| 1728 | + | |
| 1729 | + | |
| 1730 | + | |
| 1731 | + | |
| 1732 | + | |
| 1733 | + | |
| 1734 | + | |
| 1735 | + | |
| 1736 | + | |
| 1737 | + | |
| 1738 | + | |
| 1739 | + | |
| 1740 | + | |
| 1741 | + | |
| 1742 | + | |
| 1743 | + | |
| 1744 | + | |
| 1745 | + | |
| 1746 | + | |
| 1747 | + | |
| 1748 | + | |
| 1749 | + | |
| 1750 | + | |
| 1751 | + | |
1728 | 1752 | | |
1729 | 1753 | | |
1730 | 1754 | | |
| |||
Lines changed: 12 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 41 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments