POC : Make Standard Triggers natively work like DataDriven Triggers

actions/actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java

@@ -54,7 +54,7 @@ public class JsonTest {
     @BeforeClass
     public static void initTest() {
         Trigger trigger = new Trigger(TEST_TENANT, "trigger-test", "trigger-test");
-        Alert alert = new Alert(TEST_TENANT, trigger, null);
+        Alert alert = new Alert(TEST_TENANT, trigger, Data.SOURCE_NONE, null);
 
         AvailabilityCondition aCond = new AvailabilityCondition(TEST_TENANT, "trigger-test", "Default",
                 AvailabilityCondition.Operator.UP);

actions/actions-plugins/actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java

@@ -110,7 +110,8 @@ public static void prepareMessages() {
         /*
             Manual alert creation for threshold
          */
-        Alert rtAlertOpen = new Alert(rtTrigger.getTenantId(), rtTrigger, getEvalList(rtFiringCondition, rtBadData));
+        Alert rtAlertOpen = new Alert(rtTrigger.getTenantId(), rtTrigger, Data.SOURCE_NONE,
+                getEvalList(rtFiringCondition, rtBadData));
         rtAlertOpen.setDampening(rtFiringDampening);
         rtAlertOpen.setStatus(Alert.Status.OPEN);
 
@@ -125,7 +126,8 @@ public static void prepareMessages() {
         openThresholdAction.setProperties(props);
         openThresholdMsg = new TestActionMessage(openThresholdAction);
 
-        Alert rtAlertAck = new Alert(rtTrigger.getTenantId(), rtTrigger, getEvalList(rtFiringCondition, rtBadData));
+        Alert rtAlertAck = new Alert(rtTrigger.getTenantId(), rtTrigger, Data.SOURCE_NONE,
+                getEvalList(rtFiringCondition, rtBadData));
         rtAlertAck.setDampening(rtFiringDampening);
         rtAlertAck.addLifecycle(Alert.Status.ACKNOWLEDGED, "Test ACK user", System.currentTimeMillis() + 10000);
         rtAlertAck.addNote("Test ACK user", "Test ACK notes");
@@ -140,7 +142,7 @@ public static void prepareMessages() {
          */
         Data rtGoodData = Data.forNumeric(tenantId, rtDataId, System.currentTimeMillis() + 20000, 998d);
 
-        Alert rtAlertResolved = new Alert(rtTrigger.getTenantId(), rtTrigger,
+        Alert rtAlertResolved = new Alert(rtTrigger.getTenantId(), rtTrigger, Data.SOURCE_NONE,
                 getEvalList(rtFiringCondition, rtBadData));
         rtAlertResolved.setDampening(rtFiringDampening);
         rtAlertResolved.addLifecycle(Alert.Status.RESOLVED, "Test RESOLVED user", System.currentTimeMillis() + 20000);
@@ -172,7 +174,8 @@ public static void prepareMessages() {
         /*
             Manual alert creation for availability
          */
-        Alert avAlertOpen = new Alert(avTrigger.getTenantId(), avTrigger, getEvalList(avFiringCondition, avBadData));
+        Alert avAlertOpen = new Alert(avTrigger.getTenantId(), avTrigger, Data.SOURCE_NONE,
+                getEvalList(avFiringCondition, avBadData));
         avAlertOpen.setDampening(avFiringDampening);
         avAlertOpen.setStatus(Alert.Status.OPEN);
 
@@ -187,7 +190,8 @@ public static void prepareMessages() {
         openAvailabilityAction.setProperties(props);
         openAvailMsg = new TestActionMessage(openAvailabilityAction);
 
-        Alert avAlertAck = new Alert(avTrigger.getTenantId(), avTrigger, getEvalList(avFiringCondition, avBadData));
+        Alert avAlertAck = new Alert(avTrigger.getTenantId(), avTrigger, Data.SOURCE_NONE,
+                getEvalList(avFiringCondition, avBadData));
         avAlertAck.setDampening(avFiringDampening);
         avAlertAck.addLifecycle(Alert.Status.ACKNOWLEDGED, "Test ACK user", System.currentTimeMillis() + 10000);
         avAlertAck.addNote("Test ACK user", "Test ACK notes");
@@ -203,7 +207,7 @@ public static void prepareMessages() {
         Data avGoodData = Data.forAvailability(tenantId, avDataId, System.currentTimeMillis() + 20000,
                 AvailabilityType.UP);
 
-        Alert avAlertResolved = new Alert(avTrigger.getTenantId(), avTrigger,
+        Alert avAlertResolved = new Alert(avTrigger.getTenantId(), avTrigger, Data.SOURCE_NONE,
                 getEvalList(avFiringCondition, avBadData));
         avAlertResolved.setDampening(avFiringDampening);
         avAlertResolved.addLifecycle(Alert.Status.RESOLVED, "Test RESOLVED user", System.currentTimeMillis() + 20000);
@@ -246,7 +250,7 @@ public static void prepareMessages() {
         List<Data> mixBadData = new ArrayList<>();
         mixBadData.add(rtBadData);
         mixBadData.add(avBadData);
-        Alert mixAlertOpen = new Alert(mixTrigger.getTenantId(), mixTrigger,
+        Alert mixAlertOpen = new Alert(mixTrigger.getTenantId(), avTrigger, Data.SOURCE_NONE,
                getEvalList(mixConditions, mixBadData));
         mixAlertOpen.setDampening(mixFiringDampening);
         mixAlertOpen.setStatus(Alert.Status.OPEN);
@@ -262,7 +266,7 @@ public static void prepareMessages() {
         openTwoCondAction.setProperties(props);
         openTwoCondMsg = new TestActionMessage(openTwoCondAction);
 
-        Alert mixAlertAck = new Alert(mixTrigger.getTenantId(), mixTrigger,
+        Alert mixAlertAck = new Alert(mixTrigger.getTenantId(), avTrigger, Data.SOURCE_NONE,
                 getEvalList(mixConditions, mixBadData));
         mixAlertAck.setDampening(mixFiringDampening);
         mixAlertAck.addLifecycle(Alert.Status.ACKNOWLEDGED, "Test ACK user", System.currentTimeMillis() + 10000);
@@ -287,7 +291,7 @@ public static void prepareMessages() {
         mixGoodData.add(rtGoodData);
         mixGoodData.add(avGoodData);
 
-        Alert mixAlertResolved = new Alert(mixTrigger.getTenantId(), mixTrigger,
+        Alert mixAlertResolved = new Alert(mixTrigger.getTenantId(), avTrigger, Data.SOURCE_NONE,
                 getEvalList(mixConditions, mixBadData));
         mixAlertResolved.setDampening(mixFiringDampening);
         mixAlertResolved.addLifecycle(Alert.Status.RESOLVED, "Test RESOLVED user", System.currentTimeMillis() + 20000);

actions/actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmGarbageCollectionData.java

@@ -105,7 +105,8 @@ public static Alert getOpenAlert() {
         evalSet2.add(eval2);
         satisfyingEvals.add(evalSet2);
 
-        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, satisfyingEvals);
+        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, Data.SOURCE_NONE,
+                satisfyingEvals);
 
         return openAlert;
     }

actions/actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmHeapUsageData.java

@@ -110,7 +110,8 @@ public static Alert getOpenAlert() {
         evalSet2.add(eval2);
         satisfyingEvals.add(evalSet2);
 
-        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, satisfyingEvals);
+        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, Data.SOURCE_NONE,
+                satisfyingEvals);
 
         return openAlert;
     }

actions/actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java

@@ -110,7 +110,8 @@ public static Alert getOpenAlert() {
         evalSet2.add(eval2);
         satisfyingEvals.add(evalSet2);
 
-        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, satisfyingEvals);
+        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, Data.SOURCE_NONE,
+                satisfyingEvals);
 
         return openAlert;
     }

actions/actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java

@@ -211,7 +211,8 @@ public static Alert getOpenAlert() {
 
         satisfyingEvals.add(evalSet2);
 
-        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, satisfyingEvals);
+        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, Data.SOURCE_NONE,
+                satisfyingEvals);
 
         return openAlert;
     }

actions/actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java

@@ -101,7 +101,8 @@ public static Alert getOpenAlert() {
         evalSet2.add(eval2);
         satisfyingEvals.add(evalSet2);
 
-        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, satisfyingEvals);
+        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, Data.SOURCE_NONE,
+                satisfyingEvals);
 
         return openAlert;
     }

actions/actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java

@@ -104,7 +104,8 @@ public static Alert getOpenAlert() {
         evalSet2.add(eval2);
         satisfyingEvals.add(evalSet2);
 
-        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, satisfyingEvals);
+        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, Data.SOURCE_NONE,
+                satisfyingEvals);
 
         return openAlert;
     }

actions/actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java

@@ -111,7 +111,8 @@ public static Alert getOpenAlert() {
         evalSet2.add(eval2);
         satisfyingEvals.add(evalSet2);
 
-        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, satisfyingEvals);
+        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, Data.SOURCE_NONE,
+                satisfyingEvals);
 
         return openAlert;
     }

actions/actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java

@@ -111,7 +111,8 @@ public static Alert getOpenAlert() {
         evalSet2.add(eval2);
         satisfyingEvals.add(evalSet2);
 
-        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, satisfyingEvals);
+        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, Data.SOURCE_NONE,
+                satisfyingEvals);
 
         return openAlert;
     }

