简柏林 / thingskit · Commits

Commit ae8564110a8c4ceadae63bfcccb588e887fbd966

Authored by Volodymyr Babak
1 parent 8f429bee

Code clean up

Inline Side-by-side
Showing 19 changed files with 35 additions and 84 deletions
@@ -373,7 +373,7 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService { @@ -373,7 +373,7 @@ public class DefaultEdgeNotificationService implements EdgeNotificationService {
373 } 373 }
374 374
375 private void updateDependentRuleChains(TenantId tenantId, RuleChainId processingRuleChainId, EdgeId edgeId) { 375 private void updateDependentRuleChains(TenantId tenantId, RuleChainId processingRuleChainId, EdgeId edgeId) {
376 - TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT); 376 + PageLink pageLink = new PageLink(DEFAULT_LIMIT);
377 PageData<RuleChain> pageData; 377 PageData<RuleChain> pageData;
378 do { 378 do {
379 pageData = ruleChainService.findRuleChainsByTenantIdAndEdgeId(tenantId, edgeId, pageLink); 379 pageData = ruleChainService.findRuleChainsByTenantIdAndEdgeId(tenantId, edgeId, pageLink);
@@ -55,7 +55,7 @@ import org.thingsboard.server.common.data.id.UserId; @@ -55,7 +55,7 @@ import org.thingsboard.server.common.data.id.UserId;
55 import org.thingsboard.server.common.data.kv.AttributeKvEntry; 55 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
56 import org.thingsboard.server.common.data.kv.DataType; 56 import org.thingsboard.server.common.data.kv.DataType;
57 import org.thingsboard.server.common.data.page.PageData; 57 import org.thingsboard.server.common.data.page.PageData;
58 -import org.thingsboard.server.common.data.page.TimePageLink; 58 +import org.thingsboard.server.common.data.page.PageLink;
59 import org.thingsboard.server.common.data.relation.EntityRelation; 59 import org.thingsboard.server.common.data.relation.EntityRelation;
60 import org.thingsboard.server.common.data.relation.EntityRelationsQuery; 60 import org.thingsboard.server.common.data.relation.EntityRelationsQuery;
61 import org.thingsboard.server.common.data.relation.EntitySearchDirection; 61 import org.thingsboard.server.common.data.relation.EntitySearchDirection;
@@ -170,7 +170,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @@ -170,7 +170,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
170 private void syncRuleChains(TenantId tenantId, Edge edge) { 170 private void syncRuleChains(TenantId tenantId, Edge edge) {
171 log.trace("[{}] syncRuleChains [{}]", tenantId, edge.getName()); 171 log.trace("[{}] syncRuleChains [{}]", tenantId, edge.getName());
172 try { 172 try {
173 - TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT); 173 + PageLink pageLink = new PageLink(DEFAULT_LIMIT);
174 PageData<RuleChain> pageData; 174 PageData<RuleChain> pageData;
175 do { 175 do {
176 pageData = ruleChainService.findRuleChainsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink); 176 pageData = ruleChainService.findRuleChainsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
@@ -192,7 +192,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @@ -192,7 +192,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
192 private void syncDevices(TenantId tenantId, Edge edge) { 192 private void syncDevices(TenantId tenantId, Edge edge) {
193 log.trace("[{}] syncDevices [{}]", tenantId, edge.getName()); 193 log.trace("[{}] syncDevices [{}]", tenantId, edge.getName());
194 try { 194 try {
195 - TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT); 195 + PageLink pageLink = new PageLink(DEFAULT_LIMIT);
196 PageData<Device> pageData; 196 PageData<Device> pageData;
197 do { 197 do {
198 pageData = deviceService.findDevicesByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink); 198 pageData = deviceService.findDevicesByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
@@ -214,7 +214,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @@ -214,7 +214,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
214 private void syncDeviceProfiles(TenantId tenantId, Edge edge) { 214 private void syncDeviceProfiles(TenantId tenantId, Edge edge) {
215 log.trace("[{}] syncDeviceProfiles [{}]", tenantId, edge.getName()); 215 log.trace("[{}] syncDeviceProfiles [{}]", tenantId, edge.getName());
216 try { 216 try {
217 - TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT); 217 + PageLink pageLink = new PageLink(DEFAULT_LIMIT);
218 PageData<DeviceProfile> pageData; 218 PageData<DeviceProfile> pageData;
219 do { 219 do {
220 pageData = deviceProfileService.findDeviceProfiles(tenantId, pageLink); 220 pageData = deviceProfileService.findDeviceProfiles(tenantId, pageLink);
@@ -236,7 +236,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @@ -236,7 +236,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
236 private void syncAssets(TenantId tenantId, Edge edge) { 236 private void syncAssets(TenantId tenantId, Edge edge) {
237 log.trace("[{}] syncAssets [{}]", tenantId, edge.getName()); 237 log.trace("[{}] syncAssets [{}]", tenantId, edge.getName());
238 try { 238 try {
239 - TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT); 239 + PageLink pageLink = new PageLink(DEFAULT_LIMIT);
240 PageData<Asset> pageData; 240 PageData<Asset> pageData;
241 do { 241 do {
242 pageData = assetService.findAssetsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink); 242 pageData = assetService.findAssetsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
@@ -258,7 +258,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @@ -258,7 +258,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
258 private void syncEntityViews(TenantId tenantId, Edge edge) { 258 private void syncEntityViews(TenantId tenantId, Edge edge) {
259 log.trace("[{}] syncEntityViews [{}]", tenantId, edge.getName()); 259 log.trace("[{}] syncEntityViews [{}]", tenantId, edge.getName());
260 try { 260 try {
261 - TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT); 261 + PageLink pageLink = new PageLink(DEFAULT_LIMIT);
262 PageData<EntityView> pageData; 262 PageData<EntityView> pageData;
263 do { 263 do {
264 pageData = entityViewService.findEntityViewsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink); 264 pageData = entityViewService.findEntityViewsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
@@ -280,7 +280,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @@ -280,7 +280,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
280 private void syncDashboards(TenantId tenantId, Edge edge) { 280 private void syncDashboards(TenantId tenantId, Edge edge) {
281 log.trace("[{}] syncDashboards [{}]", tenantId, edge.getName()); 281 log.trace("[{}] syncDashboards [{}]", tenantId, edge.getName());
282 try { 282 try {
283 - TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT); 283 + PageLink pageLink = new PageLink(DEFAULT_LIMIT);
284 PageData<DashboardInfo> pageData; 284 PageData<DashboardInfo> pageData;
285 do { 285 do {
286 pageData = dashboardService.findDashboardsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink); 286 pageData = dashboardService.findDashboardsByTenantIdAndEdgeId(tenantId, edge.getId(), pageLink);
@@ -302,7 +302,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @@ -302,7 +302,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
302 private void syncUsers(TenantId tenantId, Edge edge) { 302 private void syncUsers(TenantId tenantId, Edge edge) {
303 log.trace("[{}] syncUsers [{}]", tenantId, edge.getName()); 303 log.trace("[{}] syncUsers [{}]", tenantId, edge.getName());
304 try { 304 try {
305 - TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT); 305 + PageLink pageLink = new PageLink(DEFAULT_LIMIT);
306 PageData<User> pageData; 306 PageData<User> pageData;
307 do { 307 do {
308 pageData = userService.findTenantAdmins(tenantId, pageLink); 308 pageData = userService.findTenantAdmins(tenantId, pageLink);
@@ -320,7 +320,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService { @@ -320,7 +320,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
320 private void syncCustomerUsers(TenantId tenantId, Edge edge) { 320 private void syncCustomerUsers(TenantId tenantId, Edge edge) {
321 if (edge.getCustomerId() != null && !EntityId.NULL_UUID.equals(edge.getCustomerId().getId())) { 321 if (edge.getCustomerId() != null && !EntityId.NULL_UUID.equals(edge.getCustomerId().getId())) {
322 saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.CUSTOMER, EdgeEventActionType.ADDED, edge.getCustomerId(), null); 322 saveEdgeEvent(tenantId, edge.getId(), EdgeEventType.CUSTOMER, EdgeEventActionType.ADDED, edge.getCustomerId(), null);
323 - TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT); 323 + PageLink pageLink = new PageLink(DEFAULT_LIMIT);
324 PageData<User> pageData; 324 PageData<User> pageData;
325 do { 325 do {
326 pageData = userService.findCustomerUsers(tenantId, edge.getCustomerId(), pageLink); 326 pageData = userService.findCustomerUsers(tenantId, edge.getCustomerId(), pageLink);
@@ -20,7 +20,6 @@ import freemarker.template.Configuration; @@ -20,7 +20,6 @@ import freemarker.template.Configuration;
20 import freemarker.template.Template; 20 import freemarker.template.Template;
21 import lombok.extern.slf4j.Slf4j; 21 import lombok.extern.slf4j.Slf4j;
22 import org.apache.commons.lang3.StringUtils; 22 import org.apache.commons.lang3.StringUtils;
23 -import org.jetbrains.annotations.NotNull;  
24 import org.springframework.beans.factory.annotation.Autowired; 23 import org.springframework.beans.factory.annotation.Autowired;
25 import org.springframework.context.MessageSource; 24 import org.springframework.context.MessageSource;
26 import org.springframework.context.annotation.Lazy; 25 import org.springframework.context.annotation.Lazy;
@@ -374,7 +373,6 @@ public class DefaultMailService implements MailService { @@ -374,7 +373,6 @@ public class DefaultMailService implements MailService {
374 } 373 }
375 } 374 }
376 375
377 - @NotNull  
378 private String getValueAsString(long value) { 376 private String getValueAsString(long value) {
379 if (value > _1M && value % _1M < _10K) { 377 if (value > _1M && value % _1M < _10K) {
380 return value / _1M + "M"; 378 return value / _1M + "M";
1 -/**  
2 - * Copyright © 2016-2021 The Thingsboard Authors  
3 - *  
4 - * Licensed under the Apache License, Version 2.0 (the "License");  
5 - * you may not use this file except in compliance with the License.  
6 - * You may obtain a copy of the License at  
7 - *  
8 - * http://www.apache.org/licenses/LICENSE-2.0  
9 - *  
10 - * Unless required by applicable law or agreed to in writing, software  
11 - * distributed under the License is distributed on an "AS IS" BASIS,  
12 - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
13 - * See the License for the specific language governing permissions and  
14 - * limitations under the License.  
15 - */  
16 -package org.thingsboard.server.controller.nosql;  
17 -  
18 -import org.thingsboard.server.controller.BaseEdgeEventControllerTest;  
19 -import org.thingsboard.server.dao.service.DaoNoSqlTest;  
20 -  
21 -@DaoNoSqlTest  
22 -public class EdgeEventControllerNoSqlTest extends BaseEdgeEventControllerTest {  
23 -}  
1 -/**  
2 - * Copyright © 2016-2021 The Thingsboard Authors  
3 - *  
4 - * Licensed under the Apache License, Version 2.0 (the "License");  
5 - * you may not use this file except in compliance with the License.  
6 - * You may obtain a copy of the License at  
7 - *  
8 - * http://www.apache.org/licenses/LICENSE-2.0  
9 - *  
10 - * Unless required by applicable law or agreed to in writing, software  
11 - * distributed under the License is distributed on an "AS IS" BASIS,  
12 - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
13 - * See the License for the specific language governing permissions and  
14 - * limitations under the License.  
15 - */  
16 -package org.thingsboard.server.edge.nosql;  
17 -  
18 -import org.thingsboard.server.dao.service.DaoNoSqlTest;  
19 -import org.thingsboard.server.edge.BaseEdgeTest;  
20 -  
21 -@DaoNoSqlTest  
22 -public class EdgeNoSqlTest extends BaseEdgeTest {  
23 -}  
@@ -81,7 +81,7 @@ public interface AssetService { @@ -81,7 +81,7 @@ public interface AssetService {
81 81
82 Asset unassignAssetFromEdge(TenantId tenantId, AssetId assetId, EdgeId edgeId); 82 Asset unassignAssetFromEdge(TenantId tenantId, AssetId assetId, EdgeId edgeId);
83 83
84 - PageData<Asset> findAssetsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink); 84 + PageData<Asset> findAssetsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink);
85 85
86 - PageData<Asset> findAssetsByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, TimePageLink pageLink); 86 + PageData<Asset> findAssetsByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, PageLink pageLink);
87 } 87 }
@@ -24,7 +24,6 @@ import org.thingsboard.server.common.data.id.EdgeId; @@ -24,7 +24,6 @@ import org.thingsboard.server.common.data.id.EdgeId;
24 import org.thingsboard.server.common.data.id.TenantId; 24 import org.thingsboard.server.common.data.id.TenantId;
25 import org.thingsboard.server.common.data.page.PageData; 25 import org.thingsboard.server.common.data.page.PageData;
26 import org.thingsboard.server.common.data.page.PageLink; 26 import org.thingsboard.server.common.data.page.PageLink;
27 -import org.thingsboard.server.common.data.page.TimePageLink;  
28 27
29 public interface DashboardService { 28 public interface DashboardService {
30 29
@@ -58,5 +57,5 @@ public interface DashboardService { @@ -58,5 +57,5 @@ public interface DashboardService {
58 57
59 Dashboard unassignDashboardFromEdge(TenantId tenantId, DashboardId dashboardId, EdgeId edgeId); 58 Dashboard unassignDashboardFromEdge(TenantId tenantId, DashboardId dashboardId, EdgeId edgeId);
60 59
61 - PageData<DashboardInfo> findDashboardsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink); 60 + PageData<DashboardInfo> findDashboardsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink);
62 } 61 }
@@ -93,7 +93,7 @@ public interface DeviceService { @@ -93,7 +93,7 @@ public interface DeviceService {
93 93
94 Device unassignDeviceFromEdge(TenantId tenantId, DeviceId deviceId, EdgeId edgeId); 94 Device unassignDeviceFromEdge(TenantId tenantId, DeviceId deviceId, EdgeId edgeId);
95 95
96 - PageData<Device> findDevicesByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink); 96 + PageData<Device> findDevicesByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink);
97 97
98 - PageData<Device> findDevicesByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, TimePageLink pageLink); 98 + PageData<Device> findDevicesByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, PageLink pageLink);
99 } 99 }
@@ -82,7 +82,7 @@ public interface EntityViewService { @@ -82,7 +82,7 @@ public interface EntityViewService {
82 82
83 EntityView unassignEntityViewFromEdge(TenantId tenantId, EntityViewId entityViewId, EdgeId edgeId); 83 EntityView unassignEntityViewFromEdge(TenantId tenantId, EntityViewId entityViewId, EdgeId edgeId);
84 84
85 - PageData<EntityView> findEntityViewsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink); 85 + PageData<EntityView> findEntityViewsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink);
86 86
87 - PageData<EntityView> findEntityViewsByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, TimePageLink pageLink); 87 + PageData<EntityView> findEntityViewsByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, PageLink pageLink);
88 } 88 }
@@ -176,7 +176,7 @@ public interface AssetDao extends Dao<Asset>, TenantEntityDao { @@ -176,7 +176,7 @@ public interface AssetDao extends Dao<Asset>, TenantEntityDao {
176 * @param pageLink the page link 176 * @param pageLink the page link
177 * @return the list of asset objects 177 * @return the list of asset objects
178 */ 178 */
179 - PageData<Asset> findAssetsByTenantIdAndEdgeId(UUID tenantId, UUID edgeId, TimePageLink pageLink); 179 + PageData<Asset> findAssetsByTenantIdAndEdgeId(UUID tenantId, UUID edgeId, PageLink pageLink);
180 180
181 /** 181 /**
182 * Find assets by tenantId, edgeId, type and page link. 182 * Find assets by tenantId, edgeId, type and page link.
@@ -187,5 +187,5 @@ public interface AssetDao extends Dao<Asset>, TenantEntityDao { @@ -187,5 +187,5 @@ public interface AssetDao extends Dao<Asset>, TenantEntityDao {
187 * @param pageLink the page link 187 * @param pageLink the page link
188 * @return the list of asset objects 188 * @return the list of asset objects
189 */ 189 */
190 - PageData<Asset> findAssetsByTenantIdAndEdgeIdAndType(UUID tenantId, UUID edgeId, String type, TimePageLink pageLink); 190 + PageData<Asset> findAssetsByTenantIdAndEdgeIdAndType(UUID tenantId, UUID edgeId, String type, PageLink pageLink);
191 } 191 }
@@ -364,7 +364,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ @@ -364,7 +364,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ
364 } 364 }
365 365
366 @Override 366 @Override
367 - public PageData<Asset> findAssetsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) { 367 + public PageData<Asset> findAssetsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink) {
368 log.trace("Executing findAssetsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink); 368 log.trace("Executing findAssetsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
369 validateId(tenantId, INCORRECT_TENANT_ID + tenantId); 369 validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
370 validateId(edgeId, INCORRECT_EDGE_ID + edgeId); 370 validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
@@ -373,7 +373,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ @@ -373,7 +373,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ
373 } 373 }
374 374
375 @Override 375 @Override
376 - public PageData<Asset> findAssetsByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, TimePageLink pageLink) { 376 + public PageData<Asset> findAssetsByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, PageLink pageLink) {
377 log.trace("Executing findAssetsByTenantIdAndEdgeIdAndType, tenantId [{}], edgeId [{}], type [{}] pageLink [{}]", tenantId, edgeId, type, pageLink); 377 log.trace("Executing findAssetsByTenantIdAndEdgeIdAndType, tenantId [{}], edgeId [{}], type [{}] pageLink [{}]", tenantId, edgeId, type, pageLink);
378 validateId(tenantId, INCORRECT_TENANT_ID + tenantId); 378 validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
379 validateId(edgeId, INCORRECT_EDGE_ID + edgeId); 379 validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
@@ -251,7 +251,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb @@ -251,7 +251,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb
251 } 251 }
252 252
253 @Override 253 @Override
254 - public PageData<DashboardInfo> findDashboardsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) { 254 + public PageData<DashboardInfo> findDashboardsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink) {
255 log.trace("Executing findDashboardsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink); 255 log.trace("Executing findDashboardsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
256 Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId); 256 Validator.validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
257 Validator.validateId(edgeId, INCORRECT_EDGE_ID + edgeId); 257 Validator.validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
@@ -226,7 +226,7 @@ public interface DeviceDao extends Dao<Device>, TenantEntityDao { @@ -226,7 +226,7 @@ public interface DeviceDao extends Dao<Device>, TenantEntityDao {
226 * @param pageLink the page link 226 * @param pageLink the page link
227 * @return the list of device objects 227 * @return the list of device objects
228 */ 228 */
229 - PageData<Device> findDevicesByTenantIdAndEdgeId(UUID tenantId, UUID edgeId, TimePageLink pageLink); 229 + PageData<Device> findDevicesByTenantIdAndEdgeId(UUID tenantId, UUID edgeId, PageLink pageLink);
230 230
231 /** 231 /**
232 * Find devices by tenantId, edgeId, type and page link. 232 * Find devices by tenantId, edgeId, type and page link.
@@ -237,5 +237,5 @@ public interface DeviceDao extends Dao<Device>, TenantEntityDao { @@ -237,5 +237,5 @@ public interface DeviceDao extends Dao<Device>, TenantEntityDao {
237 * @param pageLink the page link 237 * @param pageLink the page link
238 * @return the list of device objects 238 * @return the list of device objects
239 */ 239 */
240 - PageData<Device> findDevicesByTenantIdAndEdgeIdAndType(UUID tenantId, UUID edgeId, String type, TimePageLink pageLink); 240 + PageData<Device> findDevicesByTenantIdAndEdgeIdAndType(UUID tenantId, UUID edgeId, String type, PageLink pageLink);
241 } 241 }
@@ -564,7 +564,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe @@ -564,7 +564,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
564 } 564 }
565 565
566 @Override 566 @Override
567 - public PageData<Device> findDevicesByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) { 567 + public PageData<Device> findDevicesByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink) {
568 log.trace("Executing findDevicesByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink); 568 log.trace("Executing findDevicesByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
569 validateId(tenantId, INCORRECT_TENANT_ID + tenantId); 569 validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
570 validateId(edgeId, INCORRECT_EDGE_ID + edgeId); 570 validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
@@ -573,7 +573,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe @@ -573,7 +573,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe
573 } 573 }
574 574
575 @Override 575 @Override
576 - public PageData<Device> findDevicesByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, TimePageLink pageLink) { 576 + public PageData<Device> findDevicesByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, PageLink pageLink) {
577 log.trace("Executing findDevicesByTenantIdAndEdgeIdAndType, tenantId [{}], edgeId [{}], type [{}] pageLink [{}]", tenantId, edgeId, type, pageLink); 577 log.trace("Executing findDevicesByTenantIdAndEdgeIdAndType, tenantId [{}], edgeId [{}], type [{}] pageLink [{}]", tenantId, edgeId, type, pageLink);
578 validateId(tenantId, INCORRECT_TENANT_ID + tenantId); 578 validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
579 validateId(edgeId, INCORRECT_EDGE_ID + edgeId); 579 validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
@@ -496,6 +496,8 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic @@ -496,6 +496,8 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
496 496
497 @Override 497 @Override
498 public ListenableFuture<List<EdgeId>> findRelatedEdgeIdsByEntityId(TenantId tenantId, EntityId entityId) { 498 public ListenableFuture<List<EdgeId>> findRelatedEdgeIdsByEntityId(TenantId tenantId, EntityId entityId) {
  499 + // TODO: voba - rewrite 'find' to use native SQL queries instead of fetching relations
  500 +
499 log.trace("[{}] Executing findRelatedEdgeIdsByEntityId [{}]", tenantId, entityId); 501 log.trace("[{}] Executing findRelatedEdgeIdsByEntityId [{}]", tenantId, entityId);
500 if (EntityType.TENANT.equals(entityId.getEntityType()) || 502 if (EntityType.TENANT.equals(entityId.getEntityType()) ||
501 EntityType.CUSTOMER.equals(entityId.getEntityType()) || 503 EntityType.CUSTOMER.equals(entityId.getEntityType()) ||
@@ -622,7 +624,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic @@ -622,7 +624,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
622 624
623 private List<RuleChain> findEdgeRuleChains(TenantId tenantId, EdgeId edgeId) { 625 private List<RuleChain> findEdgeRuleChains(TenantId tenantId, EdgeId edgeId) {
624 List<RuleChain> result = new ArrayList<>(); 626 List<RuleChain> result = new ArrayList<>();
625 - TimePageLink pageLink = new TimePageLink(DEFAULT_LIMIT); 627 + PageLink pageLink = new PageLink(DEFAULT_LIMIT);
626 PageData<RuleChain> pageData; 628 PageData<RuleChain> pageData;
627 do { 629 do {
628 pageData = ruleChainService.findRuleChainsByTenantIdAndEdgeId(tenantId, edgeId, pageLink); 630 pageData = ruleChainService.findRuleChainsByTenantIdAndEdgeId(tenantId, edgeId, pageLink);
@@ -382,7 +382,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti @@ -382,7 +382,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
382 } 382 }
383 383
384 @Override 384 @Override
385 - public PageData<EntityView> findEntityViewsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, TimePageLink pageLink) { 385 + public PageData<EntityView> findEntityViewsByTenantIdAndEdgeId(TenantId tenantId, EdgeId edgeId, PageLink pageLink) {
386 log.trace("Executing findEntityViewsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink); 386 log.trace("Executing findEntityViewsByTenantIdAndEdgeId, tenantId [{}], edgeId [{}], pageLink [{}]", tenantId, edgeId, pageLink);
387 validateId(tenantId, INCORRECT_TENANT_ID + tenantId); 387 validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
388 validateId(edgeId, INCORRECT_EDGE_ID + edgeId); 388 validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
@@ -391,7 +391,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti @@ -391,7 +391,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
391 } 391 }
392 392
393 @Override 393 @Override
394 - public PageData<EntityView> findEntityViewsByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, TimePageLink pageLink) { 394 + public PageData<EntityView> findEntityViewsByTenantIdAndEdgeIdAndType(TenantId tenantId, EdgeId edgeId, String type, PageLink pageLink) {
395 log.trace("Executing findEntityViewsByTenantIdAndEdgeIdAndType, tenantId [{}], edgeId [{}], type [{}], pageLink [{}]", tenantId, edgeId, type, pageLink); 395 log.trace("Executing findEntityViewsByTenantIdAndEdgeIdAndType, tenantId [{}], edgeId [{}], type [{}], pageLink [{}]", tenantId, edgeId, type, pageLink);
396 validateId(tenantId, INCORRECT_TENANT_ID + tenantId); 396 validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
397 validateId(edgeId, INCORRECT_EDGE_ID + edgeId); 397 validateId(edgeId, INCORRECT_EDGE_ID + edgeId);
@@ -189,7 +189,7 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao<AssetEntity, Asset> im @@ -189,7 +189,7 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao<AssetEntity, Asset> im
189 } 189 }
190 190
191 @Override 191 @Override
192 - public PageData<Asset> findAssetsByTenantIdAndEdgeId(UUID tenantId, UUID edgeId, TimePageLink pageLink) { 192 + public PageData<Asset> findAssetsByTenantIdAndEdgeId(UUID tenantId, UUID edgeId, PageLink pageLink) {
193 log.debug("Try to find assets by tenantId [{}], edgeId [{}] and pageLink [{}]", tenantId, edgeId, pageLink); 193 log.debug("Try to find assets by tenantId [{}], edgeId [{}] and pageLink [{}]", tenantId, edgeId, pageLink);
194 return DaoUtil.toPageData(assetRepository 194 return DaoUtil.toPageData(assetRepository
195 .findByTenantIdAndEdgeId( 195 .findByTenantIdAndEdgeId(
@@ -200,7 +200,7 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao<AssetEntity, Asset> im @@ -200,7 +200,7 @@ public class JpaAssetDao extends JpaAbstractSearchTextDao<AssetEntity, Asset> im
200 } 200 }
201 201
202 @Override 202 @Override
203 - public PageData<Asset> findAssetsByTenantIdAndEdgeIdAndType(UUID tenantId, UUID edgeId, String type, TimePageLink pageLink) { 203 + public PageData<Asset> findAssetsByTenantIdAndEdgeIdAndType(UUID tenantId, UUID edgeId, String type, PageLink pageLink) {
204 log.debug("Try to find assets by tenantId [{}], edgeId [{}], type [{}] and pageLink [{}]", tenantId, edgeId, type, pageLink); 204 log.debug("Try to find assets by tenantId [{}], edgeId [{}], type [{}] and pageLink [{}]", tenantId, edgeId, type, pageLink);
205 return DaoUtil.toPageData(assetRepository 205 return DaoUtil.toPageData(assetRepository
206 .findByTenantIdAndEdgeIdAndType( 206 .findByTenantIdAndEdgeIdAndType(
@@ -239,7 +239,7 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao<DeviceEntity, Device> @@ -239,7 +239,7 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao<DeviceEntity, Device>
239 } 239 }
240 240
241 @Override 241 @Override
242 - public PageData<Device> findDevicesByTenantIdAndEdgeId(UUID tenantId, UUID edgeId, TimePageLink pageLink) { 242 + public PageData<Device> findDevicesByTenantIdAndEdgeId(UUID tenantId, UUID edgeId, PageLink pageLink) {
243 log.debug("Try to find devices by tenantId [{}], edgeId [{}] and pageLink [{}]", tenantId, edgeId, pageLink); 243 log.debug("Try to find devices by tenantId [{}], edgeId [{}] and pageLink [{}]", tenantId, edgeId, pageLink);
244 return DaoUtil.toPageData(deviceRepository 244 return DaoUtil.toPageData(deviceRepository
245 .findByTenantIdAndEdgeId( 245 .findByTenantIdAndEdgeId(
@@ -250,7 +250,7 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao<DeviceEntity, Device> @@ -250,7 +250,7 @@ public class JpaDeviceDao extends JpaAbstractSearchTextDao<DeviceEntity, Device>
250 } 250 }
251 251
252 @Override 252 @Override
253 - public PageData<Device> findDevicesByTenantIdAndEdgeIdAndType(UUID tenantId, UUID edgeId, String type, TimePageLink pageLink) { 253 + public PageData<Device> findDevicesByTenantIdAndEdgeIdAndType(UUID tenantId, UUID edgeId, String type, PageLink pageLink) {
254 log.debug("Try to find devices by tenantId [{}], edgeId [{}], type [{}] and pageLink [{}]", tenantId, edgeId, type, pageLink); 254 log.debug("Try to find devices by tenantId [{}], edgeId [{}], type [{}] and pageLink [{}]", tenantId, edgeId, type, pageLink);
255 return DaoUtil.toPageData(deviceRepository 255 return DaoUtil.toPageData(deviceRepository
256 .findByTenantIdAndEdgeIdAndType( 256 .findByTenantIdAndEdgeIdAndType(
@@ -21,7 +21,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; @@ -21,7 +21,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
21 import com.google.common.util.concurrent.Futures; 21 import com.google.common.util.concurrent.Futures;
22 import com.google.common.util.concurrent.ListenableFuture; 22 import com.google.common.util.concurrent.ListenableFuture;
23 import org.apache.commons.lang3.RandomStringUtils; 23 import org.apache.commons.lang3.RandomStringUtils;
24 -import org.jetbrains.annotations.NotNull;  
25 import org.junit.After; 24 import org.junit.After;
26 import org.junit.Assert; 25 import org.junit.Assert;
27 import org.junit.Before; 26 import org.junit.Before;
@@ -262,7 +261,6 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest { @@ -262,7 +261,6 @@ public abstract class BaseEntityServiceTest extends AbstractServiceTest {
262 Assert.assertEquals(2, count); 261 Assert.assertEquals(2, count);
263 } 262 }
264 263
265 - @NotNull  
266 private Edge createEdge(int i, String type) { 264 private Edge createEdge(int i, String type) {
267 Edge edge = new Edge(); 265 Edge edge = new Edge();
268 edge.setTenantId(tenantId); 266 edge.setTenantId(tenantId);