Merge pull request #147 from jshaughn/hwkalerts-122

Make sure actions are added to triggers fetched by criteria
hawkular · Jan 11, 2016 · 259fc47 · 259fc47
2 parents a6c10ea + 51104d6
commit 259fc47
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/...erts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java b/...erts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java
@@ -932,12 +932,13 @@ public Page<Trigger> getTriggers(String tenantId, TriggersCriteria criteria, Pag
                         session.executeAsync(selectTrigger.bind(tenantId, id)))
                         .collect(Collectors.toList());
                 List<ResultSet> rsTriggers = Futures.allAsList(futures).get();
-                rsTriggers.stream().forEach(r -> {
-                    for (Row row : r) {
-                        triggers.add(mapTrigger(row));
+                for (ResultSet rs : rsTriggers) {
+                    for (Row row : rs) {
+                        Trigger trigger = mapTrigger(row);
+                        selectTriggerActions(trigger);
+                        triggers.add(trigger);
                     }
-                });
-
+                }
             } else {
                 triggers.addAll(selectTriggers(tenantId));
 
@@ -1111,11 +1112,13 @@ public Collection<Trigger> getAllTriggersByTag(String name, String value) throws
                         session.executeAsync(selectTrigger.bind(tenantId, triggerId)))
                         .collect(Collectors.toList());
                 List<ResultSet> rsTriggers = Futures.allAsList(futures).get();
-                rsTriggers.stream().forEach(r -> {
-                    for (Row row : r) {
-                        triggers.add(mapTrigger(row));
+                for (ResultSet rs : rsTriggers) {
+                    for (Row row : rs) {
+                        Trigger trigger = mapTrigger(row);
+                        selectTriggerActions(trigger);
+                        triggers.add(trigger);
                     }
-                });
+                }
             }
 
             return triggers;