actions/actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java

@@ -111,7 +111,8 @@ public static Alert getOpenAlert() {
         evalSet2.add(eval2);
         satisfyingEvals.add(evalSet2);
 
-        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, satisfyingEvals);
+        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, Data.SOURCE_NONE,
+                satisfyingEvals);
 
         return openAlert;
     }

actions/actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java

@@ -105,7 +105,8 @@ public static Alert getOpenAlert() {
         evalSet2.add(eval2);
         satisfyingEvals.add(evalSet2);
 
-        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, satisfyingEvals);
+        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, Data.SOURCE_NONE,
+                satisfyingEvals);
 
         return openAlert;
     }

actions/actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java

@@ -105,7 +105,8 @@ public static Alert getOpenAlert() {
         evalSet2.add(eval2);
         satisfyingEvals.add(evalSet2);
 
-        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, satisfyingEvals);
+        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, Data.SOURCE_NONE,
+                satisfyingEvals);
 
         return openAlert;
     }

actions/actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.java

@@ -105,7 +105,8 @@ public static Alert getOpenAlert() {
         evalSet2.add(eval2);
         satisfyingEvals.add(evalSet2);
 
-        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, satisfyingEvals);
+        Alert openAlert = new Alert(trigger.getTenantId(), trigger, firingDampening, Data.SOURCE_NONE,
+                satisfyingEvals);
 
         return openAlert;
     }

