Merge pull request #2093 from beyonnex-io/bugfix/validation-of-desire…

…d-properties-deletion fix wrongly done validation of removal of desired feature properties
eclipse-ditto · Jan 14, 2025 · dd245af · dd245af
2 parents 4d9372b + 163db35
commit dd245af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 26 deletions.
diff --git a/...ervice/persistence/actors/strategies/commands/DeleteFeatureDesiredPropertiesStrategy.java b/...ervice/persistence/actors/strategies/commands/DeleteFeatureDesiredPropertiesStrategy.java
@@ -13,6 +13,7 @@
 package org.eclipse.ditto.things.service.persistence.actors.strategies.commands;
 
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
 import javax.annotation.Nullable;
@@ -68,19 +69,9 @@ protected CompletionStage<DeleteFeatureDesiredProperties> performWotValidation(
             @Nullable final Thing previousThing,
             @Nullable final Thing previewThing
     ) {
-        return wotThingModelValidator.validateFeatureScopedDeletion(
-                Optional.ofNullable(previousThing)
-                        .flatMap(Thing::getDefinition)
-                        .orElse(null),
-                Optional.ofNullable(previousThing)
-                        .flatMap(Thing::getFeatures)
-                        .flatMap(f -> f.getFeature(command.getFeatureId()))
-                        .flatMap(Feature::getDefinition)
-                        .orElse(null),
-                command.getFeatureId(),
-                command.getResourcePath(),
-                command.getDittoHeaders()
-        ).thenApply(aVoid -> command);
+        // it is always ok to delete a feature's desired properties - no need to validate for e.g. required properties,
+        //  as they do not apply for desired properties
+        return CompletableFuture.completedFuture(command);
     }
 
     private Optional<Feature> extractFeature(final DeleteFeatureDesiredProperties command,

diff --git a/.../service/persistence/actors/strategies/commands/DeleteFeatureDesiredPropertyStrategy.java b/.../service/persistence/actors/strategies/commands/DeleteFeatureDesiredPropertyStrategy.java
@@ -13,6 +13,7 @@
 package org.eclipse.ditto.things.service.persistence.actors.strategies.commands;
 
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
 import javax.annotation.Nullable;
@@ -71,19 +72,9 @@ protected CompletionStage<DeleteFeatureDesiredProperty> performWotValidation(
             @Nullable final Thing previousThing,
             @Nullable final Thing previewThing
     ) {
-        return wotThingModelValidator.validateFeatureScopedDeletion(
-                Optional.ofNullable(previousThing)
-                        .flatMap(Thing::getDefinition)
-                        .orElse(null),
-                Optional.ofNullable(previousThing)
-                        .flatMap(Thing::getFeatures)
-                        .flatMap(f -> f.getFeature(command.getFeatureId()))
-                        .flatMap(Feature::getDefinition)
-                        .orElse(null),
-                command.getFeatureId(),
-                command.getResourcePath(),
-                command.getDittoHeaders()
-        ).thenApply(aVoid -> command);
+        // it is always ok to delete a feature's desired properties - no need to validate for e.g. required properties,
+        //  as they do not apply for desired properties
+        return CompletableFuture.completedFuture(command);
     }
 
     private Optional<Feature> extractFeature(final DeleteFeatureDesiredProperty command, final @Nullable Thing thing) {