Menu
▾
▴
[Hyperic-hq-discuss] hq r6885 - in trunk/src/org/hyperic/hq: bizapp/server/trigger/conditional bizapp/server/trigger/frequency events/ext
|
From: <tk...@hy...> - 2007-11-21 02:06:48
|
Author: tkeeney Date: 2007-11-20 18:06:41 -0800 (Tue, 20 Nov 2007) New Revision: 6885 URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=6885 Modified: trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/AlertTrigger.java trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/ConfigChangedTrigger.java trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/ControlEventTrigger.java trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/CustomPropertyTrigger.java trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/LogEventTrigger.java trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/MeasurementThresholdTrigger.java trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/MultiConditionTrigger.java trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/ValueChangeTrigger.java trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/AvertTrigger.java trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/ConstantDurationTrigger.java trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/CounterTrigger.java trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/DurationTrigger.java trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/EscalateTrigger.java trunk/src/org/hyperic/hq/events/ext/AbstractTrigger.java trunk/src/org/hyperic/hq/events/ext/RegisterableTriggerInterface.java Log: Pushed up the RegisterableTriggerInterface so that the AbstractTrigger implements the interface directly. Modified: trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/AlertTrigger.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/AlertTrigger.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/AlertTrigger.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -46,7 +46,6 @@ import org.hyperic.hq.events.InvalidTriggerDataException; import org.hyperic.hq.events.TriggerFiredEvent; import org.hyperic.hq.events.ext.AbstractTrigger; -import org.hyperic.hq.events.ext.RegisterableTriggerInterface; import org.hyperic.hq.events.shared.AlertConditionValue; import org.hyperic.hq.events.shared.EventTrackerLocal; import org.hyperic.hq.events.shared.EventTrackerUtil; @@ -62,7 +61,7 @@ * */ public class AlertTrigger extends AbstractTrigger - implements RegisterableTriggerInterface, ConditionalTriggerInterface { + implements ConditionalTriggerInterface { static { // Register the trigger/condition ConditionalTriggerInterface.MAP_COND_TRIGGER.put( @@ -111,34 +110,23 @@ } } + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getConfigSchema() + */ public ConfigSchema getConfigSchema() { return ConditionalTriggerSchema .getConfigSchema(EventConstants.TYPE_ALERT); } - /** Get the event classes that the trigger is interested in - * seeing. This is an optimization, so that a trigger's - * processEvent() method is called only when a valid event - * occurs. - * - * @return an array of Class objects which implement - * the 'Event' interface - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedEventTypes() */ public Class[] getInterestedEventTypes() { return new Class[] { AlertFiredEvent.class }; } - /** Get a list of instance IDs specific to a class (as returned - * by getInterestedEventTypes) which the trigger is interested - * in seeing. These values are specific to the event type, and - * represent things such as specific measurements. - * - * @param c Class to get the interested event IDs for - * - * @return An array of integers representing the instance IDs - * for the specific event class - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedInstanceIDs(java.lang.Class) */ public Integer[] getInterestedInstanceIDs(Class c) { // Ask the sub triggers what they are interested in @@ -147,14 +135,9 @@ return null; } - - /** Initialize the trigger with a value object. - * - * @param triggerData Configuration data for the trigger - * - * @throws org.hyperic.hq.bizapp.server.trigger.InvalidTriggerDataException indicating that the triggerData - * was invalid. - * + + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#init(org.hyperic.hq.events.shared.RegisteredTriggerValue) */ public void init(RegisteredTriggerValue tval) throws InvalidTriggerDataException { Modified: trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/ConfigChangedTrigger.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/ConfigChangedTrigger.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/ConfigChangedTrigger.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -36,7 +36,6 @@ import org.hyperic.hq.events.InvalidTriggerDataException; import org.hyperic.hq.events.TriggerFiredEvent; import org.hyperic.hq.events.ext.AbstractTrigger; -import org.hyperic.hq.events.ext.RegisterableTriggerInterface; import org.hyperic.hq.events.shared.AlertConditionValue; import org.hyperic.hq.events.shared.RegisteredTriggerValue; import org.hyperic.hq.measurement.shared.ConfigChangedEvent; @@ -52,7 +51,7 @@ public class ConfigChangedTrigger extends AbstractTrigger - implements RegisterableTriggerInterface, ConditionalTriggerInterface { + implements ConditionalTriggerInterface { static { // Register the trigger/condition ConditionalTriggerInterface.MAP_COND_TRIGGER.put( @@ -64,21 +63,21 @@ private String match; /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#getInterestedEventTypes() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedEventTypes() */ public Class[] getInterestedEventTypes(){ return new Class[] { ConfigChangedEvent.class }; } /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#getInterestedInstanceIDs() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedInstanceIDs(java.lang.Class) */ public Integer[] getInterestedInstanceIDs(Class c){ return new Integer[] { id.getId() }; } /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#getConfigSchema() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getConfigSchema() */ public ConfigSchema getConfigSchema(){ return ConditionalTriggerSchema @@ -103,7 +102,7 @@ } /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#init() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#init(org.hyperic.hq.events.shared.RegisteredTriggerValue) */ public void init(RegisteredTriggerValue tval) throws InvalidTriggerDataException { Modified: trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/ControlEventTrigger.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/ControlEventTrigger.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/ControlEventTrigger.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -37,7 +37,6 @@ import org.hyperic.hq.events.InvalidTriggerDataException; import org.hyperic.hq.events.TriggerFiredEvent; import org.hyperic.hq.events.ext.AbstractTrigger; -import org.hyperic.hq.events.ext.RegisterableTriggerInterface; import org.hyperic.hq.events.shared.AlertConditionValue; import org.hyperic.hq.events.shared.RegisteredTriggerValue; import org.hyperic.util.config.ConfigResponse; @@ -45,7 +44,6 @@ import org.hyperic.util.config.EncodingException; import org.hyperic.util.config.InvalidOptionException; import org.hyperic.util.config.InvalidOptionValueException; -import org.hyperic.hq.bizapp.server.trigger.conditional.ConditionalTriggerInterface; /** * A simple trigger which fires if a control event occurs. @@ -53,7 +51,7 @@ public class ControlEventTrigger extends AbstractTrigger - implements RegisterableTriggerInterface, ConditionalTriggerInterface { + implements ConditionalTriggerInterface { static { // Register the trigger/condition ConditionalTriggerInterface.MAP_COND_TRIGGER.put( @@ -66,21 +64,21 @@ private String status; /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#getInterestedEventTypes() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedEventTypes() */ public Class[] getInterestedEventTypes(){ return new Class[] { ControlEvent.class }; } /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#getInterestedInstanceIDs() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedInstanceIDs(java.lang.Class) */ public Integer[] getInterestedInstanceIDs(Class c){ return new Integer[] { id.getId() }; } /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#getConfigSchema() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getConfigSchema() */ public ConfigSchema getConfigSchema(){ return ConditionalTriggerSchema @@ -106,7 +104,7 @@ } /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#init() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#init(org.hyperic.hq.events.shared.RegisteredTriggerValue) */ public void init(RegisteredTriggerValue tval) throws InvalidTriggerDataException { Modified: trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/CustomPropertyTrigger.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/CustomPropertyTrigger.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/CustomPropertyTrigger.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -39,7 +39,6 @@ import org.hyperic.hq.events.InvalidTriggerDataException; import org.hyperic.hq.events.TriggerFiredEvent; import org.hyperic.hq.events.ext.AbstractTrigger; -import org.hyperic.hq.events.ext.RegisterableTriggerInterface; import org.hyperic.hq.events.shared.AlertConditionValue; import org.hyperic.hq.events.shared.RegisteredTriggerValue; import org.hyperic.util.config.ConfigResponse; @@ -53,7 +52,7 @@ */ public class CustomPropertyTrigger extends AbstractTrigger - implements RegisterableTriggerInterface, ConditionalTriggerInterface { + implements ConditionalTriggerInterface { static { // Register the trigger/condition ConditionalTriggerInterface.MAP_COND_TRIGGER.put( @@ -68,21 +67,21 @@ private String customProperty; /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#getInterestedEventTypes() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedEventTypes() */ public Class[] getInterestedEventTypes(){ return new Class[] { CPropChangeEvent.class }; } /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#getInterestedInstanceIDs() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedInstanceIDs(java.lang.Class) */ public Integer[] getInterestedInstanceIDs(Class c){ return new Integer[] { id.getId() }; } /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#getConfigSchema() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getConfigSchema() */ public ConfigSchema getConfigSchema(){ return ConditionalTriggerSchema @@ -107,7 +106,7 @@ } /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#init() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#init(org.hyperic.hq.events.shared.RegisteredTriggerValue) */ public void init(RegisteredTriggerValue tval) throws InvalidTriggerDataException { Modified: trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/LogEventTrigger.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/LogEventTrigger.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/LogEventTrigger.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -36,7 +36,6 @@ import org.hyperic.hq.events.InvalidTriggerDataException; import org.hyperic.hq.events.TriggerFiredEvent; import org.hyperic.hq.events.ext.AbstractTrigger; -import org.hyperic.hq.events.ext.RegisterableTriggerInterface; import org.hyperic.hq.events.shared.AlertConditionValue; import org.hyperic.hq.events.shared.RegisteredTriggerValue; import org.hyperic.hq.measurement.shared.ResourceLogEvent; @@ -45,7 +44,6 @@ import org.hyperic.util.config.EncodingException; import org.hyperic.util.config.InvalidOptionException; import org.hyperic.util.config.InvalidOptionValueException; -import org.hyperic.hq.bizapp.server.trigger.conditional.ConditionalTriggerInterface; /** * A simple trigger which fires if a log event occurs. @@ -53,7 +51,7 @@ public class LogEventTrigger extends AbstractTrigger - implements RegisterableTriggerInterface, ConditionalTriggerInterface { + implements ConditionalTriggerInterface { static { // Register the trigger/condition ConditionalTriggerInterface.MAP_COND_TRIGGER.put( @@ -65,21 +63,21 @@ private String match; /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#getInterestedEventTypes() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedEventTypes() */ public Class[] getInterestedEventTypes(){ return new Class[] { ResourceLogEvent.class }; } /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#getInterestedInstanceIDs() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedInstanceIDs(java.lang.Class) */ public Integer[] getInterestedInstanceIDs(Class c){ return new Integer[] { id.getId() }; } /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#getConfigSchema() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getConfigSchema() */ public ConfigSchema getConfigSchema(){ return ConditionalTriggerSchema @@ -105,7 +103,7 @@ } /** - * @see org.hyperic.hq.events.shared.RegisteredTriggerValue#init() + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#init(org.hyperic.hq.events.shared.RegisteredTriggerValue) */ public void init(RegisteredTriggerValue tval) throws InvalidTriggerDataException { Modified: trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/MeasurementThresholdTrigger.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/MeasurementThresholdTrigger.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/MeasurementThresholdTrigger.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -25,6 +25,8 @@ package org.hyperic.hq.bizapp.server.trigger.conditional; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.hyperic.hq.appdef.shared.AppdefEntityID; import org.hyperic.hq.bizapp.shared.ConditionalTriggerSchema; import org.hyperic.hq.common.SystemException; @@ -36,7 +38,6 @@ import org.hyperic.hq.events.InvalidTriggerDataException; import org.hyperic.hq.events.TriggerFiredEvent; import org.hyperic.hq.events.ext.AbstractTrigger; -import org.hyperic.hq.events.ext.RegisterableTriggerInterface; import org.hyperic.hq.events.shared.AlertConditionValue; import org.hyperic.hq.events.shared.RegisteredTriggerValue; import org.hyperic.hq.measurement.ext.MeasurementEvent; @@ -47,15 +48,12 @@ import org.hyperic.util.config.InvalidOptionException; import org.hyperic.util.config.InvalidOptionValueException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - /** * A simple trigger which fires if a measurement event exceeds a threshold. */ public class MeasurementThresholdTrigger extends AbstractTrigger - implements RegisterableTriggerInterface, ConditionalTriggerInterface { + implements ConditionalTriggerInterface { private Log log = LogFactory.getLog(getClass().getName()); static { @@ -78,14 +76,23 @@ private double threshold; private Integer metricId; + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedEventTypes() + */ public Class[] getInterestedEventTypes(){ return new Class[] { MeasurementEvent.class }; } + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedInstanceIDs(java.lang.Class) + */ public Integer[] getInterestedInstanceIDs(Class c){ return new Integer[] { metricId }; } + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getConfigSchema() + */ public ConfigSchema getConfigSchema(){ return ConditionalTriggerSchema .getConfigSchema(EventConstants.TYPE_THRESHOLD); @@ -117,6 +124,9 @@ return resp; } + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#init(org.hyperic.hq.events.shared.RegisteredTriggerValue) + */ public void init(RegisteredTriggerValue tval) throws InvalidTriggerDataException { Modified: trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/MultiConditionTrigger.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/MultiConditionTrigger.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/MultiConditionTrigger.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -57,7 +57,6 @@ import org.hyperic.hq.events.TriggerFiredEvent; import org.hyperic.hq.events.TriggerNotFiredEvent; import org.hyperic.hq.events.ext.AbstractTrigger; -import org.hyperic.hq.events.ext.RegisterableTriggerInterface; import org.hyperic.hq.events.shared.EventTrackerLocal; import org.hyperic.hq.events.shared.EventTrackerUtil; import org.hyperic.hq.events.shared.RegisteredTriggerValue; @@ -78,8 +77,7 @@ * */ public class MultiConditionTrigger - extends AbstractTrigger - implements RegisterableTriggerInterface { + extends AbstractTrigger { private final Log log = LogFactory.getLog(MultiConditionTrigger.class); public static final String CFG_TRIGGER_IDS = "triggerIds"; @@ -189,6 +187,9 @@ rwLock.writeLock().release(); } + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getConfigSchema() + */ public ConfigSchema getConfigSchema() { ConfigSchema res = new ConfigSchema(); @@ -219,14 +220,9 @@ resp.setValue(CFG_TIME_RANGE, String.valueOf(range)); return resp; } - - /** - * Initialize the trigger with a value object. - * - * @param tval Configuration data for the trigger - * - * @throws InvalidTriggerDataException indicating that the triggerData - * was invalid. + + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#init(org.hyperic.hq.events.shared.RegisteredTriggerValue) */ public void init(RegisteredTriggerValue tval) throws InvalidTriggerDataException { @@ -539,15 +535,9 @@ lastException); } } - - /** Get the event classes that the trigger is interested in - * seeing. This is an optimization, so that a trigger's - * processEvent() method is called only when a valid event - * occurs. - * - * @return an array of Class objects which implement - * the 'Event' interface - * + + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedEventTypes() */ public Class[] getInterestedEventTypes() { return new Class[] { TriggerFiredEvent.class, @@ -555,16 +545,8 @@ FlushStateEvent.class }; } - /** Get a list of instance IDs specific to a class (as returned - * by getInterestedEventTypes) which the trigger is interested - * in seeing. These values are specific to the event type, and - * represent things such as specific measurements. - * - * @param c Class to get the interested event IDs for - * - * @return An array of integers representing the instance IDs - * for the specific event class - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedInstanceIDs(java.lang.Class) */ public Integer[] getInterestedInstanceIDs(Class c) { // Ask the sub triggers what they are interested in Modified: trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/ValueChangeTrigger.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/ValueChangeTrigger.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/bizapp/server/trigger/conditional/ValueChangeTrigger.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -44,7 +44,6 @@ import org.hyperic.hq.events.InvalidTriggerDataException; import org.hyperic.hq.events.TriggerFiredEvent; import org.hyperic.hq.events.ext.AbstractTrigger; -import org.hyperic.hq.events.ext.RegisterableTriggerInterface; import org.hyperic.hq.events.shared.AlertConditionValue; import org.hyperic.hq.events.shared.EventTrackerLocal; import org.hyperic.hq.events.shared.EventTrackerUtil; @@ -64,7 +63,7 @@ */ public class ValueChangeTrigger extends AbstractTrigger - implements RegisterableTriggerInterface, ConditionalTriggerInterface { + implements ConditionalTriggerInterface { static { // Register the trigger/condition ConditionalTriggerInterface.MAP_COND_TRIGGER.put( @@ -81,12 +80,15 @@ public ValueChangeTrigger() {} + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getConfigSchema() + */ public ConfigSchema getConfigSchema() { return ConditionalTriggerSchema .getConfigSchema(EventConstants.TYPE_CHANGE); } - /* (non-Javadoc) + /** * @see org.hyperic.hq.bizapp.server.trigger.conditional.ConditionalTriggerInterface#getConfigResponse(org.hyperic.hq.appdef.shared.AppdefEntityID, org.hyperic.hq.events.shared.AlertConditionValue) */ public ConfigResponse getConfigResponse( @@ -97,15 +99,9 @@ resp.setValue(CFG_ID, String.valueOf(cond.getMeasurementId())); return resp; } - - /** - * Initialize the trigger - * - * @param tval Configuration data for the trigger - * - * @throws InvalidTriggerDataException indicating that the trigger config - * was invalid. - * + + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#init(org.hyperic.hq.events.shared.RegisteredTriggerValue) */ public void init(RegisteredTriggerValue tval) throws InvalidTriggerDataException @@ -126,31 +122,15 @@ } } - /** - * Get the event classes that the trigger is interested in - * seeing. This is an optimization, so that a trigger's - * processEvent() method is called only when a valid event - * occurs. - * - * @return an array of Class objects which implement - * the 'Event' interface - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedEventTypes() */ public Class[] getInterestedEventTypes(){ return new Class[] { MeasurementEvent.class }; } - /** - * Get a list of instance IDs specific to a class (as returned - * by getInterestedEventTypes) which the trigger is interested - * in seeing. These values are specific to the event type, and - * represent things such as specific measurements. - * - * @param c Class to get the interested event IDs for - * - * @return An array of integers representing the instance IDs - * for the specific event class - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedInstanceIDs(java.lang.Class) */ public Integer[] getInterestedInstanceIDs(Class c){ return new Integer[] { measurementId }; Modified: trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/AvertTrigger.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/AvertTrigger.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/AvertTrigger.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -48,7 +48,6 @@ import org.hyperic.hq.events.InvalidTriggerDataException; import org.hyperic.hq.events.TriggerFiredEvent; import org.hyperic.hq.events.ext.AbstractTrigger; -import org.hyperic.hq.events.ext.RegisterableTriggerInterface; import org.hyperic.hq.events.ext.RegisteredTriggers; import org.hyperic.hq.events.shared.EventTrackerLocal; import org.hyperic.hq.events.shared.EventTrackerUtil; @@ -63,8 +62,7 @@ * conditions and only fire actions when all conditions have been met * */ -public class AvertTrigger extends AbstractTrigger - implements RegisterableTriggerInterface { +public class AvertTrigger extends AbstractTrigger { public static String CFG_INIT_TRIGGER = "initTrigger"; public static String CFG_AVERT_TRIGGER = "avertTrigger"; @@ -171,6 +169,9 @@ } } + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getConfigSchema() + */ public ConfigSchema getConfigSchema() { ConfigSchema res = new ConfigSchema(); IntegerConfigOption init, avert; @@ -193,29 +194,15 @@ return res; } - /** Get the event classes that the trigger is interested in - * seeing. This is an optimization, so that a trigger's - * processEvent() method is called only when a valid event - * occurs. - * - * @return an array of Class objects which implement - * the 'Event' interface - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedEventTypes() */ public Class[] getInterestedEventTypes() { return new Class[] { TriggerFiredEvent.class, HeartBeatEvent.class }; } - /** Get a list of instance IDs specific to a class (as returned - * by getInterestedEventTypes) which the trigger is interested - * in seeing. These values are specific to the event type, and - * represent things such as specific measurements. - * - * @param c Class to get the interested event IDs for - * - * @return An array of integers representing the instance IDs - * for the specific event class - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedInstanceIDs(java.lang.Class) */ public Integer[] getInterestedInstanceIDs(Class c) { // Ask the sub triggers what they are interested in @@ -229,13 +216,8 @@ return null; } - /** Initialize the trigger with a value object. - * - * @param triggerData Configuration data for the trigger - * - * @throws org.hyperic.hq.bizapp.server.trigger.InvalidTriggerDataException indicating that the triggerData - * was invalid. - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#init(org.hyperic.hq.events.shared.RegisteredTriggerValue) */ public void init(RegisteredTriggerValue tval) throws InvalidTriggerDataException { Modified: trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/ConstantDurationTrigger.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/ConstantDurationTrigger.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/ConstantDurationTrigger.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -38,7 +38,6 @@ import org.hyperic.hq.events.TriggerFiredEvent; import org.hyperic.hq.events.TriggerNotFiredEvent; import org.hyperic.hq.events.ext.AbstractTrigger; -import org.hyperic.hq.events.ext.RegisterableTriggerInterface; import org.hyperic.hq.events.shared.EventTrackerLocal; import org.hyperic.hq.events.shared.EventTrackerUtil; import org.hyperic.hq.events.shared.RegisteredTriggerValue; @@ -56,7 +55,7 @@ */ public class ConstantDurationTrigger extends AbstractTrigger - implements RegisterableTriggerInterface, FrequencyTriggerInterface { + implements FrequencyTriggerInterface { private Object lock = new Object(); private Integer triggerId; @@ -64,6 +63,9 @@ public ConstantDurationTrigger() {} + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getConfigSchema() + */ public ConfigSchema getConfigSchema() { ConfigSchema res = new ConfigSchema(); IntegerConfigOption tid; @@ -99,14 +101,8 @@ return resp; } - /** - * Initialize the trigger - * - * @param tval Configuration data for the trigger - * - * @throws org.hyperic.hq.bizapp.server.trigger.InvalidTriggerDataException indicating that the trigger config - * was invalid. - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#init(org.hyperic.hq.events.shared.RegisteredTriggerValue) */ public void init(RegisteredTriggerValue tval) throws InvalidTriggerDataException { @@ -131,32 +127,16 @@ } } - /** - * Get the event classes that the trigger is interested in - * seeing. This is an optimization, so that a trigger's - * processEvent() method is called only when a valid event - * occurs. - * - * @return an array of Class objects which implement - * the 'Event' interface - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedEventTypes() */ public Class[] getInterestedEventTypes() { return new Class[] { TriggerFiredEvent.class, TriggerNotFiredEvent.class }; } - /** - * Get a list of instance IDs specific to a class (as returned - * by getInterestedEventTypes) which the trigger is interested - * in seeing. These values are specific to the event type, and - * represent things such as specific measurements. - * - * @param c Class to get the interested event IDs for - * - * @return An array of integers representing the instance IDs - * for the specific event class - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedInstanceIDs(java.lang.Class) */ public Integer[] getInterestedInstanceIDs(Class c) { // Same set for both fired and not fired Modified: trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/CounterTrigger.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/CounterTrigger.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/CounterTrigger.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -36,7 +36,6 @@ import org.hyperic.hq.events.InvalidTriggerDataException; import org.hyperic.hq.events.TriggerFiredEvent; import org.hyperic.hq.events.ext.AbstractTrigger; -import org.hyperic.hq.events.ext.RegisterableTriggerInterface; import org.hyperic.hq.events.shared.EventTrackerLocal; import org.hyperic.hq.events.shared.EventTrackerUtil; import org.hyperic.hq.events.shared.RegisteredTriggerValue; @@ -54,7 +53,7 @@ */ public class CounterTrigger extends AbstractTrigger - implements RegisterableTriggerInterface, FrequencyTriggerInterface + implements FrequencyTriggerInterface { private static final String CFG_COUNT = "count"; @@ -64,6 +63,9 @@ public CounterTrigger() {} + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getConfigSchema() + */ public ConfigSchema getConfigSchema() { ConfigSchema res = new ConfigSchema(); IntegerConfigOption tid, count; @@ -108,14 +110,8 @@ return resp; } - /** - * Initialize the trigger - * - * @param tval Configuration data for the trigger - * - * @throws org.hyperic.hq.bizapp.server.trigger.InvalidTriggerDataException indicating that the trigger config - * was invalid. - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#init(org.hyperic.hq.events.shared.RegisteredTriggerValue) */ public void init(RegisteredTriggerValue tval) throws InvalidTriggerDataException @@ -143,31 +139,15 @@ } } - /** - * Get the event classes that the trigger is interested in - * seeing. This is an optimization, so that a trigger's - * processEvent() method is called only when a valid event - * occurs. - * - * @return an array of Class objects which implement - * the 'Event' interface - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedEventTypes() */ public Class[] getInterestedEventTypes(){ return new Class[] { TriggerFiredEvent.class }; } - - /** - * Get a list of instance IDs specific to a class (as returned - * by getInterestedEventTypes) which the trigger is interested - * in seeing. These values are specific to the event type, and - * represent things such as specific measurements. - * - * @param c Class to get the interested event IDs for - * - * @return An array of integers representing the instance IDs - * for the specific event class - * + + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedInstanceIDs(java.lang.Class) */ public Integer[] getInterestedInstanceIDs(Class c){ return new Integer[] { triggerId }; Modified: trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/DurationTrigger.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/DurationTrigger.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/DurationTrigger.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -39,7 +39,6 @@ import org.hyperic.hq.events.TriggerFiredEvent; import org.hyperic.hq.events.TriggerNotFiredEvent; import org.hyperic.hq.events.ext.AbstractTrigger; -import org.hyperic.hq.events.ext.RegisterableTriggerInterface; import org.hyperic.hq.events.ext.RegisteredTriggers; import org.hyperic.hq.events.server.session.EventTrackerEJBImpl; import org.hyperic.hq.events.shared.EventTrackerLocal; @@ -58,7 +57,7 @@ */ public class DurationTrigger extends AbstractTrigger - implements RegisterableTriggerInterface, FrequencyTriggerInterface { + implements FrequencyTriggerInterface { private static final String CFG_COUNT = "count"; private Object lock = new Object(); @@ -75,6 +74,9 @@ log = LogFactory.getLog(DurationTrigger.class); } + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getConfigSchema() + */ public ConfigSchema getConfigSchema() { ConfigSchema res = new ConfigSchema(); IntegerConfigOption tid; @@ -116,14 +118,8 @@ return resp; } - /** - * Initialize the trigger - * - * @param tval Configuration data for the trigger - * - * @throws org.hyperic.hq.bizapp.server.trigger.InvalidTriggerDataException - indicating that the trigger config was invalid. - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#init(org.hyperic.hq.events.shared.RegisteredTriggerValue) */ public void init(RegisteredTriggerValue tval) throws InvalidTriggerDataException { @@ -166,17 +162,8 @@ HeartBeatEvent.class }; } - /** - * Get a list of instance IDs specific to a class (as returned - * by getInterestedEventTypes) which the trigger is interested - * in seeing. These values are specific to the event type, and - * represent things such as specific measurements. - * - * @param c Class to get the interested event IDs for - * - * @return An array of integers representing the instance IDs - * for the specific event class - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedInstanceIDs(java.lang.Class) */ public Integer[] getInterestedInstanceIDs(Class c){ if (c.equals(HeartBeatEvent.class)) { Modified: trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/EscalateTrigger.java =================================================================== --- trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/EscalateTrigger.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/bizapp/server/trigger/frequency/EscalateTrigger.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -46,7 +46,6 @@ import org.hyperic.hq.events.InvalidTriggerDataException; import org.hyperic.hq.events.TriggerFiredEvent; import org.hyperic.hq.events.ext.AbstractTrigger; -import org.hyperic.hq.events.ext.RegisterableTriggerInterface; import org.hyperic.hq.events.shared.EventTrackerLocal; import org.hyperic.hq.events.shared.EventTrackerUtil; import org.hyperic.hq.events.shared.RegisteredTriggerValue; @@ -60,8 +59,7 @@ * conditions and only fire actions when all conditions have been met * */ -public class EscalateTrigger extends AbstractTrigger - implements RegisterableTriggerInterface { +public class EscalateTrigger extends AbstractTrigger { private static String CFG_WATCH = "watch"; private static String CFG_AFTER = "after"; @@ -163,6 +161,9 @@ } } + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getConfigSchema() + */ public ConfigSchema getConfigSchema() { ConfigSchema res = new ConfigSchema(); @@ -175,29 +176,15 @@ return res; } - /** Get the event classes that the trigger is interested in - * seeing. This is an optimization, so that a trigger's - * processEvent() method is called only when a valid event - * occurs. - * - * @return an array of Class objects which implement - * the 'Event' interface - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedEventTypes() */ public Class[] getInterestedEventTypes() { return new Class[] { TriggerFiredEvent.class }; } - /** Get a list of instance IDs specific to a class (as returned - * by getInterestedEventTypes) which the trigger is interested - * in seeing. These values are specific to the event type, and - * represent things such as specific measurements. - * - * @param c Class to get the interested event IDs for - * - * @return An array of integers representing the instance IDs - * for the specific event class - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#getInterestedInstanceIDs(java.lang.Class) */ public Integer[] getInterestedInstanceIDs(Class c) { // Ask the sub triggers what they are interested in @@ -207,13 +194,8 @@ return null; } - /** Initialize the trigger with a value object. - * - * @param triggerData Configuration data for the trigger - * - * @throws org.hyperic.hq.bizapp.server.trigger.InvalidTriggerDataException indicating that the triggerData - * was invalid. - * + /** + * @see org.hyperic.hq.events.ext.RegisterableTriggerInterface#init(org.hyperic.hq.events.shared.RegisteredTriggerValue) */ public void init(RegisteredTriggerValue tval) throws InvalidTriggerDataException { Modified: trunk/src/org/hyperic/hq/events/ext/AbstractTrigger.java =================================================================== --- trunk/src/org/hyperic/hq/events/ext/AbstractTrigger.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/events/ext/AbstractTrigger.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -52,6 +52,7 @@ import org.hyperic.hq.events.AlertCreateException; import org.hyperic.hq.events.AlertDefinitionLastFiredUpdateEvent; import org.hyperic.hq.events.EventConstants; +import org.hyperic.hq.events.InvalidTriggerDataException; import org.hyperic.hq.events.TriggerFiredEvent; import org.hyperic.hq.events.TriggerInterface; import org.hyperic.hq.events.TriggerNotFiredEvent; @@ -69,7 +70,8 @@ /** Abstract class that defines a trigger, which can fire actions */ -public abstract class AbstractTrigger implements TriggerInterface { +public abstract class AbstractTrigger + implements TriggerInterface, RegisterableTriggerInterface { private final Log log = LogFactory.getLog(AbstractTrigger.class); @@ -95,7 +97,7 @@ // set the default value triggerValue.setId(new Integer(-1)); } - + private boolean isSystemReady() { if (!systemReady) { try { @@ -185,9 +187,7 @@ } EscalatableCreator creator = - new ClassicEscalatableCreator(alertDef, - event, - getAlertDefLastFiredCallback()); + new ClassicEscalatableCreator(alertDef, event); // Now start escalation if (alertDef.getEscalation() != null) { Modified: trunk/src/org/hyperic/hq/events/ext/RegisterableTriggerInterface.java =================================================================== --- trunk/src/org/hyperic/hq/events/ext/RegisterableTriggerInterface.java 2007-11-21 01:36:10 UTC (rev 6884) +++ trunk/src/org/hyperic/hq/events/ext/RegisterableTriggerInterface.java 2007-11-21 02:06:41 UTC (rev 6885) @@ -35,13 +35,12 @@ */ public interface RegisterableTriggerInterface { + /** - * Initialize the trigger with a value object. + * Initialize the trigger with a value object. * - * @param triggerData Configuration data for the trigger - * - * @throws org.hyperic.hq.bizapp.server.trigger.InvalidTriggerDataException - * indicating that the triggerData was invalid. + * @param tval Configuration data for the trigger + * @throws InvalidTriggerDataException if the configuration data is invalid. */ public void init(RegisteredTriggerValue tval) throws InvalidTriggerDataException; |