make sure to preserve modification of ThingWriteModel to be available…

… for subsequent processing of patch update Signed-off-by: Dominik Guggemos <dominik.guggemos@bosch.io>
eclipse-ditto · Sep 1, 2022 · 2fdbcb8 · 2fdbcb8
1 parent 845c7ba
commit 2fdbcb8
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...n/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/ThingWriteModel.java b/...n/java/org/eclipse/ditto/thingsearch/service/persistence/write/model/ThingWriteModel.java
@@ -199,6 +199,7 @@ public String toString() {
     }
 
     private Optional<MongoWriteModel> computeDiff(final ThingWriteModel lastWriteModel, final int maxWireVersion) {
+        final ThingWriteModel thingWriteModel;
         final WriteModel<BsonDocument> mongoWriteModel;
         final boolean isPatchUpdate1;
 
@@ -218,13 +219,15 @@ private Optional<MongoWriteModel> computeDiff(final ThingWriteModel lastWriteMod
                 PATCH_SKIP_COUNT.increment();
                 return Optional.empty();
             }
-            final var filter = asPatchUpdate(lastWriteModel.getMetadata().getThingRevision()).getFilter();
+            thingWriteModel = asPatchUpdate(lastWriteModel.getMetadata().getThingRevision());
+            final var filter = thingWriteModel.getFilter();
             mongoWriteModel = new UpdateOneModel<>(filter, aggregationPipeline);
             LOGGER.debug("Using incremental update <{}>", mongoWriteModel.getClass().getSimpleName());
             LOGGER.trace("Using incremental update <{}>", mongoWriteModel);
             PATCH_UPDATE_COUNT.increment();
             isPatchUpdate1 = true;
         } else {
+            thingWriteModel = this;
             mongoWriteModel = this.toMongo();
             LOGGER.debug("Using replacement because diff is bigger or nonexistent: <{}>",
                     mongoWriteModel.getClass().getSimpleName());
@@ -235,7 +238,7 @@ private Optional<MongoWriteModel> computeDiff(final ThingWriteModel lastWriteMod
             FULL_UPDATE_COUNT.increment();
             isPatchUpdate1 = false;
         }
-        return Optional.of(MongoWriteModel.of(this, mongoWriteModel, isPatchUpdate1));
+        return Optional.of(MongoWriteModel.of(thingWriteModel, mongoWriteModel, isPatchUpdate1));
     }
 
     private Optional<BsonDiff> tryComputeDiff(final BsonDocument minuend, final BsonDocument subtrahend,