Skip to content

fix nested lookup of tm:refs in WoT model extension resolving #1923

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
thjaeckle merged 1 commit into from
Apr 8, 2024
Merged

fix nested lookup of tm:refs in WoT model extension resolving #1923

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
8 changes: 8 additions & 0 deletions ...va/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,14 @@ private CompletionStage<JsonValue> resolveRefs(final JsonObject objectWithTmRef,
.orElseGet(() -> CompletableFuture.completedFuture(null))
, executor
)
.thenCompose(refObject -> {
if (refObject.contains(TM_REF)) {
return resolveRefs(refObject, dittoHeaders) // recurse!
.thenApply(JsonValue::asObject);
} else {
return potentiallyResolveRefs(refObject, dittoHeaders); // recurse!
}
})
.thenApply(refObject ->
JsonFactory.mergeJsonValues(objectWithTmRef.remove(TM_REF), refObject).asObject()
);
Expand Down
3 changes: 2 additions & 1 deletion wot/model/src/main/java/org/eclipse/ditto/wot/model/SecurityScheme.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ static SecurityScheme fromJson(final CharSequence securitySchemeName, final Json
return AdditionalSecurityScheme.fromJson(schemeName, jsonObject);
}
})
.orElseThrow(() -> new IllegalArgumentException("Could not create SingleDataSchema"));
.orElseThrow(() -> new IllegalArgumentException("Could not create SecurityScheme - " +
"json field <" + SecuritySchemeJsonFields.SCHEME.getPointer() + "> was missing or unknown"));
}

static NoSecurityScheme.Builder newNoSecurityBuilder(final CharSequence securitySchemeName) {
Expand Down
3 changes: 2 additions & 1 deletion wot/model/src/main/java/org/eclipse/ditto/wot/model/SingleDataSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ static SingleDataSchema fromJson(final JsonObject jsonObject) {
throw new IllegalArgumentException("Unsupported dataSchema-type: " + type);
}
})
.orElseThrow(() -> new IllegalArgumentException("Could not create SingleDataSchema"));
.orElseThrow(() -> new IllegalArgumentException("Could not create SingleDataSchema - " +
"json field <" + DataSchemaJsonFields.TYPE.getPointer() + "> was missing or unknown"));
}

static BooleanSchema.Builder newBooleanSchemaBuilder() {
Expand Down