Extend signal enrichment facade for search update; fix interpretation…

… of delete events. Signed-off-by: Yufei Cai <yufei.cai@bosch.io>
eclipse-ditto · Aug 20, 2021 · 75ae753 · 75ae753
1 parent e3570ac
commit 75ae753
Show file tree

Hide file tree

Showing 45 changed files with 565 additions and 126 deletions.
diff --git a/...ava/org/eclipse/ditto/internal/models/signalenrichment/CachingSignalEnrichmentFacade.java b/...ava/org/eclipse/ditto/internal/models/signalenrichment/CachingSignalEnrichmentFacade.java
diff --git a/protocol/src/test/java/org/eclipse/ditto/protocol/adapter/things/ThingEventAdapterTest.java b/protocol/src/test/java/org/eclipse/ditto/protocol/adapter/things/ThingEventAdapterTest.java
@@ -20,26 +20,27 @@
 
 import javax.annotation.Nonnull;
 
-import org.eclipse.ditto.json.JsonObject;
-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.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
-import org.eclipse.ditto.things.model.ThingId;
+import org.eclipse.ditto.base.model.signals.commands.Command;
+import org.eclipse.ditto.base.model.signals.events.Event;
+import org.eclipse.ditto.base.model.signals.events.EventsourcedEvent;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonPointer;
+import org.eclipse.ditto.json.JsonValue;
 import org.eclipse.ditto.protocol.Adaptable;
-import org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter;
 import org.eclipse.ditto.protocol.EventsTopicPathBuilder;
 import org.eclipse.ditto.protocol.LiveTwinTest;
 import org.eclipse.ditto.protocol.Payload;
-import org.eclipse.ditto.protocol.adapter.ProtocolAdapterTest;
 import org.eclipse.ditto.protocol.TestConstants;
 import org.eclipse.ditto.protocol.TopicPath;
 import org.eclipse.ditto.protocol.TopicPathBuilder;
 import org.eclipse.ditto.protocol.UnknownEventException;
-import org.eclipse.ditto.base.model.signals.events.Event;
-import org.eclipse.ditto.base.model.signals.events.EventsourcedEvent;
+import org.eclipse.ditto.protocol.adapter.DittoProtocolAdapter;
+import org.eclipse.ditto.protocol.adapter.ProtocolAdapterTest;
+import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.things.model.signals.events.AttributeCreated;
 import org.eclipse.ditto.things.model.signals.events.AttributeDeleted;
 import org.eclipse.ditto.things.model.signals.events.AttributeModified;
@@ -1640,6 +1641,11 @@ public UnknownThingEvent setDittoHeaders(final DittoHeaders dittoHeaders) {
             return this;
         }
 
