Skip to content
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

Fix resolving WoT submodels from extended model #2069

Merged
merged 2 commits into from
Nov 26, 2024
Merged

Fix resolving WoT submodels from extended model #2069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f85e8b9
fix resolving WoT submodels from extended model
thjaeckle Nov 26, 2024
adf7f2f
update json-schema-validator version, fixing bugs
thjaeckle Nov 26, 2024
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
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<!-- ### Compile dependencies versions -->
<minimal-json.version>0.9.5</minimal-json.version>
<jackson-bom.version>2.17.2</jackson-bom.version>
<json-schema-validator.version>1.5.1</json-schema-validator.version>
<json-schema-validator.version>1.5.4</json-schema-validator.version>
<typesafe-config.version>1.4.3</typesafe-config.version>
<ssl-config-core.version>0.6.1</ssl-config-core.version>
<kafka-client.version>3.7.1</kafka-client.version>
Expand Down
47 changes: 45 additions & 2 deletions .../main/java/org/eclipse/ditto/wot/api/generator/DefaultWotThingModelExtensionResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
import static org.eclipse.ditto.base.model.common.ConditionChecker.checkNotNull;

import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.concurrent.Executor;
import java.util.function.BiFunction;
import java.util.stream.Stream;

import org.eclipse.ditto.base.model.headers.DittoHeaders;
import org.eclipse.ditto.json.JsonCollectors;
Expand All @@ -28,7 +30,9 @@
import org.eclipse.ditto.json.JsonPointer;
import org.eclipse.ditto.json.JsonValue;
import org.eclipse.ditto.wot.api.provider.WotThingModelFetcher;
import org.eclipse.ditto.wot.model.BaseLink;
import org.eclipse.ditto.wot.model.IRI;
import org.eclipse.ditto.wot.model.Links;
import org.eclipse.ditto.wot.model.ThingModel;
import org.eclipse.ditto.wot.model.WotThingModelRefInvalidException;

Expand Down Expand Up @@ -73,7 +77,7 @@ public CompletionStage<ThingModel> resolveThingModelExtensions(final ThingModel
return CompletableFuture.completedFuture(thingModel);
} else {
CompletionStage<ThingModel.Builder> currentStage =
resolveThingModelExtensions(extendedModels.get(0), dittoHeaders) // recurse!
resolveThingModelExtensions(extendedModels.getFirst(), dittoHeaders) // recurse!
.thenApply(extendedModel ->
mergeThingModelIntoBuilder().apply(tmBuilder, extendedModel)
);
Expand All @@ -91,13 +95,52 @@ public CompletionStage<ThingModel> resolveThingModelExtensions(final ThingModel

private BiFunction<ThingModel.Builder, ThingModel, ThingModel.Builder> mergeThingModelIntoBuilder() {
return (builder, model) -> {
final JsonObject mergedTmObject = JsonFactory.mergeJsonValues(builder.build(), model).asObject();
final ThingModel newModel = builder.build();
final JsonObject mergedTmObject = JsonFactory.mergeJsonValues(newModel, model).asObject();
builder.removeAll();
builder.setAll(mergedTmObject);
mergeLinks(model.getLinks(), newModel.getLinks()).ifPresent(builder::setLinks);
return builder;
};
}

@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
private static Optional<Links> mergeLinks(final Optional<Links> oldOptionalLinks,
final Optional<Links> newOptionalLinks)
{
return oldOptionalLinks
.map(oldLinks -> filterOutTmExtendsLinkFromOldLinks(newOptionalLinks, oldLinks))
.map(adjustedOldLinks ->
newOptionalLinks.stream()
.flatMap(newLinks -> Stream.concat(adjustedOldLinks, newLinks.stream()))
)
.map(Stream::toList)
.map(Links::of);
}

@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
private static Stream<BaseLink<?>> filterOutTmExtendsLinkFromOldLinks(final Optional<Links> newOptionalLinks,
final Links oldLinks)
{
return oldLinks.stream()
.filter(oldLink -> {
if (isTmExtendsLink(oldLink)) {
return newOptionalLinks.filter(DefaultWotThingModelExtensionResolver::containsTmExtendsLink)
.isEmpty();
} else {
return true;
}
});
}

private static boolean containsTmExtendsLink(final Links links) {
return links.stream().anyMatch(DefaultWotThingModelExtensionResolver::isTmExtendsLink);
}

private static boolean isTmExtendsLink(final BaseLink<?> link) {
return link.getRel().isPresent() && link.getRel().filter(TM_EXTENDS::equals).isPresent();
}

@Override
public CompletionStage<ThingModel> resolveThingModelRefs(final ThingModel thingModel, final DittoHeaders dittoHeaders) {
return potentiallyResolveRefs(thingModel, dittoHeaders).thenApply(ThingModel::fromJson);
Expand Down
Loading