From bbf47434fdc5d931881f369b3d2624ec6b1e89bc Mon Sep 17 00:00:00 2001
From: Viacheslav Klimov <viacheslavklimov11@gmail.com>
Date: Fri, 3 Apr 2026 17:42:17 +0300
Subject: [PATCH] Simplify RuleChainDetailsDao interface and refactor save to
 doSave

---
 .../server/dao/rule/RuleChainDetailsDao.java           | 10 ++--------
 .../server/dao/sql/rule/JpaRuleChainDetailsDao.java    |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainDetailsDao.java b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainDetailsDao.java
index 17e90d84bd..f7ab9d8662 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainDetailsDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleChainDetailsDao.java
@@ -15,15 +15,9 @@
  */
 package org.thingsboard.server.dao.rule;
 
-import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.rule.RuleChainDetails;
+import org.thingsboard.server.dao.Dao;
 
-import java.util.UUID;
-
-public interface RuleChainDetailsDao {
-
-    RuleChainDetails findById(TenantId tenantId, UUID id);
-
-    RuleChainDetails save(TenantId tenantId, RuleChainDetails ruleChainDetails);
+public interface RuleChainDetailsDao extends Dao<RuleChainDetails> {
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleChainDetailsDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleChainDetailsDao.java
index d3ec79c175..3381bae386 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleChainDetailsDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/rule/JpaRuleChainDetailsDao.java
@@ -52,9 +52,9 @@ public class JpaRuleChainDetailsDao extends JpaAbstractDao<RuleChainDetailsEntit
     }
 
     @Override
-    public RuleChainDetails save(TenantId tenantId, RuleChainDetails ruleChainDetails) {
+    protected RuleChainDetailsEntity doSave(RuleChainDetailsEntity entity, boolean isNew, boolean flush) {
         try {
-            return super.save(tenantId, ruleChainDetails);
+            return super.doSave(entity, isNew, flush);
         } catch (Exception e) {
             String rootMsg = ExceptionUtils.getRootCauseMessage(e);
             if (StringUtils.contains(rootMsg, "value too long")) {