From ea8e55dbabd9c6840a4d8e4d09a8d285b2e0bae5 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Wed, 2 Jun 2021 11:24:19 +0300
Subject: [PATCH] Set downlink msg id in the response msg

---
 .../thingsboard/server/edge/imitator/EdgeImitator.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java b/application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java
index c903913fe3..864f2e6a52 100644
--- a/application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java
+++ b/application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java
@@ -136,7 +136,9 @@ public class EdgeImitator {
             @Override
             public void onSuccess(@Nullable List<Void> result) {
                 if (connected) {
-                    DownlinkResponseMsg downlinkResponseMsg = DownlinkResponseMsg.newBuilder().setSuccess(true).build();
+                    DownlinkResponseMsg downlinkResponseMsg = DownlinkResponseMsg.newBuilder()
+                            .setDownlinkMsgId(downlinkMsg.getDownlinkMsgId())
+                            .setSuccess(true).build();
                     edgeRpcClient.sendDownlinkResponseMsg(downlinkResponseMsg);
                 }
             }
@@ -144,7 +146,9 @@ public class EdgeImitator {
             @Override
             public void onFailure(Throwable t) {
                 if (connected) {
-                    DownlinkResponseMsg downlinkResponseMsg = DownlinkResponseMsg.newBuilder().setSuccess(false).setErrorMsg(t.getMessage()).build();
+                    DownlinkResponseMsg downlinkResponseMsg = DownlinkResponseMsg.newBuilder()
+                            .setDownlinkMsgId(downlinkMsg.getDownlinkMsgId())
+                            .setSuccess(false).setErrorMsg(t.getMessage()).build();
                     edgeRpcClient.sendDownlinkResponseMsg(downlinkResponseMsg);
                 }
             }