简柏林 / thingskit · Commits

Commit 9dbe3d4d6b8effbc2c031ed29692509c09f9be04

Authored by Volodymyr Babak
1 parent 76d79670

Fixed fetch or SYSTEM rule chains

Inline Side-by-side
Showing 4 changed files with 10 additions and 10 deletions
@@ -21,6 +21,7 @@ import org.thingsboard.server.actors.service.DefaultActorService; @@ -21,6 +21,7 @@ import org.thingsboard.server.actors.service.DefaultActorService;
21 import org.thingsboard.server.common.data.id.TenantId; 21 import org.thingsboard.server.common.data.id.TenantId;
22 import org.thingsboard.server.common.data.page.PageDataIterable.FetchFunction; 22 import org.thingsboard.server.common.data.page.PageDataIterable.FetchFunction;
23 import org.thingsboard.server.common.data.rule.RuleChain; 23 import org.thingsboard.server.common.data.rule.RuleChain;
  24 +import org.thingsboard.server.common.data.rule.RuleChainType;
24 25
25 public class TenantRuleChainManager extends RuleChainManager { 26 public class TenantRuleChainManager extends RuleChainManager {
26 27
@@ -48,6 +49,6 @@ public class TenantRuleChainManager extends RuleChainManager { @@ -48,6 +49,6 @@ public class TenantRuleChainManager extends RuleChainManager {
48 49
49 @Override 50 @Override
50 protected FetchFunction<RuleChain> getFetchEntitiesFunction() { 51 protected FetchFunction<RuleChain> getFetchEntitiesFunction() {
51 - return link -> service.findTenantRuleChains(tenantId, link); 52 + return link -> service.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, link);
52 } 53 }
53 } 54 }
@@ -243,7 +243,7 @@ public class RuleChainController extends BaseController { @@ -243,7 +243,7 @@ public class RuleChainController extends BaseController {
243 RuleChainType type = RuleChainType.valueOf(typeStr); 243 RuleChainType type = RuleChainType.valueOf(typeStr);
244 return checkNotNull(ruleChainService.findTenantRuleChainsByType(tenantId, type, pageLink)); 244 return checkNotNull(ruleChainService.findTenantRuleChainsByType(tenantId, type, pageLink));
245 } else { 245 } else {
246 - return checkNotNull(ruleChainService.findTenantRuleChains(tenantId, pageLink)); 246 + return checkNotNull(ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, pageLink));
247 } 247 }
248 } catch (Exception e) { 248 } catch (Exception e) {
249 throw handleException(e); 249 throw handleException(e);
@@ -61,8 +61,6 @@ public interface RuleChainService { @@ -61,8 +61,6 @@ public interface RuleChainService {
61 61
62 List<EntityRelation> getRuleNodeRelations(TenantId tenantId, RuleNodeId ruleNodeId); 62 List<EntityRelation> getRuleNodeRelations(TenantId tenantId, RuleNodeId ruleNodeId);
63 63
64 - TextPageData<RuleChain> findTenantRuleChains(TenantId tenantId, TextPageLink pageLink);  
65 -  
66 TextPageData<RuleChain> findTenantRuleChainsByType(TenantId tenantId, RuleChainType type, TextPageLink pageLink); 64 TextPageData<RuleChain> findTenantRuleChainsByType(TenantId tenantId, RuleChainType type, TextPageLink pageLink);
67 65
68 void deleteRuleChainById(TenantId tenantId, RuleChainId ruleChainId); 66 void deleteRuleChainById(TenantId tenantId, RuleChainId ruleChainId);
@@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.page.TextPageLink; @@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.page.TextPageLink;
29 import org.thingsboard.server.common.data.relation.EntityRelation; 29 import org.thingsboard.server.common.data.relation.EntityRelation;
30 import org.thingsboard.server.common.data.rule.RuleChain; 30 import org.thingsboard.server.common.data.rule.RuleChain;
31 import org.thingsboard.server.common.data.rule.RuleChainMetaData; 31 import org.thingsboard.server.common.data.rule.RuleChainMetaData;
  32 +import org.thingsboard.server.common.data.rule.RuleChainType;
32 import org.thingsboard.server.common.data.rule.RuleNode; 33 import org.thingsboard.server.common.data.rule.RuleNode;
33 import org.thingsboard.server.dao.exception.DataValidationException; 34 import org.thingsboard.server.dao.exception.DataValidationException;
34 35
@@ -143,7 +144,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { @@ -143,7 +144,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest {
143 TextPageLink pageLink = new TextPageLink(16); 144 TextPageLink pageLink = new TextPageLink(16);
144 TextPageData<RuleChain> pageData = null; 145 TextPageData<RuleChain> pageData = null;
145 do { 146 do {
146 - pageData = ruleChainService.findTenantRuleChains(tenantId, pageLink); 147 + pageData = ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, pageLink);
147 loadedRuleChains.addAll(pageData.getData()); 148 loadedRuleChains.addAll(pageData.getData());
148 if (pageData.hasNext()) { 149 if (pageData.hasNext()) {
149 pageLink = pageData.getNextPageLink(); 150 pageLink = pageData.getNextPageLink();
@@ -158,7 +159,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { @@ -158,7 +159,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest {
158 ruleChainService.deleteRuleChainsByTenantId(tenantId); 159 ruleChainService.deleteRuleChainsByTenantId(tenantId);
159 160
160 pageLink = new TextPageLink(31); 161 pageLink = new TextPageLink(31);
161 - pageData = ruleChainService.findTenantRuleChains(tenantId, pageLink); 162 + pageData = ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, pageLink);
162 Assert.assertFalse(pageData.hasNext()); 163 Assert.assertFalse(pageData.hasNext());
163 Assert.assertTrue(pageData.getData().isEmpty()); 164 Assert.assertTrue(pageData.getData().isEmpty());
164 165
@@ -194,7 +195,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { @@ -194,7 +195,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest {
194 TextPageLink pageLink = new TextPageLink(19, name1); 195 TextPageLink pageLink = new TextPageLink(19, name1);
195 TextPageData<RuleChain> pageData = null; 196 TextPageData<RuleChain> pageData = null;
196 do { 197 do {
197 - pageData = ruleChainService.findTenantRuleChains(tenantId, pageLink); 198 + pageData = ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, pageLink);
198 loadedRuleChainsName1.addAll(pageData.getData()); 199 loadedRuleChainsName1.addAll(pageData.getData());
199 if (pageData.hasNext()) { 200 if (pageData.hasNext()) {
200 pageLink = pageData.getNextPageLink(); 201 pageLink = pageData.getNextPageLink();
@@ -209,7 +210,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { @@ -209,7 +210,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest {
209 List<RuleChain> loadedRuleChainsName2 = new ArrayList<>(); 210 List<RuleChain> loadedRuleChainsName2 = new ArrayList<>();
210 pageLink = new TextPageLink(4, name2); 211 pageLink = new TextPageLink(4, name2);
211 do { 212 do {
212 - pageData = ruleChainService.findTenantRuleChains(tenantId, pageLink); 213 + pageData = ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, pageLink);
213 loadedRuleChainsName2.addAll(pageData.getData()); 214 loadedRuleChainsName2.addAll(pageData.getData());
214 if (pageData.hasNext()) { 215 if (pageData.hasNext()) {
215 pageLink = pageData.getNextPageLink(); 216 pageLink = pageData.getNextPageLink();
@@ -226,7 +227,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { @@ -226,7 +227,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest {
226 } 227 }
227 228
228 pageLink = new TextPageLink(4, name1); 229 pageLink = new TextPageLink(4, name1);
229 - pageData = ruleChainService.findTenantRuleChains(tenantId, pageLink); 230 + pageData = ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, pageLink);
230 Assert.assertFalse(pageData.hasNext()); 231 Assert.assertFalse(pageData.hasNext());
231 Assert.assertEquals(0, pageData.getData().size()); 232 Assert.assertEquals(0, pageData.getData().size());
232 233
@@ -235,7 +236,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest { @@ -235,7 +236,7 @@ public abstract class BaseRuleChainServiceTest extends AbstractServiceTest {
235 } 236 }
236 237
237 pageLink = new TextPageLink(4, name2); 238 pageLink = new TextPageLink(4, name2);
238 - pageData = ruleChainService.findTenantRuleChains(tenantId, pageLink); 239 + pageData = ruleChainService.findTenantRuleChainsByType(tenantId, RuleChainType.SYSTEM, pageLink);
239 Assert.assertFalse(pageData.hasNext()); 240 Assert.assertFalse(pageData.hasNext());
240 Assert.assertEquals(0, pageData.getData().size()); 241 Assert.assertEquals(0, pageData.getData().size());
241 } 242 }