add wildcard validation and resolving for feature definition requests;

allow leaf wildcard syntax for feature property based commands; extended tests; Signed-off-by: Stefan Maute <stefan.maute@bosch.io>
eclipse-ditto · Jun 23, 2022 · 0d0b1f8 · 0d0b1f8
1 parent 51abb41
commit 0d0b1f8
Show file tree

Hide file tree

Showing 9 changed files with 543 additions and 195 deletions.
diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/ImmutableThingFromCopyBuilder.java b/things/model/src/main/java/org/eclipse/ditto/things/model/ImmutableThingFromCopyBuilder.java
@@ -22,12 +22,12 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.NotThreadSafe;
 
+import org.eclipse.ditto.base.model.entity.metadata.Metadata;
 import org.eclipse.ditto.json.JsonFieldDefinition;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonParseException;
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.json.JsonValue;
-import org.eclipse.ditto.base.model.entity.metadata.Metadata;
 import org.eclipse.ditto.policies.model.PolicyId;
 
 /**

diff --git a/...gs/model/src/test/java/org/eclipse/ditto/things/model/signals/commands/TestConstants.java b/...gs/model/src/test/java/org/eclipse/ditto/things/model/signals/commands/TestConstants.java
@@ -427,6 +427,7 @@ public static final class Feature {
         public static final org.eclipse.ditto.things.model.Feature FLUX_CAPACITOR =
                 ThingsModelFactory.newFeatureBuilder()
                         .properties(FLUX_CAPACITOR_PROPERTIES)
+                        .definition(FLUX_CAPACITOR_DEFINITION)
                         .withId(FLUX_CAPACITOR_ID)
                         .build();
 

diff --git a/...o/things/service/persistence/actors/strategies/commands/AbstractThingCommandStrategy.java b/...o/things/service/persistence/actors/strategies/commands/AbstractThingCommandStrategy.java
@@ -115,7 +115,8 @@ public Result<ThingEvent<?>> apply(final Context<ThingId> context, @Nullable fin
     protected Optional<Metadata> calculateRelativeMetadata(@Nullable final Thing entity, final C command) {
         if (commandModifiesMetadata(command)) {
             final Metadata existingRelativeMetadata = getExistingMetadata(entity, command);
-            final MetadataFromCommand relativeMetadata = MetadataFromCommand.of(command, entity, existingRelativeMetadata);
+            final MetadataFromCommand relativeMetadata =
+                    MetadataFromCommand.of(command, entity, existingRelativeMetadata);
             return Optional.ofNullable(relativeMetadata.get());
         } else if (commandDeletesMetadata(command)) {
             return calculateMetadataForDeleteMetadataRequests(entity, command);
@@ -131,9 +132,10 @@ private boolean commandModifiesMetadata(final C command) {
             final var putMetadataHeaderIsPresent = !command.getDittoHeaders()
                     .getMetadataHeadersToPut()
                     .isEmpty();
-            final var createThingWithInlineMetadata = command instanceof CreateThing createThing && createThing.getThing()
-                    .getMetadata()
-                    .isPresent();
+            final var createThingWithInlineMetadata =
+                    command instanceof CreateThing createThing && createThing.getThing()
+                            .getMetadata()
+                            .isPresent();
 
             if (putMetadataHeaderIsPresent && createThingWithInlineMetadata) {
                 throw MetadataNotModifiableException.newBuilder().build();
@@ -161,8 +163,9 @@ private Optional<Metadata> calculateMetadataForGetRequests(@Nullable Thing entit
         if (checkIfContainsWildcards(metadataFields) && entity != null) {
             metadataFields.stream()
                     .filter(this::checkIfContainsWildcard)
-                    .forEach(jsonPointer -> MetadataWildcardValidator.validateMetadataWildcard(command.getType(),
-                            jsonPointer.toString(), DittoHeaderDefinition.GET_METADATA.getKey()));
+                    .forEach(jsonPointer -> MetadataWildcardValidator.validateMetadataWildcard(
+                            command.getResourcePath(), jsonPointer.toString(),
+                            DittoHeaderDefinition.GET_METADATA.getKey()));
             metadataFieldsWithResolvedWildcard =
                     expandWildcardsInMetadataExpression(metadataFields, entity, command,
                             DittoHeaderDefinition.GET_METADATA.getKey());
@@ -195,8 +198,9 @@ private Optional<Metadata> calculateMetadataForDeleteMetadataRequests(@Nullable
         if (checkIfContainsWildcards(metadataFieldsToDelete) && entity != null) {
             metadataFieldsToDelete.stream()
                     .filter(this::checkIfContainsWildcard)
-                    .forEach(jsonPointer -> MetadataWildcardValidator.validateMetadataWildcard(command.getType(),
-                            jsonPointer.toString(), DittoHeaderDefinition.DELETE_METADATA.getKey()));
+                    .forEach(jsonPointer -> MetadataWildcardValidator.validateMetadataWildcard(
+                            command.getResourcePath(), jsonPointer.toString(),
+                            DittoHeaderDefinition.DELETE_METADATA.getKey()));
             metadataFieldsWithResolvedWildcard =
                     expandWildcardsInMetadataExpression(metadataFieldsToDelete, entity, command,
                             DittoHeaderDefinition.DELETE_METADATA.getKey());
@@ -213,10 +217,10 @@ private Optional<Metadata> calculateMetadataForDeleteMetadataRequests(@Nullable
 
     private Optional<Metadata> deleteMetadata(final Metadata existingMetadata,
             final Set<JsonPointer> metadataFieldsToDelete) {
-            final MetadataBuilder metadataBuilder = existingMetadata.toBuilder();
-            metadataFieldsToDelete.forEach(metadataBuilder::remove);
+        final MetadataBuilder metadataBuilder = existingMetadata.toBuilder();
+        metadataFieldsToDelete.forEach(metadataBuilder::remove);
 
-            return Optional.of(metadataBuilder.build());
+        return Optional.of(metadataBuilder.build());
     }
 
     @Override