Merge pull request #1695 from eclipse-ditto/bugfix/remove-inline-poli…

…cy-from-persisted-thing-merged-event #1691 fixed persisting inline "_policy" in ThingMerged events
eclipse-ditto · Jul 21, 2023 · d2f8d36 · d2f8d36
2 parents 1539e35 + df4462c
commit d2f8d36
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 23 deletions.
diff --git a/...c/main/java/org/eclipse/ditto/internal/utils/persistentactors/condition/package-info.java b/...c/main/java/org/eclipse/ditto/internal/utils/persistentactors/condition/package-info.java
diff --git a/things/model/src/main/java/org/eclipse/ditto/things/model/signals/events/ThingMerged.java b/things/model/src/main/java/org/eclipse/ditto/things/model/signals/events/ThingMerged.java
@@ -210,16 +210,16 @@ public String toString() {
     /**
      * An enumeration of the JSON fields of a {@code ThingMerged} event.
      */
-    static final class JsonFields {
+    public static final class JsonFields {
 
         private JsonFields() {
             throw new AssertionError();
         }
 
-        static final JsonFieldDefinition<String> JSON_PATH =
+        public static final JsonFieldDefinition<String> JSON_PATH =
                 JsonFactory.newStringFieldDefinition("path", FieldType.REGULAR, JsonSchemaVersion.V_2);
 
-        static final JsonFieldDefinition<JsonValue> JSON_VALUE =
+        public static final JsonFieldDefinition<JsonValue> JSON_VALUE =
                 JsonFactory.newJsonValueFieldDefinition("value", FieldType.REGULAR, JsonSchemaVersion.V_2);
     }
 }
diff --git a/.../java/org/eclipse/ditto/things/service/persistence/serializer/ThingMongoEventAdapter.java b/.../java/org/eclipse/ditto/things/service/persistence/serializer/ThingMongoEventAdapter.java
@@ -22,6 +22,7 @@
 import org.eclipse.ditto.json.JsonPointer;
 import org.eclipse.ditto.policies.model.Policy;
 import org.eclipse.ditto.things.model.signals.events.ThingEvent;
+import org.eclipse.ditto.things.model.signals.events.ThingMerged;
 import org.eclipse.ditto.things.service.common.config.DefaultThingConfig;
 
 import akka.actor.ExtendedActorSystem;
@@ -35,6 +36,10 @@ public final class ThingMongoEventAdapter extends AbstractMongoEventAdapter<Thin
     private static final JsonPointer POLICY_IN_THING_EVENT_PAYLOAD = ThingEvent.JsonFields.THING.getPointer()
             .append(JsonPointer.of(Policy.INLINED_FIELD_NAME));
 
+    private static final JsonPointer POLICY_IN_THING_MERGED_VALUE_PAYLOAD =
+            ThingMerged.JsonFields.JSON_VALUE.getPointer()
+                    .append(JsonPointer.of(Policy.INLINED_FIELD_NAME));
+
     public ThingMongoEventAdapter(final ExtendedActorSystem system) {
         super(system, GlobalEventRegistry.getInstance(), DefaultThingConfig.of(
                 DittoServiceConfig.of(DefaultScopedConfig.dittoScoped(system.settings().config()), "things")
@@ -43,8 +48,13 @@ public ThingMongoEventAdapter(final ExtendedActorSystem system) {
 
     @Override
     protected JsonObjectBuilder performToJournalMigration(final Event<?> event, final JsonObject jsonObject) {
-        return super.performToJournalMigration(event, jsonObject)
-                .remove(POLICY_IN_THING_EVENT_PAYLOAD); // remove the policy entries from thing event payload
+        if (event instanceof ThingMerged) {
+            return super.performToJournalMigration(event, jsonObject)
+                    .remove(POLICY_IN_THING_MERGED_VALUE_PAYLOAD); // remove the policy entries from thing merged payload
+        } else {
+            return super.performToJournalMigration(event, jsonObject)
+                    .remove(POLICY_IN_THING_EVENT_PAYLOAD); // remove the policy entries from thing event payload
+        }
     }
 
 }