modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java | 17 +++++----- modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java | 7 ++-- modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java | 9 +++-- 3 files changed, 21 insertions(+), 12 deletions(-)
New commits: commit 96c88f06b78f9e52f12b9dcb335d1910218e22ce Merge: bcb3c56 8beb6df Author: John Mazzitelli mazz@redhat.com Date: Wed Apr 3 15:14:42 2013 -0400
Merge remote-tracking branch 'origin/master' into bug/rhq-1
commit 8beb6dfc20c73dd5727e5f31a8144f33f8e872f0 Author: Thomas Segismont tsegismo@redhat.com Date: Wed Apr 3 21:11:11 2013 +0200
Restore QUERY_NATIVE_TRUNCATE_SQL in Alert objects to preserve API
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java index 59c7d6d..4742c17 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/Alert.java @@ -22,7 +22,11 @@ */ package org.rhq.core.domain.alert;
-import org.rhq.core.domain.alert.notification.AlertNotificationLog; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set;
import javax.persistence.CascadeType; import javax.persistence.Column; @@ -39,17 +43,14 @@ import javax.persistence.OneToMany; import javax.persistence.OrderBy; import javax.persistence.SequenceGenerator; import javax.persistence.Table; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; + +import org.rhq.core.domain.alert.notification.AlertNotificationLog;
/** * @author Joseph Marques */ @Entity -@NamedQueries( { +@NamedQueries({ @NamedQuery(name = Alert.QUERY_FIND_BY_MEASUREMENT_DEFINITION_ID, query = "SELECT a " + " FROM Alert AS a " + " JOIN a.alertDefinition definition " + " JOIN definition.conditions condition " + " WHERE condition.measurementDefinition.id = :measurementDefinitionId " @@ -232,6 +233,8 @@ public class Alert implements Serializable { public static final String QUERY_FIND_BY_MEAS_DEF_ID_AND_RESOURCE = "Alert.findByMeasDefIdAndResource"; public static final String QUERY_GET_ALERT_COUNT_FOR_SCHEDULES = "Alert.QUERY_GET_ALERT_COUNT_FOR_SCHEDULES";
+ public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT"; + // for subsystem view public static final String QUERY_FIND_ALL_COMPOSITES = "Alert.findAllComposites"; public static final String QUERY_FIND_ALL_COMPOSITES_ADMIN = "Alert.findAllComposites_admin"; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java index 76aac5a..b160a3c 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertConditionLog.java @@ -22,6 +22,8 @@ */ package org.rhq.core.domain.alert;
+import java.io.Serializable; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -33,11 +35,10 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.SequenceGenerator; import javax.persistence.Table; -import java.io.Serializable;
/** * A log record for a triggered alert condition. - * + * * @author Joseph Marques */ @Entity @@ -120,6 +121,8 @@ public class AlertConditionLog implements Serializable { public static final String QUERY_DELETE_BY_ALERT_CTIME = "AlertConditionLog.deleteByAlertCTime"; public static final String QUERY_DELETE_UNMATCHED_BY_ALERT_DEFINITION_ID = "AlertConditionLog.deleteUnmatchedByAlertDefinitionId";
+ public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT_CONDITION_LOG"; + public static final int MAX_LOG_LENGTH = 250;
private static final long serialVersionUID = 1L; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java index 05f6e5f..13aaee5 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotificationLog.java @@ -22,7 +22,7 @@ */ package org.rhq.core.domain.alert.notification;
-import org.rhq.core.domain.alert.Alert; +import java.io.Serializable;
import javax.persistence.Column; import javax.persistence.Entity; @@ -42,11 +42,12 @@ import javax.persistence.Table; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlTransient; -import java.io.Serializable; + +import org.rhq.core.domain.alert.Alert;
/** * A log record for a triggered action and/or notification taken for a fired alert. - * + * * @author Joseph Marques */ @Entity @@ -99,6 +100,8 @@ public class AlertNotificationLog implements Serializable { public static final String QUERY_DELETE_BY_RESOURCE_GROUPS = "AlertNotificationLog.deleteByResourceGroups"; public static final String QUERY_DELETE_BY_ALERT_CTIME = "AlertNotificationLog.deleteByAlertCtime";
+ public static final String QUERY_NATIVE_TRUNCATE_SQL = "TRUNCATE TABLE RHQ_ALERT_NOTIF_LOG"; + @Column(name = "ID", nullable = false) @GeneratedValue(strategy = GenerationType.AUTO, generator = "RHQ_ALERT_NOTIF_LOG_ID_SEQ") @Id
rhq-commits@lists.fedorahosted.org