From a75093faa786ece4c109545ec645f964e8de0cbd Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Thu, 7 Sep 2023 13:39:33 +0300
Subject: [PATCH] Refactor forwardToEventService in core consumer service

---
 .../service/queue/DefaultTbCoreConsumerService.java    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
index db0b7c3809..f6623b62a3 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
@@ -24,6 +24,7 @@ import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import org.thingsboard.common.util.DonAsynchron;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.actors.ActorSystemContext;
@@ -664,12 +665,9 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
     }
 
     private void forwardToEventService(Event event, TbCallback callback) {
-        try {
-            actorContext.getEventService().saveAsync(event);
-            callback.onSuccess();
-        } catch (Exception e) {
-            callback.onFailure(e);
-        }
+        DonAsynchron.withCallback(actorContext.getEventService().saveAsync(event),
+                result -> callback.onSuccess(),
+                callback::onFailure);
     }
 
     private void throwNotHandled(Object msg, TbCallback callback) {