fix recursive lookup of tm:refs in WoT model extension resolving

(cherry picked from commit 757c1a0)
eclipse-ditto · Apr 8, 2024 · c811b24 · c811b24
1 parent c21f377
commit c811b24
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/...va/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java b/...va/org/eclipse/ditto/wot/integration/generator/DefaultWotThingModelExtensionResolver.java
@@ -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()
                 );

diff --git a/wot/model/src/main/java/org/eclipse/ditto/wot/model/SecurityScheme.java b/wot/model/src/main/java/org/eclipse/ditto/wot/model/SecurityScheme.java
@@ -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) {

diff --git a/wot/model/src/main/java/org/eclipse/ditto/wot/model/SingleDataSchema.java b/wot/model/src/main/java/org/eclipse/ditto/wot/model/SingleDataSchema.java
@@ -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() {