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