fix WoT model validation calculating wrong path

* for enforcing feature properties in all submodels
eclipse-ditto · Dec 16, 2024 · 7f65fe8 · 7f65fe8
1 parent 560c737
commit 7f65fe8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/...dation/src/main/java/org/eclipse/ditto/wot/validation/DefaultWotThingModelValidation.java b/...dation/src/main/java/org/eclipse/ditto/wot/validation/DefaultWotThingModelValidation.java
@@ -225,7 +225,6 @@ public CompletionStage<Void> validateFeaturesProperties(final Map<String, ThingM
                     features,
                     false,
                     validationConfig.getFeatureValidationConfig().isForbidNonModeledProperties(),
-                    resourcePath,
                     context
             ).thenApply(aVoid -> null);
         } else {
@@ -239,7 +238,6 @@ public CompletionStage<Void> validateFeaturesProperties(final Map<String, ThingM
                     features,
                     true,
                     validationConfig.getFeatureValidationConfig().isForbidNonModeledDesiredProperties(),
-                    resourcePath,
                     context
             ).thenApply(aVoid -> null);
         } else {

diff --git a/wot/validation/src/main/java/org/eclipse/ditto/wot/validation/InternalFeatureValidation.java b/wot/validation/src/main/java/org/eclipse/ditto/wot/validation/InternalFeatureValidation.java
@@ -106,7 +106,6 @@ static CompletableFuture<List<Void>> enforceFeaturePropertiesInAllSubmodels(
             final Features features,
             final boolean desiredProperties,
             final boolean forbidNonModeledProperties,
-            final JsonPointer resourcePath,
             final ValidationContext context
     ) {
         final CompletableFuture<List<Void>> enforcedPropertiesListFuture;
@@ -119,7 +118,7 @@ static CompletableFuture<List<Void>> enforceFeaturePropertiesInAllSubmodels(
                                 features.getFeature(entry.getKey()).orElseThrow(),
                                 desiredProperties,
                                 forbidNonModeledProperties,
-                                resourcePath.append(Thing.JsonFields.FEATURES.getPointer())
+                                Thing.JsonFields.FEATURES.getPointer()
                                         .addLeaf(JsonKey.of(entry.getKey()))
                                         .append(desiredProperties ?
                                                 Feature.JsonFields.DESIRED_PROPERTIES.getPointer() :