Skip to content

generator: Fix broken union type anyOf selection since Redfish 2024.1 #20

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
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

generator: Fix broken union type anyOf selection since Redfish 2024.1 #20

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
16 changes: 14 additions & 2 deletions ...generator/src/main/java/com/twardyece/dmtf/model/context/factory/UnionContextFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ public UnionContextFactory(ModelResolver modelResolver, UnionVariantParser varia

@Override
public ModelContext makeModelContext(RustType type, Schema schema) {
if (null == schema.getAnyOf()) {
// Since Redfish 2024.1, anyOf is not used anymore
// Only one (the latest) of all schemes is declared in the $ref field,
if (null == schema.getAnyOf() && null == schema.get$ref()) {
return null;
}

Expand All @@ -32,7 +34,17 @@ public ModelContext makeModelContext(RustType type, Schema schema) {
private List<EnumContext.Variant> makeVariants(Schema schema) {
List<EnumContext.Variant> variants = new ArrayList<>();

for (Object object : schema.getAnyOf()) {
List<Object> schemataToResolve = new ArrayList<>();

if (null != schema.getAnyOf()) {
schemataToResolve.addAll(schema.getAnyOf());
}

if (null != schema.get$ref()) {
schemataToResolve.add(schema);
}

for (Object object : schemataToResolve) {
Schema variant = (Schema)object;
String identifier = ModelResolver.getSchemaIdentifier(variant.get$ref());
RustIdentifier value = this.variantParser.getVariantName(identifier);
Expand Down