api/src/main/java/org/hawkular/alerts/api/model/condition/EventCondition.java

@@ -396,8 +396,10 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
+        final int prime = 31;
         int result = super.hashCode();
-        result = 31 * result + (expression != null ? expression.hashCode() : 0);
+        result = prime * result + ((dataId == null) ? 0 : dataId.hashCode());
+        result = prime * result + ((expression == null) ? 0 : expression.hashCode());
         return result;
     }
 
@@ -408,4 +410,6 @@ public String toString() {
                 ",expression='" + expression + '\'' +
                 '}';
     }
+
+
 }

api/src/main/java/org/hawkular/alerts/api/model/condition/ExternalCondition.java

@@ -25,23 +25,23 @@
 
 /**
  * An <code>ExternalCondition</code> is used for condition evaluations performed outside of the Alerts engine.
- * The external engine will send <code>StringData</code> providing the data for which the external evaluation
- * <b>has already evaluated to <code>True</code></b>. The Alerts engine assumes a true evaluation for the data being
- * sent in from the external engine. In other words, every <code>ExternalConditionEvaluation</code> will have
+ * The external engine will send <code>Data</code> or an <code>Event</code> indicating an external evaluation
+ * <b>has already evaluated to <code>True</code></b>. The Alerting engine assumes a true evaluation for data received
+ * from the external engine. In other words, every <code>ExternalConditionEvaluation</code> will have
  * a true evaluation and therefore, for triggers with only a single external condition, and with default dampening,
- * an alert will be fired for each data submission.
+ * an alert will be fired for each submission.
  *
  * @author Jay Shaughnessy
  * @author Lucas Ponce
  */
 @DocModel(description = "An ExternalCondition is used for condition evaluations performed outside of the " +
         "Alerting engine. + \n" +
         " + \n" +
-        "The external engine will send StringData providing the data for which the external evaluation " +
+        "The external engine will send Data or an Event indicating an the external evaluation " +
         " + \n" +
         "has already evaluated to true. + \n" +
         " + \n" +
-        "The Alerting engine assumes a true evaluation for the data being sent in from the external engine. " +
+        "The Alerting engine assumes a true evaluation for data received from the external engine. " +
         "In other words, every <<ExternalConditionEval>> will have a true evaluation and therefore, for triggers with " +
         "only a single external condition, and with default dampening, an alert will be fired for each " +
         "data submission.")