From 17d5db7aa126e64541d237677321e50c2d55c523 Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Tue, 17 Feb 2026 18:29:36 +0200
Subject: [PATCH] Copilot review changes

---
 .../edge/rpc/fetch/AdminSettingsEdgeEventFetcher.java  |  4 ++--
 .../processor/settings/AdminSettingsEdgeProcessor.java | 10 ++++++++--
 .../server/dao/service/AdminSettingsServiceTest.java   |  2 --
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AdminSettingsEdgeEventFetcher.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AdminSettingsEdgeEventFetcher.java
index b18c05cd53..47e004ac82 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AdminSettingsEdgeEventFetcher.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/fetch/AdminSettingsEdgeEventFetcher.java
@@ -33,11 +33,11 @@ import org.thingsboard.server.dao.settings.AdminSettingsService;
 public class AdminSettingsEdgeEventFetcher extends BasePageableEdgeEventFetcher<AdminSettings> {
 
     private final AdminSettingsService adminSettingsService;
-    private final TenantId tenantId;
+    private final TenantId fetcherTenantId;
 
     @Override
     PageData<AdminSettings> fetchEntities(TenantId tenantId, Edge edge, PageLink pageLink) {
-        return adminSettingsService.findAllByTenantId(this.tenantId, pageLink);
+        return adminSettingsService.findAllByTenantId(fetcherTenantId, pageLink);
     }
 
     @Override
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/settings/AdminSettingsEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/settings/AdminSettingsEdgeProcessor.java
index 96210e6325..2e0a65f324 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/settings/AdminSettingsEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/settings/AdminSettingsEdgeProcessor.java
@@ -36,8 +36,14 @@ public class AdminSettingsEdgeProcessor extends BaseEdgeProcessor {
 
     @Override
     public DownlinkMsg convertEdgeEventToDownlink(EdgeEvent edgeEvent, EdgeVersion edgeVersion) {
-        AdminSettingsId adminSettingsId = new AdminSettingsId(edgeEvent.getEntityId());
-        AdminSettings adminSettings = edgeCtx.getAdminSettingsService().findAdminSettingsById(edgeEvent.getTenantId(), adminSettingsId);
+        AdminSettings adminSettings = null;
+        if (edgeEvent.getEntityId() != null) {
+            AdminSettingsId adminSettingsId = new AdminSettingsId(edgeEvent.getEntityId());
+            adminSettings = edgeCtx.getAdminSettingsService().findAdminSettingsById(edgeEvent.getTenantId(), adminSettingsId);
+        } else if (edgeEvent.getBody() != null && !edgeEvent.getBody().isEmpty()) {
+            // legacy
+            adminSettings = JacksonUtil.convertValue(edgeEvent.getBody(), AdminSettings.class);
+        }
         if (adminSettings == null) {
             return null;
         }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceTest.java
index 043e01f482..1b7924aad6 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceTest.java
@@ -17,7 +17,6 @@ package org.thingsboard.server.dao.service;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
@@ -35,7 +34,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
-@Slf4j
 @DaoSqlTest
 public class AdminSettingsServiceTest extends AbstractServiceTest {