Merge pull request #97 from lucasponce/Play-Events

Preliminar refactoring on alerts api for events work

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

@@ -28,7 +28,7 @@
 
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
 import org.hawkular.alerts.api.model.condition.AvailabilityConditionEval;
 import org.hawkular.alerts.api.model.condition.ConditionEval;

hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/main/java/org/hawkular/alerts/actions/aerogear/AerogearPlugin.java

@@ -24,7 +24,7 @@
 import org.hawkular.alerts.actions.api.ActionPluginListener;
 import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.PluginMessage;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.jboss.aerogear.unifiedpush.DefaultPushSender;
 import org.jboss.aerogear.unifiedpush.PushSender;
 import org.jboss.aerogear.unifiedpush.message.UnifiedMessage;

hawkular-alerts-actions-plugins/hawkular-alerts-actions-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java

@@ -31,7 +31,7 @@
 
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
 import org.hawkular.alerts.api.model.condition.AvailabilityConditionEval;
 import org.hawkular.alerts.api.model.condition.ConditionEval;

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java

@@ -37,8 +37,8 @@
 import org.hawkular.alerts.actions.api.ActionPluginListener;
 import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.PluginMessage;
-import org.hawkular.alerts.api.model.condition.Alert;
-import org.hawkular.alerts.api.model.condition.Alert.Status;
+import org.hawkular.alerts.api.model.event.Alert;
+import org.hawkular.alerts.api.model.event.Alert.Status;
 import org.jboss.logging.Logger;
 
 /**

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java

@@ -25,7 +25,7 @@
 import java.util.Set;
 
 import org.hawkular.alerts.actions.api.PluginMessage;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
 import org.hawkular.alerts.api.model.condition.AvailabilityConditionEval;
 import org.hawkular.alerts.api.model.condition.CompareCondition;

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailTemplateTest.java

@@ -27,7 +27,7 @@
 import org.hawkular.alerts.actions.tests.JvmGarbageCollectionData;
 import org.hawkular.alerts.actions.tests.TestPluginMessage;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmGarbageCollectionEmailTest.java

@@ -27,7 +27,7 @@
 import org.hawkular.alerts.actions.tests.JvmGarbageCollectionData;
 import org.hawkular.alerts.actions.tests.TestPluginMessage;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmHeapUsageEmailTest.java

@@ -27,7 +27,7 @@
 import org.hawkular.alerts.actions.tests.JvmHeapUsageData;
 import org.hawkular.alerts.actions.tests.TestPluginMessage;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmNonHeapUsageEmailTest.java

@@ -27,7 +27,7 @@
 import org.hawkular.alerts.actions.tests.JvmNonHeapUsageData;
 import org.hawkular.alerts.actions.tests.TestPluginMessage;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/MultipleAllJvmEmailTest.java

@@ -27,7 +27,7 @@
 import org.hawkular.alerts.actions.tests.MultipleAllJvmData;
 import org.hawkular.alerts.actions.tests.TestPluginMessage;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/UrlAvailabilityEmailTest.java

@@ -27,7 +27,7 @@
 import org.hawkular.alerts.actions.tests.TestPluginMessage;
 import org.hawkular.alerts.actions.tests.UrlAvailabilityData;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/UrlResponseTimeEmailTest.java

@@ -27,7 +27,7 @@
 import org.hawkular.alerts.actions.tests.TestPluginMessage;
 import org.hawkular.alerts.actions.tests.UrlResponseTimeData;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebActiveSessionsEmailTest.java

@@ -27,7 +27,7 @@
 import org.hawkular.alerts.actions.tests.TestPluginMessage;
 import org.hawkular.alerts.actions.tests.WebActiveSessionsData;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebContainerCurrentThreadsEmailTest.java

@@ -27,7 +27,7 @@
 import org.hawkular.alerts.actions.tests.TestPluginMessage;
 import org.hawkular.alerts.actions.tests.WebContainerCurrentThreadsData;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebContainerPendingRequestsEmailTest.java

@@ -27,7 +27,7 @@
 import org.hawkular.alerts.actions.tests.TestPluginMessage;
 import org.hawkular.alerts.actions.tests.WebContainerPendingRequestsData;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebExpiredSessionsEmailTest.java

@@ -27,7 +27,7 @@
 import org.hawkular.alerts.actions.tests.TestPluginMessage;
 import org.hawkular.alerts.actions.tests.WebExpiredSessionsData;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebRejectedSessionsEmailTest.java

@@ -27,7 +27,7 @@
 import org.hawkular.alerts.actions.tests.TestPluginMessage;
 import org.hawkular.alerts.actions.tests.WebRejectedSessionsData;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

hawkular-alerts-actions-plugins/hawkular-alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/WebRequestsResponseTimeEmailTest.java

@@ -27,7 +27,7 @@
 import org.hawkular.alerts.actions.tests.TestPluginMessage;
 import org.hawkular.alerts.actions.tests.WebRequestsResponseTimeData;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

hawkular-alerts-actions-plugins/hawkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.java

@@ -27,7 +27,7 @@
 import org.hawkular.alerts.actions.api.ActionPluginListener;
 import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.PluginMessage;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 

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

@@ -25,7 +25,7 @@
 
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
 import org.hawkular.alerts.api.model.condition.AvailabilityConditionEval;
 import org.hawkular.alerts.api.model.condition.Condition;

hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/main/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPlugin.java

@@ -26,7 +26,7 @@
 import org.hawkular.alerts.actions.api.ActionPluginListener;
 import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.PluginMessage;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;

hawkular-alerts-actions-plugins/hawkular-alerts-actions-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java

@@ -29,7 +29,7 @@
 
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
 import org.hawkular.alerts.api.model.condition.AvailabilityConditionEval;
 import org.hawkular.alerts.api.model.condition.ConditionEval;

hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/main/java/org/hawkular/alerts/actions/sms/SmsPlugin.java

@@ -29,7 +29,7 @@
 import org.hawkular.alerts.actions.api.ActionPluginListener;
 import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.PluginMessage;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 
 import com.twilio.sdk.TwilioRestClient;
 import com.twilio.sdk.TwilioRestException;

hawkular-alerts-actions-plugins/hawkular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java

@@ -32,7 +32,7 @@
 import org.apache.http.message.BasicNameValuePair;
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.action.Action;
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
 import org.hawkular.alerts.api.model.condition.AvailabilityConditionEval;
 import org.hawkular.alerts.api.model.condition.ConditionEval;

hawkular-alerts-actions-plugins/hawkular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/CommonData.java

@@ -16,7 +16,7 @@
  */
 package org.hawkular.alerts.actions.tests;
 
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 
 /**
  * Common variables for action tests scenarios

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

@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.ConditionEval;
 import org.hawkular.alerts.api.model.condition.ThresholdCondition;
 import org.hawkular.alerts.api.model.condition.ThresholdConditionEval;

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

@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.ConditionEval;
 import org.hawkular.alerts.api.model.condition.ThresholdRangeCondition;
 import org.hawkular.alerts.api.model.condition.ThresholdRangeConditionEval;

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

@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.ConditionEval;
 import org.hawkular.alerts.api.model.condition.ThresholdRangeCondition;
 import org.hawkular.alerts.api.model.condition.ThresholdRangeConditionEval;

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

@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.Condition;
 import org.hawkular.alerts.api.model.condition.ConditionEval;
 import org.hawkular.alerts.api.model.condition.ThresholdCondition;

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

@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
 import org.hawkular.alerts.api.model.condition.AvailabilityConditionEval;
 import org.hawkular.alerts.api.model.condition.ConditionEval;

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

@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.ConditionEval;
 import org.hawkular.alerts.api.model.condition.ThresholdCondition;
 import org.hawkular.alerts.api.model.condition.ThresholdConditionEval;

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

@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.ConditionEval;
 import org.hawkular.alerts.api.model.condition.ThresholdRangeCondition;
 import org.hawkular.alerts.api.model.condition.ThresholdRangeConditionEval;

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

@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.ConditionEval;
 import org.hawkular.alerts.api.model.condition.ThresholdRangeCondition;
 import org.hawkular.alerts.api.model.condition.ThresholdRangeConditionEval;

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

@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.ConditionEval;
 import org.hawkular.alerts.api.model.condition.ThresholdRangeCondition;
 import org.hawkular.alerts.api.model.condition.ThresholdRangeConditionEval;

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

@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.ConditionEval;
 import org.hawkular.alerts.api.model.condition.ThresholdCondition;
 import org.hawkular.alerts.api.model.condition.ThresholdConditionEval;

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

@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.ConditionEval;
 import org.hawkular.alerts.api.model.condition.ThresholdCondition;
 import org.hawkular.alerts.api.model.condition.ThresholdConditionEval;

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

@@ -23,7 +23,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.condition.ConditionEval;
 import org.hawkular.alerts.api.model.condition.ThresholdCondition;
 import org.hawkular.alerts.api.model.condition.ThresholdConditionEval;

hawkular-alerts-api/pom.xml

@@ -34,24 +34,6 @@
   <dependencies>
 
     <!-- Wildfly dependencies -->
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging-processor</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jackson2-provider</artifactId>

hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java

@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.hawkular.alerts.api.model.condition.Alert;
 import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
 import org.hawkular.alerts.api.model.condition.AvailabilityConditionEval;
 import org.hawkular.alerts.api.model.condition.CompareCondition;
@@ -40,6 +39,7 @@
 import org.hawkular.alerts.api.model.condition.ThresholdRangeCondition;
 import org.hawkular.alerts.api.model.condition.ThresholdRangeConditionEval;
 import org.hawkular.alerts.api.model.data.AvailabilityType;
+import org.hawkular.alerts.api.model.event.Alert;
 import org.hawkular.alerts.api.model.event.Thin;
 import org.hawkular.alerts.api.model.trigger.Mode;