简柏林 / thingskit · Commits

Commit 2748a755c02f6e7e86186e4fc3764e815ffd23d7

Authored by Volodymyr Babak
1 parent bf0b7306

Code cleanup

Inline Side-by-side
Showing 4 changed files with 15 additions and 20 deletions
@@ -110,8 +110,8 @@ public class CassandraEdgeDao extends CassandraAbstractSearchTextDao<EdgeEntity, @@ -110,8 +110,8 @@ public class CassandraEdgeDao extends CassandraAbstractSearchTextDao<EdgeEntity,
110 } 110 }
111 111
112 @Override 112 @Override
113 - public ListenableFuture<List<Edge>> findEdgesByTenantIdAndRuleChainId(UUID tenantId, UUID ruleChainId, TimePageLink pageLink) {  
114 - log.debug("Try to find edges by tenantId [{}], ruleChainId [{}] and pageLink [{}]", tenantId, ruleChainId, pageLink); 113 + public ListenableFuture<List<Edge>> findEdgesByTenantIdAndRuleChainId(UUID tenantId, UUID ruleChainId) {
  114 + log.debug("Try to find edges by tenantId [{}], ruleChainId [{}]", tenantId, ruleChainId);
115 ListenableFuture<List<EntityRelation>> relations = relationDao.findAllByToAndType(new TenantId(tenantId), new RuleChainId(ruleChainId), EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE); 115 ListenableFuture<List<EntityRelation>> relations = relationDao.findAllByToAndType(new TenantId(tenantId), new RuleChainId(ruleChainId), EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE);
116 return Futures.transformAsync(relations, input -> { 116 return Futures.transformAsync(relations, input -> {
117 List<ListenableFuture<Edge>> edgeFutures = new ArrayList<>(input.size()); 117 List<ListenableFuture<Edge>> edgeFutures = new ArrayList<>(input.size());
@@ -123,8 +123,8 @@ public class CassandraEdgeDao extends CassandraAbstractSearchTextDao<EdgeEntity, @@ -123,8 +123,8 @@ public class CassandraEdgeDao extends CassandraAbstractSearchTextDao<EdgeEntity,
123 } 123 }
124 124
125 @Override 125 @Override
126 - public ListenableFuture<List<Edge>> findEdgesByTenantIdAndDashboardId(UUID tenantId, UUID dashboardId, TimePageLink pageLink) {  
127 - log.debug("Try to find edges by tenantId [{}], dashboardId [{}] and pageLink [{}]", tenantId, dashboardId, pageLink); 126 + public ListenableFuture<List<Edge>> findEdgesByTenantIdAndDashboardId(UUID tenantId, UUID dashboardId) {
  127 + log.debug("Try to find edges by tenantId [{}], dashboardId [{}]", tenantId, dashboardId);
128 ListenableFuture<List<EntityRelation>> relations = relationDao.findAllByToAndType(new TenantId(tenantId), new DashboardId(dashboardId), EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE); 128 ListenableFuture<List<EntityRelation>> relations = relationDao.findAllByToAndType(new TenantId(tenantId), new DashboardId(dashboardId), EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE);
129 return Futures.transformAsync(relations, input -> { 129 return Futures.transformAsync(relations, input -> {
130 List<ListenableFuture<Edge>> edgeFutures = new ArrayList<>(input.size()); 130 List<ListenableFuture<Edge>> edgeFutures = new ArrayList<>(input.size());
@@ -127,22 +127,20 @@ public interface EdgeDao extends Dao<Edge> { @@ -127,22 +127,20 @@ public interface EdgeDao extends Dao<Edge> {
127 Optional<Edge> findByRoutingKey(UUID tenantId, String routingKey); 127 Optional<Edge> findByRoutingKey(UUID tenantId, String routingKey);
128 128
129 /** 129 /**
130 - * Find edges by tenantId, ruleChainId and page link. 130 + * Find edges by tenantId and ruleChainId.
131 * 131 *
132 * @param tenantId the tenantId 132 * @param tenantId the tenantId
133 * @param ruleChainId the ruleChainId 133 * @param ruleChainId the ruleChainId
134 - * @param pageLink the page link  
135 * @return the list of rule chain objects 134 * @return the list of rule chain objects
136 */ 135 */
137 - ListenableFuture<List<Edge>> findEdgesByTenantIdAndRuleChainId(UUID tenantId, UUID ruleChainId, TimePageLink pageLink); 136 + ListenableFuture<List<Edge>> findEdgesByTenantIdAndRuleChainId(UUID tenantId, UUID ruleChainId);
138 137
139 /** 138 /**
140 - * Find edges by tenantId, dashboardId and page link. 139 + * Find edges by tenantId and dashboardId.
141 * 140 *
142 * @param tenantId the tenantId 141 * @param tenantId the tenantId
143 * @param dashboardId the dashboardId 142 * @param dashboardId the dashboardId
144 - * @param pageLink the page link  
145 * @return the list of rule chain objects 143 * @return the list of rule chain objects
146 */ 144 */
147 - ListenableFuture<List<Edge>> findEdgesByTenantIdAndDashboardId(UUID tenantId, UUID dashboardId, TimePageLink pageLink); 145 + ListenableFuture<List<Edge>> findEdgesByTenantIdAndDashboardId(UUID tenantId, UUID dashboardId);
148 } 146 }
@@ -464,10 +464,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic @@ -464,10 +464,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
464 case DataConstants.ENTITY_DELETED: 464 case DataConstants.ENTITY_DELETED:
465 case DataConstants.ENTITY_CREATED: 465 case DataConstants.ENTITY_CREATED:
466 case DataConstants.ENTITY_UPDATED: 466 case DataConstants.ENTITY_UPDATED:
467 - Edge edge = mapper.readValue(tbMsg.getData(), Edge.class);  
468 - if (edge != null) {  
469 - pushEventToEdge(tenantId, edge.getId(), EdgeQueueEntityType.EDGE, tbMsg, callback);  
470 - } 467 + // TODO: voba - handle properly edge creation
471 break; 468 break;
472 default: 469 default:
473 log.warn("Unsupported msgType [{}], tbMsg [{}]", tbMsg.getType(), tbMsg); 470 log.warn("Unsupported msgType [{}], tbMsg [{}]", tbMsg.getType(), tbMsg);
@@ -693,7 +690,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic @@ -693,7 +690,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
693 Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); 690 Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
694 Validator.validateId(ruleChainId, "Incorrect ruleChainId " + ruleChainId); 691 Validator.validateId(ruleChainId, "Incorrect ruleChainId " + ruleChainId);
695 Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink); 692 Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink);
696 - ListenableFuture<List<Edge>> edges = edgeDao.findEdgesByTenantIdAndRuleChainId(tenantId.getId(), ruleChainId.getId(), pageLink); 693 + ListenableFuture<List<Edge>> edges = edgeDao.findEdgesByTenantIdAndRuleChainId(tenantId.getId(), ruleChainId.getId());
697 694
698 return Futures.transform(edges, new Function<List<Edge>, TimePageData<Edge>>() { 695 return Futures.transform(edges, new Function<List<Edge>, TimePageData<Edge>>() {
699 @Nullable 696 @Nullable
@@ -710,7 +707,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic @@ -710,7 +707,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
710 Validator.validateId(tenantId, "Incorrect tenantId " + tenantId); 707 Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
711 Validator.validateId(dashboardId, "Incorrect dashboardId " + dashboardId); 708 Validator.validateId(dashboardId, "Incorrect dashboardId " + dashboardId);
712 Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink); 709 Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink);
713 - ListenableFuture<List<Edge>> edges = edgeDao.findEdgesByTenantIdAndDashboardId(tenantId.getId(), dashboardId.getId(), pageLink); 710 + ListenableFuture<List<Edge>> edges = edgeDao.findEdgesByTenantIdAndDashboardId(tenantId.getId(), dashboardId.getId());
714 711
715 return Futures.transform(edges, new Function<List<Edge>, TimePageData<Edge>>() { 712 return Futures.transform(edges, new Function<List<Edge>, TimePageData<Edge>>() {
716 @Nullable 713 @Nullable
@@ -148,8 +148,8 @@ public class JpaEdgeDao extends JpaAbstractSearchTextDao<EdgeEntity, Edge> imple @@ -148,8 +148,8 @@ public class JpaEdgeDao extends JpaAbstractSearchTextDao<EdgeEntity, Edge> imple
148 } 148 }
149 149
150 @Override 150 @Override
151 - public ListenableFuture<List<Edge>> findEdgesByTenantIdAndRuleChainId(UUID tenantId, UUID ruleChainId, TimePageLink pageLink) {  
152 - log.debug("Try to find edges by tenantId [{}], ruleChainId [{}] and pageLink [{}]", tenantId, ruleChainId, pageLink); 151 + public ListenableFuture<List<Edge>> findEdgesByTenantIdAndRuleChainId(UUID tenantId, UUID ruleChainId) {
  152 + log.debug("Try to find edges by tenantId [{}], ruleChainId [{}]", tenantId, ruleChainId);
153 ListenableFuture<List<EntityRelation>> relations = relationDao.findAllByToAndType(new TenantId(tenantId), new RuleChainId(ruleChainId), EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE); 153 ListenableFuture<List<EntityRelation>> relations = relationDao.findAllByToAndType(new TenantId(tenantId), new RuleChainId(ruleChainId), EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE);
154 return Futures.transformAsync(relations, input -> { 154 return Futures.transformAsync(relations, input -> {
155 List<ListenableFuture<Edge>> edgeFutures = new ArrayList<>(input.size()); 155 List<ListenableFuture<Edge>> edgeFutures = new ArrayList<>(input.size());
@@ -161,8 +161,8 @@ public class JpaEdgeDao extends JpaAbstractSearchTextDao<EdgeEntity, Edge> imple @@ -161,8 +161,8 @@ public class JpaEdgeDao extends JpaAbstractSearchTextDao<EdgeEntity, Edge> imple
161 } 161 }
162 162
163 @Override 163 @Override
164 - public ListenableFuture<List<Edge>> findEdgesByTenantIdAndDashboardId(UUID tenantId, UUID dashboardId, TimePageLink pageLink) {  
165 - log.debug("Try to find edges by tenantId [{}], dashboardId [{}] and pageLink [{}]", tenantId, dashboardId, pageLink); 164 + public ListenableFuture<List<Edge>> findEdgesByTenantIdAndDashboardId(UUID tenantId, UUID dashboardId) {
  165 + log.debug("Try to find edges by tenantId [{}], dashboardId [{}]", tenantId, dashboardId);
166 ListenableFuture<List<EntityRelation>> relations = relationDao.findAllByToAndType(new TenantId(tenantId), new DashboardId(dashboardId), EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE); 166 ListenableFuture<List<EntityRelation>> relations = relationDao.findAllByToAndType(new TenantId(tenantId), new DashboardId(dashboardId), EntityRelation.CONTAINS_TYPE, RelationTypeGroup.EDGE);
167 return Futures.transformAsync(relations, input -> { 167 return Futures.transformAsync(relations, input -> {
168 List<ListenableFuture<Edge>> edgeFutures = new ArrayList<>(input.size()); 168 List<ListenableFuture<Edge>> edgeFutures = new ArrayList<>(input.size());