remove duplicate id in the response

Author: hu-ahmed

things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/strategies/commands/MigrateThingDefinitionStrategy.java

@@ -153,7 +153,9 @@ private Result<ThingEvent<?>> handleMigrateDefinition(
 
         // 4. Apply migration and generate event
         final CompletionStage<ThingEvent<?>> eventStage = validatedStage.thenApply(pair -> ThingMigrated.of(
-                pair.first(), nextRevision, eventTs, dittoHeaders,
+                pair.first().toBuilder()
+                        .setId(context.getState())
+                        .build(), nextRevision, eventTs, dittoHeaders,
                 metadata));
 
         final CompletionStage<WithDittoHeaders> responseStage = validatedStage.thenApply(pair ->
@@ -337,7 +339,6 @@ private Thing applyMigrationPayload(final Context<ThingId> context, final Thing
                 () -> dittoHeaders);
 
         return ThingsModelFactory.newThingBuilder(mergedJson)
-                .setId(context.getState())
                 .setModified(eventTs)
                 .setRevision(nextRevision)
                 .build();