Move Alert into events package

hawkular · Sep 23, 2015 · 660b599 · 660b599
1 parent e7b0a85
commit 660b599
Show file tree

Hide file tree

Showing 53 changed files with 60 additions and 56 deletions.
diff --git a/...ular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java b/...ular-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;

diff --git a/...s-actions-aerogear/src/main/java/org/hawkular/alerts/actions/aerogear/AerogearPlugin.java b/...s-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;

diff --git a/...tions-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java b/...tions-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;

diff --git a/...lar-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java b/...lar-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;
 
 /**

diff --git a/...tions-email/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java b/...tions-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;

diff --git a/...erts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailTemplateTest.java b/...erts-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;
 

diff --git a/...-email/src/test/java/org/hawkular/alerts/actions/email/JvmGarbageCollectionEmailTest.java b/...-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;
 

diff --git a/...-actions-email/src/test/java/org/hawkular/alerts/actions/email/JvmHeapUsageEmailTest.java b/...-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;
 

diff --git a/...tions-email/src/test/java/org/hawkular/alerts/actions/email/JvmNonHeapUsageEmailTest.java b/...tions-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;
 

diff --git a/...ctions-email/src/test/java/org/hawkular/alerts/actions/email/MultipleAllJvmEmailTest.java b/...ctions-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;
 

diff --git a/...tions-email/src/test/java/org/hawkular/alerts/actions/email/UrlAvailabilityEmailTest.java b/...tions-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;
 

diff --git a/...tions-email/src/test/java/org/hawkular/alerts/actions/email/UrlResponseTimeEmailTest.java b/...tions-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;
 

diff --git a/...ons-email/src/test/java/org/hawkular/alerts/actions/email/WebActiveSessionsEmailTest.java b/...ons-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;
 

diff --git a/.../src/test/java/org/hawkular/alerts/actions/email/WebContainerCurrentThreadsEmailTest.java b/.../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;
 

diff --git a/...src/test/java/org/hawkular/alerts/actions/email/WebContainerPendingRequestsEmailTest.java b/...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;
 

diff --git a/...ns-email/src/test/java/org/hawkular/alerts/actions/email/WebExpiredSessionsEmailTest.java b/...ns-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;
 

diff --git a/...s-email/src/test/java/org/hawkular/alerts/actions/email/WebRejectedSessionsEmailTest.java b/...s-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;
 

diff --git a/...ail/src/test/java/org/hawkular/alerts/actions/email/WebRequestsResponseTimeEmailTest.java b/...ail/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;
 

diff --git a/...wkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.java b/...wkular-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;
 

diff --git a/...ar-alerts-actions-file/src/test/java/org/hawkular/alerts/actions/file/FilePluginTest.java b/...ar-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;

diff --git a/...ctions-pagerduty/src/main/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPlugin.java b/...ctions-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;

diff --git a/...ns-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java b/...ns-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;

diff --git a/.../hawkular-alerts-actions-sms/src/main/java/org/hawkular/alerts/actions/sms/SmsPlugin.java b/.../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;

diff --git a/...kular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java b/...kular-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;

diff --git a/...ular-alerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/CommonData.java b/...ular-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

diff --git a/...tions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmGarbageCollectionData.java b/...tions-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;

diff --git a/...lerts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmHeapUsageData.java b/...lerts-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;

diff --git a/...ts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/JvmNonHeapUsageData.java b/...ts-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;

diff --git a/...rts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/MultipleAllJvmData.java b/...rts-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;

diff --git a/...ts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlAvailabilityData.java b/...ts-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;

diff --git a/...ts-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/UrlResponseTimeData.java b/...ts-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;

diff --git a/...-actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebActiveSessionsData.java b/...-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;

diff --git a/...tests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerCurrentThreadsData.java b/...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;

diff --git a/...ests/src/main/java/org/hawkular/alerts/actions/tests/WebContainerPendingRequestsData.java b/...ests/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;

diff --git a/...actions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebExpiredSessionsData.java b/...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;

diff --git a/...ctions-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRejectedSessionsData.java b/...ctions-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;

diff --git a/...ns-tests/src/main/java/org/hawkular/alerts/actions/tests/WebRequestsResponseTimeData.java b/...ns-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;

diff --git a/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/json/JacksonDeserializer.java b/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;
 

diff --git a/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/Severity.java b/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/Severity.java
@@ -16,9 +16,11 @@
  */
 package org.hawkular.alerts.api.model;
 
+import org.hawkular.alerts.api.model.event.Alert;
+
 /**
  * Severity set for a {@link org.hawkular.alerts.api.model.trigger.Trigger} and assigned to an
- * {@link org.hawkular.alerts.api.model.condition.Alert} it generates.
+ * {@link Alert} it generates.
  *
  * @author jay shaughnessy
  * @author lucac ponce

diff --git a/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java b/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java
@@ -16,7 +16,7 @@
  */
 package org.hawkular.alerts.api.model.action;
 
-import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.event.Alert;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;

diff --git a/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/AvailabilityType.java b/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/data/AvailabilityType.java
@@ -16,9 +16,11 @@
  */
 package org.hawkular.alerts.api.model.data;
 
+import org.hawkular.alerts.api.model.event.Alert;
+
 /**
  * Severity set for a {@link org.hawkular.alerts.api.model.trigger.Trigger} and assigned to an
- * {@link org.hawkular.alerts.api.model.condition.Alert} it generates.
+ * {@link Alert} it generates.
  *
  * @author jay shaughnessy
  * @author lucas ponce