+        @Override
+        public Command.Category getCommandCategory() {
+            return Command.Category.MODIFY;
+        }
+
         @Nonnull
         @Override
         public String getManifest() {

diff --git a/...i/src/main/java/org/eclipse/ditto/things/api/commands/sudo/SudoRetrieveThingResponse.java b/...i/src/main/java/org/eclipse/ditto/things/api/commands/sudo/SudoRetrieveThingResponse.java
@@ -120,7 +120,7 @@ public Thing getThing() {
     }
 
     @Override
-    public JsonValue getEntity(final JsonSchemaVersion schemaVersion) {
+    public JsonObject getEntity(final JsonSchemaVersion schemaVersion) {
         return thing;
     }
 

diff --git a/...s/model/src/main/java/org/eclipse/ditto/things/model/signals/events/AttributeCreated.java b/...s/model/src/main/java/org/eclipse/ditto/things/model/signals/events/AttributeCreated.java
@@ -20,6 +20,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonFieldDefinition;
@@ -183,6 +184,11 @@ public AttributeCreated setDittoHeaders(final DittoHeaders dittoHeaders) {
                 dittoHeaders, getMetadata().orElse(null));
     }
 
+    @Override
+    public Command.Category getCommandCategory() {
+        return Command.Category.MODIFY;
+    }
+
     @Override
     protected void appendPayloadAndBuild(final JsonObjectBuilder jsonObjectBuilder,
             final JsonSchemaVersion schemaVersion, final Predicate<JsonField> thePredicate) {

diff --git a/...s/model/src/main/java/org/eclipse/ditto/things/model/signals/events/AttributeDeleted.java b/...s/model/src/main/java/org/eclipse/ditto/things/model/signals/events/AttributeDeleted.java
@@ -19,6 +19,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonFieldDefinition;
@@ -154,6 +155,11 @@ public AttributeDeleted setDittoHeaders(final DittoHeaders dittoHeaders) {
                 getMetadata().orElse(null));
     }
 
+    @Override
+    public Command.Category getCommandCategory() {
+        return Command.Category.DELETE;
+    }
+
     @Override
     protected void appendPayloadAndBuild(final JsonObjectBuilder jsonObjectBuilder,
             final JsonSchemaVersion schemaVersion,

diff --git a/.../model/src/main/java/org/eclipse/ditto/things/model/signals/events/AttributeModified.java b/.../model/src/main/java/org/eclipse/ditto/things/model/signals/events/AttributeModified.java
@@ -20,6 +20,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonFieldDefinition;
@@ -183,6 +184,11 @@ public AttributeModified setDittoHeaders(final DittoHeaders dittoHeaders) {
                 dittoHeaders, getMetadata().orElse(null));
     }
 
+    @Override
+    public Command.Category getCommandCategory() {
+        return Command.Category.MODIFY;
+    }
+
     @Override
     protected void appendPayloadAndBuild(final JsonObjectBuilder jsonObjectBuilder,
             final JsonSchemaVersion schemaVersion, final Predicate<JsonField> thePredicate) {

diff --git a/.../model/src/main/java/org/eclipse/ditto/things/model/signals/events/AttributesCreated.java b/.../model/src/main/java/org/eclipse/ditto/things/model/signals/events/AttributesCreated.java
@@ -20,22 +20,23 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.entity.metadata.Metadata;
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.json.FieldType;
+import org.eclipse.ditto.base.model.json.JsonParsableEvent;
+import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
+import org.eclipse.ditto.base.model.signals.commands.Command;
+import org.eclipse.ditto.base.model.signals.events.EventJsonDeserializer;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonFieldDefinition;
 import org.eclipse.ditto.json.JsonObject;
 import org.eclipse.ditto.json.JsonObjectBuilder;
 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.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.base.model.json.FieldType;
-import org.eclipse.ditto.base.model.json.JsonParsableEvent;
-import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.things.model.Attributes;
 import org.eclipse.ditto.things.model.ThingId;
 import org.eclipse.ditto.things.model.ThingsModelFactory;
-import org.eclipse.ditto.base.model.signals.events.EventJsonDeserializer;
 
 /**
  * This event is emitted after all {@code Attribute}s were created at once.
@@ -162,6 +163,11 @@ public AttributesCreated setDittoHeaders(final DittoHeaders dittoHeaders) {
                 getMetadata().orElse(null));
     }
 
+    @Override
+    public Command.Category getCommandCategory() {
+        return Command.Category.MODIFY;
+    }
+
     @Override
     protected void appendPayloadAndBuild(final JsonObjectBuilder jsonObjectBuilder,
             final JsonSchemaVersion schemaVersion, final Predicate<JsonField> thePredicate) {

diff --git a/.../model/src/main/java/org/eclipse/ditto/things/model/signals/events/AttributesDeleted.java b/.../model/src/main/java/org/eclipse/ditto/things/model/signals/events/AttributesDeleted.java
@@ -18,6 +18,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonObject;
@@ -129,6 +130,11 @@ public AttributesDeleted setDittoHeaders(final DittoHeaders dittoHeaders) {
                 getMetadata().orElse(null));
     }
 
+    @Override
+    public Command.Category getCommandCategory() {
+        return Command.Category.DELETE;
+    }
+
     @Override
     protected void appendPayloadAndBuild(final JsonObjectBuilder jsonObjectBuilder,
             final JsonSchemaVersion schemaVersion, final Predicate<JsonField> predicate) {

diff --git a/...model/src/main/java/org/eclipse/ditto/things/model/signals/events/AttributesModified.java b/...model/src/main/java/org/eclipse/ditto/things/model/signals/events/AttributesModified.java
@@ -20,6 +20,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonFieldDefinition;
@@ -163,6 +164,11 @@ public AttributesModified setDittoHeaders(final DittoHeaders dittoHeaders) {
                 getMetadata().orElse(null));
     }
 
+    @Override
+    public Command.Category getCommandCategory() {
+        return Command.Category.MODIFY;
+    }
+
     @Override
     protected void appendPayloadAndBuild(final JsonObjectBuilder jsonObjectBuilder,
             final JsonSchemaVersion schemaVersion, final Predicate<JsonField> thePredicate) {

diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/events/FeatureCreated.java b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/events/FeatureCreated.java
@@ -22,6 +22,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonFieldDefinition;
@@ -176,6 +177,11 @@ public FeatureCreated setDittoHeaders(final DittoHeaders dittoHeaders) {
                 getMetadata().orElse(null));
     }
 
+    @Override
+    public Command.Category getCommandCategory() {
+        return Command.Category.MODIFY;
+    }
+
     @Override
     protected void appendPayloadAndBuild(final JsonObjectBuilder jsonObjectBuilder,
             final JsonSchemaVersion schemaVersion, final Predicate<JsonField> thePredicate) {

diff --git a/...src/main/java/org/eclipse/ditto/things/model/signals/events/FeatureDefinitionCreated.java b/...src/main/java/org/eclipse/ditto/things/model/signals/events/FeatureDefinitionCreated.java
@@ -22,6 +22,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.json.JsonArray;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
@@ -183,6 +184,11 @@ public FeatureDefinitionCreated setDittoHeaders(final DittoHeaders dittoHeaders)
                 getMetadata().orElse(null));
     }
 
+    @Override
+    public Command.Category getCommandCategory() {
+        return Command.Category.MODIFY;
+    }
+
     @Override
     protected void appendPayloadAndBuild(final JsonObjectBuilder jsonObjectBuilder,
             final JsonSchemaVersion schemaVersion, final Predicate<JsonField> thePredicate) {

diff --git a/...src/main/java/org/eclipse/ditto/things/model/signals/events/FeatureDefinitionDeleted.java b/...src/main/java/org/eclipse/ditto/things/model/signals/events/FeatureDefinitionDeleted.java
@@ -21,6 +21,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonObject;
@@ -147,6 +148,11 @@ public FeatureDefinitionDeleted setDittoHeaders(final DittoHeaders dittoHeaders)
                 getMetadata().orElse(null));
     }
 
+    @Override
+    public Command.Category getCommandCategory() {
+        return Command.Category.DELETE;
+    }
+
     @Override
     protected void appendPayloadAndBuild(final JsonObjectBuilder jsonObjectBuilder,
             final JsonSchemaVersion schemaVersion, final Predicate<JsonField> thePredicate) {

diff --git a/...rc/main/java/org/eclipse/ditto/things/model/signals/events/FeatureDefinitionModified.java b/...rc/main/java/org/eclipse/ditto/things/model/signals/events/FeatureDefinitionModified.java
@@ -22,6 +22,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.json.JsonArray;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
@@ -182,6 +183,11 @@ public FeatureDefinitionModified setDittoHeaders(final DittoHeaders dittoHeaders
                 getMetadata().orElse(null));
     }
 
+    @Override
+    public Command.Category getCommandCategory() {
+        return Command.Category.MODIFY;
+    }
+
     @Override
     protected void appendPayloadAndBuild(final JsonObjectBuilder jsonObjectBuilder,
             final JsonSchemaVersion schemaVersion, final Predicate<JsonField> thePredicate) {

diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/events/FeatureDeleted.java b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/events/FeatureDeleted.java
@@ -21,6 +21,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonObject;
@@ -147,6 +148,11 @@ public FeatureDeleted setDittoHeaders(final DittoHeaders dittoHeaders) {
                 getMetadata().orElse(null));
     }
 
+    @Override
+    public Command.Category getCommandCategory() {
+        return Command.Category.DELETE;
+    }
+
     @Override
     protected void appendPayloadAndBuild(final JsonObjectBuilder jsonObjectBuilder,
             final JsonSchemaVersion schemaVersion, final Predicate<JsonField> thePredicate) {

diff --git a/...n/java/org/eclipse/ditto/things/model/signals/events/FeatureDesiredPropertiesCreated.java b/...n/java/org/eclipse/ditto/things/model/signals/events/FeatureDesiredPropertiesCreated.java
@@ -22,6 +22,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonFieldDefinition;
@@ -48,8 +49,7 @@
 @Immutable
 @JsonParsableEvent(name = FeatureDesiredPropertiesCreated.NAME, typePrefix = ThingEvent.TYPE_PREFIX)
 public final class FeatureDesiredPropertiesCreated extends AbstractThingEvent<FeatureDesiredPropertiesCreated>
-        implements
-        ThingModifiedEvent<FeatureDesiredPropertiesCreated>, WithFeatureId {
+        implements ThingModifiedEvent<FeatureDesiredPropertiesCreated>, WithFeatureId {
 
     /**
      * Name of the "Feature Desired Properties Created" event.
@@ -193,6 +193,11 @@ public FeatureDesiredPropertiesCreated setDittoHeaders(final DittoHeaders dittoH
                 getMetadata().orElse(null));
     }
 
+    @Override
+    public Command.Category getCommandCategory() {
+        return Command.Category.MODIFY;
+    }
+
     @Override
     protected void appendPayloadAndBuild(final JsonObjectBuilder jsonObjectBuilder,
             final JsonSchemaVersion schemaVersion, final Predicate<JsonField> thePredicate) {

diff --git a/...n/java/org/eclipse/ditto/things/model/signals/events/FeatureDesiredPropertiesDeleted.java b/...n/java/org/eclipse/ditto/things/model/signals/events/FeatureDesiredPropertiesDeleted.java
@@ -21,6 +21,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonObject;
@@ -42,8 +43,7 @@
 @Immutable
 @JsonParsableEvent(name = FeatureDesiredPropertiesDeleted.NAME, typePrefix = ThingEvent.TYPE_PREFIX)
 public final class FeatureDesiredPropertiesDeleted extends AbstractThingEvent<FeatureDesiredPropertiesDeleted>
-        implements
-        ThingModifiedEvent<FeatureDesiredPropertiesDeleted>, WithFeatureId {
+        implements ThingModifiedEvent<FeatureDesiredPropertiesDeleted>, WithFeatureId {
 
     /**
      * Name of the "Feature Desired Properties Deleted" event.
@@ -152,6 +152,11 @@ public FeatureDesiredPropertiesDeleted setDittoHeaders(final DittoHeaders dittoH
                 getMetadata().orElse(null));
     }
 
+    @Override
+    public Command.Category getCommandCategory() {
+        return Command.Category.DELETE;
+    }
+
     @Override
     protected void appendPayloadAndBuild(final JsonObjectBuilder jsonObjectBuilder,
             final JsonSchemaVersion schemaVersion, final Predicate<JsonField> thePredicate) {

diff --git a/.../java/org/eclipse/ditto/things/model/signals/events/FeatureDesiredPropertiesModified.java b/.../java/org/eclipse/ditto/things/model/signals/events/FeatureDesiredPropertiesModified.java
@@ -22,6 +22,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import org.eclipse.ditto.base.model.signals.commands.Command;
 import org.eclipse.ditto.json.JsonFactory;
 import org.eclipse.ditto.json.JsonField;
 import org.eclipse.ditto.json.JsonFieldDefinition;
@@ -48,8 +49,7 @@
 @Immutable
 @JsonParsableEvent(name = FeatureDesiredPropertiesModified.NAME, typePrefix = ThingEvent.TYPE_PREFIX)
 public final class FeatureDesiredPropertiesModified extends AbstractThingEvent<FeatureDesiredPropertiesModified>
-        implements
-        ThingModifiedEvent<FeatureDesiredPropertiesModified>, WithFeatureId {
+        implements ThingModifiedEvent<FeatureDesiredPropertiesModified>, WithFeatureId {
 
     /**
      * Name of the "Feature Desired Properties Modified" event.
@@ -188,6 +188,11 @@ public FeatureDesiredPropertiesModified setDittoHeaders(final DittoHeaders ditto
                 getMetadata().orElse(null));
     }
 
+    @Override
+    public Command.Category getCommandCategory() {
+        return Command.Category.MODIFY;
+    }
+
     @Override
     protected void appendPayloadAndBuild(final JsonObjectBuilder jsonObjectBuilder,
             final JsonSchemaVersion schemaVersion, final Predicate<JsonField> thePredicate) {