modify resposne entity

Author: husseinahmed-bx

Diff for: protocol/src/test/java/org/eclipse/ditto/protocol/adapter/things/ThingMigrateCommandResponseAdapterTest.java

@@ -52,9 +52,6 @@ public void setUp() {
     @Test
     public void migrateThingResponseFromAdaptable() {
         final TopicPath topicPath = topicPath(TopicPath.Action.MIGRATE);
-
-
-
         final MigrateThingDefinitionResponse migrateResponse = MigrateThingDefinitionResponse.applied(
                 TestConstants.THING_ID,
                 patch,
@@ -63,7 +60,7 @@ public void migrateThingResponseFromAdaptable() {
 
         final Adaptable adaptableCreated = Adaptable.newBuilder(topicPath)
                 .withPayload(Payload.newBuilder(JsonPointer.empty())
-                        .withValue(migrateResponse.getEntity().get())
+                        .withValue(migrateResponse.toJson())
                         .withStatus(HttpStatus.OK)
                         .build())
                 .withHeaders(TestConstants.HEADERS_V_2)

Diff for: things/model/src/main/java/org/eclipse/ditto/things/model/signals/commands/modify/MigrateThingDefinitionResponse.java

@@ -273,7 +273,11 @@ public MigrateThingDefinitionResponse setEntity(final JsonValue entity) {
 
     @Override
     public Optional<JsonValue> getEntity(JsonSchemaVersion schemaVersion) {
-        return Optional.of(this.toJson());
+        return Optional.of(JsonObject.newBuilder()
+                .set(JsonFields.JSON_THING_ID, thingId.toString())
+                .set(JsonFields.JSON_PATCH, patch)
+                .set(JsonFields.JSON_MERGE_STATUS, mergeStatus.name())
+                .build());
     }
 
     @Override