openstack
/
monasca-thresh
Code Issues Proposed changes

Use new monasca-common package names 

Change-Id: I1fd7497b5ef7f983c4b3957a185030a6cacef987
This commit is contained in:
Craig Bryant 2014-10-13 15:19:30 -06:00
parent 032f068f82
commit adf36b0ae5
36 changed files with 158 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thresh/src/main/java/monasca/thresh/KafkaSpoutConfig.java
View File

@ -17,7 +17,7 @@
package monasca.thresh;
import com.hpcloud.configuration.KafkaConsumerConfiguration;
import monasca.common.configuration.KafkaConsumerConfiguration;
import com.fasterxml.jackson.annotation.JsonProperty;

2
thresh/src/main/java/monasca/thresh/ThresholdingConfiguration.java
View File

@ -17,7 +17,7 @@
package monasca.thresh;
import com.hpcloud.configuration.KafkaProducerConfiguration;
import monasca.common.configuration.KafkaProducerConfiguration;
import monasca.thresh.infrastructure.thresholding.DataSourceFactory;
import org.hibernate.validator.constraints.NotEmpty;

4
thresh/src/main/java/monasca/thresh/ThresholdingEngine.java
View File

@ -20,8 +20,8 @@ package monasca.thresh;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.core.util.StatusPrinter;
import com.hpcloud.util.Injector;
import com.hpcloud.util.config.ConfigurationFactory;
import monasca.common.util.Injector;
import monasca.common.util.config.ConfigurationFactory;
import backtype.storm.Config;
import backtype.storm.LocalCluster;

2
thresh/src/main/java/monasca/thresh/TopologyModule.java
View File

@ -26,7 +26,7 @@ import monasca.thresh.infrastructure.thresholding.MetricFilteringBolt;
import monasca.thresh.infrastructure.thresholding.MetricSpout;
import monasca.thresh.infrastructure.thresholding.deserializer.EventDeserializer;
import com.hpcloud.util.Injector;
import monasca.common.util.Injector;
import backtype.storm.Config;
import backtype.storm.generated.StormTopology;

8
thresh/src/main/java/monasca/thresh/domain/model/Alarm.java
View File

@ -17,10 +17,10 @@
package monasca.thresh.domain.model;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.domain.common.AbstractEntity;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.domain.common.AbstractEntity;
import java.util.ArrayList;
import java.util.Collection;

4
thresh/src/main/java/monasca/thresh/domain/model/AlarmDefinition.java
View File

@ -17,8 +17,8 @@
package monasca.thresh.domain.model;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.domain.common.AbstractEntity;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.domain.common.AbstractEntity;
import java.util.ArrayList;
import java.util.List;

2
thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantId.java
View File

@ -17,7 +17,7 @@
package monasca.thresh.domain.model;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.metric.MetricDefinition;
import java.io.Serializable;

2
thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcher.java
View File

@ -17,7 +17,7 @@
package monasca.thresh.domain.model;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.metric.MetricDefinition;
import java.util.Arrays;
import java.util.Collections;

6
thresh/src/main/java/monasca/thresh/domain/model/SubAlarm.java
View File

@ -17,9 +17,9 @@
package monasca.thresh.domain.model;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.domain.common.AbstractEntity;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.domain.common.AbstractEntity;
import java.io.Serializable;

6
thresh/src/main/java/monasca/thresh/domain/model/SubAlarmStats.java
View File

@ -17,9 +17,9 @@
package monasca.thresh.domain.model;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.util.stats.SlidingWindowStats;
import com.hpcloud.util.time.TimeResolution;
import monasca.common.model.alarm.AlarmState;
import monasca.common.util.stats.SlidingWindowStats;
import monasca.common.util.time.TimeResolution;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
thresh/src/main/java/monasca/thresh/domain/service/AlarmDAO.java
View File

@ -17,7 +17,7 @@
package monasca.thresh.domain.service;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmState;
import monasca.thresh.domain.model.Alarm;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;

8
thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDAOImpl.java
View File

@ -17,10 +17,10 @@
package monasca.thresh.infrastructure.persistence;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.persistence.BeanMapper;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.common.persistence.BeanMapper;
import monasca.thresh.domain.model.Alarm;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;

2
thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDefinitionDAOImpl.java
View File

@ -17,7 +17,7 @@
package monasca.thresh.infrastructure.persistence;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmExpression;
import monasca.thresh.domain.model.AlarmDefinition;
import monasca.thresh.domain.service.AlarmDefinitionDAO;

12
thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmCreationBolt.java
View File

@ -17,12 +17,12 @@
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.mon.common.event.AlarmDefinitionDeletedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.streaming.storm.Logging;
import com.hpcloud.util.Injector;
import monasca.common.model.event.AlarmDefinitionDeletedEvent;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.common.streaming.storm.Logging;
import monasca.common.util.Injector;
import backtype.storm.task.OutputCollector;
import backtype.storm.task.TopologyContext;

20
thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBolt.java
View File

@ -17,16 +17,16 @@
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.configuration.KafkaProducerConfiguration;
import com.hpcloud.mon.common.event.AlarmDefinitionUpdatedEvent;
import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
import com.hpcloud.mon.common.event.AlarmUpdatedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.streaming.storm.Logging;
import com.hpcloud.streaming.storm.Streams;
import com.hpcloud.util.Injector;
import com.hpcloud.util.Serialization;
import monasca.common.configuration.KafkaProducerConfiguration;
import monasca.common.model.event.AlarmDefinitionUpdatedEvent;
import monasca.common.model.event.AlarmStateTransitionedEvent;
import monasca.common.model.event.AlarmUpdatedEvent;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.metric.MetricDefinition;
import monasca.common.streaming.storm.Logging;
import monasca.common.streaming.storm.Streams;
import monasca.common.util.Injector;
import monasca.common.util.Serialization;
import backtype.storm.task.OutputCollector;
import backtype.storm.task.TopologyContext;

16
thresh/src/main/java/monasca/thresh/infrastructure/thresholding/EventProcessingBolt.java
View File

@ -17,19 +17,19 @@
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.mon.common.event.AlarmDefinitionCreatedEvent;
import com.hpcloud.mon.common.event.AlarmDefinitionDeletedEvent;
import com.hpcloud.mon.common.event.AlarmDefinitionUpdatedEvent;
import com.hpcloud.mon.common.event.AlarmDeletedEvent;
import com.hpcloud.mon.common.event.AlarmUpdatedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.event.AlarmDefinitionCreatedEvent;
import monasca.common.model.event.AlarmDefinitionDeletedEvent;
import monasca.common.model.event.AlarmDefinitionUpdatedEvent;
import monasca.common.model.event.AlarmDeletedEvent;
import monasca.common.model.event.AlarmUpdatedEvent;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.thresh.domain.model.MetricDefinitionAndTenantId;
import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.model.TenantIdAndMetricName;
import com.hpcloud.streaming.storm.Logging;
import monasca.common.streaming.storm.Logging;
import backtype.storm.task.OutputCollector;
import backtype.storm.task.TopologyContext;

4
thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaAlarmEventForwarder.java
View File

@ -17,8 +17,8 @@
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.configuration.KafkaProducerConfiguration;
import com.hpcloud.configuration.KafkaProducerProperties;
import monasca.common.configuration.KafkaProducerConfiguration;
import monasca.common.configuration.KafkaProducerProperties;
import kafka.javaapi.producer.Producer;
import kafka.producer.KeyedMessage;

2
thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaSpout.java
View File

@ -17,7 +17,7 @@
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.configuration.KafkaConsumerProperties;
import monasca.common.configuration.KafkaConsumerProperties;
import monasca.thresh.KafkaSpoutConfig;
import backtype.storm.spout.SpoutOutputCollector;

8
thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBolt.java
View File

@ -17,10 +17,10 @@
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.streaming.storm.Logging;
import com.hpcloud.streaming.storm.Streams;
import com.hpcloud.streaming.storm.Tuples;
import monasca.common.model.metric.Metric;
import monasca.common.streaming.storm.Logging;
import monasca.common.streaming.storm.Streams;
import monasca.common.streaming.storm.Tuples;
import backtype.storm.Config;
import backtype.storm.task.OutputCollector;

16
thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBolt.java
View File

@ -17,14 +17,14 @@
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.mon.common.event.AlarmDefinitionCreatedEvent;
import com.hpcloud.mon.common.event.AlarmDefinitionDeletedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.streaming.storm.Logging;
import com.hpcloud.streaming.storm.Streams;
import com.hpcloud.util.Injector;
import monasca.common.model.event.AlarmDefinitionCreatedEvent;
import monasca.common.model.event.AlarmDefinitionDeletedEvent;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.Metric;
import monasca.common.streaming.storm.Logging;
import monasca.common.streaming.storm.Streams;
import monasca.common.util.Injector;
import backtype.storm.task.OutputCollector;
import backtype.storm.task.TopologyContext;

4
thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricSpout.java
View File

@ -17,8 +17,8 @@
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.mon.common.model.metric.MetricEnvelope;
import com.hpcloud.mon.common.model.metric.MetricEnvelopes;
import monasca.common.model.metric.MetricEnvelope;
import monasca.common.model.metric.MetricEnvelopes;
import backtype.storm.spout.SpoutOutputCollector;
import backtype.storm.topology.OutputFieldsDeclarer;

2
thresh/src/main/java/monasca/thresh/infrastructure/thresholding/ProducerModule.java
View File

@ -17,7 +17,7 @@
package monasca.thresh.infrastructure.thresholding;
import com.hpcloud.configuration.KafkaProducerConfiguration;
import monasca.common.configuration.KafkaProducerConfiguration;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;

15
thresh/src/main/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializer.java
View File

@ -17,13 +17,14 @@
package monasca.thresh.infrastructure.thresholding.deserializer;
import com.hpcloud.mon.common.event.AlarmDefinitionCreatedEvent;
import com.hpcloud.mon.common.event.AlarmDefinitionDeletedEvent;
import com.hpcloud.mon.common.event.AlarmDefinitionUpdatedEvent;
import com.hpcloud.mon.common.event.AlarmDeletedEvent;
import com.hpcloud.mon.common.event.AlarmUpdatedEvent;
import com.hpcloud.streaming.storm.TupleDeserializer;
import com.hpcloud.util.Serialization;
import monasca.common.model.event.AlarmDefinitionCreatedEvent;
import monasca.common.model.event.AlarmDefinitionDeletedEvent;
import monasca.common.model.event.AlarmDefinitionUpdatedEvent;
import monasca.common.model.event.AlarmCreatedEvent;
import monasca.common.model.event.AlarmDeletedEvent;
import monasca.common.model.event.AlarmUpdatedEvent;
import monasca.common.streaming.storm.TupleDeserializer;
import monasca.common.util.Serialization;
import backtype.storm.tuple.Fields;

30
thresh/src/test/java/monasca/thresh/ThresholdingEngineAlarmTest.java
View File

@ -26,21 +26,21 @@ import static org.testng.Assert.assertNotEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import com.hpcloud.configuration.KafkaProducerConfiguration;
import com.hpcloud.mon.common.event.AlarmDefinitionCreatedEvent;
import com.hpcloud.mon.common.event.AlarmDefinitionDeletedEvent;
import com.hpcloud.mon.common.event.AlarmDefinitionUpdatedEvent;
import com.hpcloud.mon.common.event.AlarmDeletedEvent;
import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
import com.hpcloud.mon.common.event.AlarmUpdatedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.streaming.storm.TopologyTestCase;
import com.hpcloud.util.Injector;
import com.hpcloud.util.Serialization;
import monasca.common.configuration.KafkaProducerConfiguration;
import monasca.common.model.event.AlarmDefinitionCreatedEvent;
import monasca.common.model.event.AlarmDefinitionDeletedEvent;
import monasca.common.model.event.AlarmDefinitionUpdatedEvent;
import monasca.common.model.event.AlarmDeletedEvent;
import monasca.common.model.event.AlarmStateTransitionedEvent;
import monasca.common.model.event.AlarmUpdatedEvent;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.Metric;
import monasca.common.model.metric.MetricDefinition;
import monasca.common.streaming.storm.TopologyTestCase;
import monasca.common.util.Injector;
import monasca.common.util.Serialization;
import backtype.storm.Config;
import backtype.storm.testing.FeederSpout;

22
thresh/src/test/java/monasca/thresh/ThresholdingEngineTest.java
View File

@ -26,17 +26,17 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import com.hpcloud.configuration.KafkaProducerConfiguration;
import com.hpcloud.mon.common.event.AlarmDefinitionCreatedEvent;
import com.hpcloud.mon.common.event.AlarmStateTransitionedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.streaming.storm.TopologyTestCase;
import com.hpcloud.util.Injector;
import com.hpcloud.util.Serialization;
import monasca.common.configuration.KafkaProducerConfiguration;
import monasca.common.model.event.AlarmDefinitionCreatedEvent;
import monasca.common.model.event.AlarmStateTransitionedEvent;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.Metric;
import monasca.common.model.metric.MetricDefinition;
import monasca.common.streaming.storm.TopologyTestCase;
import monasca.common.util.Injector;
import monasca.common.util.Serialization;
import backtype.storm.Config;
import backtype.storm.testing.FeederSpout;

12
thresh/src/test/java/monasca/thresh/domain/model/AlarmTest.java
View File

@ -21,12 +21,12 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import com.hpcloud.mon.common.model.alarm.AggregateFunction;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmOperator;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.alarm.AggregateFunction;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmOperator;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import org.testng.annotations.Test;

2
thresh/src/test/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcherTest.java
View File

@ -20,7 +20,7 @@ package monasca.thresh.domain.model;
import static org.testng.Assert.assertEqualsNoOrder;
import static org.testng.Assert.assertTrue;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.metric.MetricDefinition;
import monasca.thresh.domain.model.MetricDefinitionAndTenantIdMatcher.DimensionPair;
import monasca.thresh.domain.model.MetricDefinitionAndTenantIdMatcher.DimensionSet;

4
thresh/src/test/java/monasca/thresh/domain/model/SubAlarmStatsTest.java
View File

@ -21,8 +21,8 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;

6
thresh/src/test/java/monasca/thresh/infrastructure/persistence/AlarmDAOImplTest.java
View File

@ -21,9 +21,9 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.metric.MetricDefinition;
import com.google.common.io.Resources;

2
thresh/src/test/java/monasca/thresh/infrastructure/persistence/AlarmDefinitionDAOImplTest.java
View File

@ -21,7 +21,7 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmExpression;
import com.google.common.base.Joiner;
import com.google.common.io.Resources;

10
thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmCreationBoltTest.java
View File

@ -29,11 +29,11 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import com.hpcloud.mon.common.event.AlarmDefinitionDeletedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import monasca.common.model.event.AlarmDefinitionDeletedEvent;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import backtype.storm.Testing;
import backtype.storm.task.OutputCollector;

14
thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBoltTest.java
View File

@ -23,13 +23,15 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotEquals;
import monasca.thresh.ThresholdingConfiguration;
import com.hpcloud.mon.common.event.AlarmDefinitionUpdatedEvent;
import com.hpcloud.mon.common.event.AlarmUpdatedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import monasca.common.model.event.AlarmDefinitionUpdatedEvent;
import monasca.common.model.event.AlarmUpdatedEvent;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.streaming.storm.Streams;
import monasca.thresh.domain.model.Alarm;
import monasca.thresh.domain.model.AlarmDefinition;
@ -37,8 +39,6 @@ import monasca.thresh.domain.model.SubAlarm;
import monasca.thresh.domain.service.AlarmDAO;
import monasca.thresh.domain.service.AlarmDefinitionDAO;
import com.hpcloud.streaming.storm.Streams;
import backtype.storm.Testing;
import backtype.storm.task.OutputCollector;
import backtype.storm.task.TopologyContext;

20
thresh/src/test/java/monasca/thresh/infrastructure/thresholding/EventProcessingBoltTest.java
View File

@ -23,16 +23,16 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.testng.Assert.assertNotEquals;
import com.hpcloud.mon.common.event.AlarmDefinitionCreatedEvent;
import com.hpcloud.mon.common.event.AlarmDefinitionDeletedEvent;
import com.hpcloud.mon.common.event.AlarmDefinitionUpdatedEvent;
import com.hpcloud.mon.common.event.AlarmDeletedEvent;
import com.hpcloud.mon.common.event.AlarmUpdatedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.streaming.storm.Streams;
import monasca.common.model.event.AlarmDefinitionCreatedEvent;
import monasca.common.model.event.AlarmDefinitionDeletedEvent;
import monasca.common.model.event.AlarmDefinitionUpdatedEvent;
import monasca.common.model.event.AlarmDeletedEvent;
import monasca.common.model.event.AlarmUpdatedEvent;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.common.streaming.storm.Streams;
import backtype.storm.Testing;
import backtype.storm.task.OutputCollector;

12
thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBoltTest.java
View File

@ -28,12 +28,12 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;
import com.hpcloud.mon.common.model.alarm.AlarmOperator;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.streaming.storm.Streams;
import monasca.common.model.alarm.AlarmOperator;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.Metric;
import monasca.common.model.metric.MetricDefinition;
import monasca.common.streaming.storm.Streams;
import backtype.storm.Constants;
import backtype.storm.Testing;

16
thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBoltTest.java
View File

@ -24,14 +24,14 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
import com.hpcloud.mon.common.event.AlarmDefinitionCreatedEvent;
import com.hpcloud.mon.common.event.AlarmDefinitionDeletedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.Metric;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.streaming.storm.Streams;
import monasca.common.model.event.AlarmDefinitionCreatedEvent;
import monasca.common.model.event.AlarmDefinitionDeletedEvent;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.Metric;
import monasca.common.model.metric.MetricDefinition;
import monasca.common.streaming.storm.Streams;
import backtype.storm.Testing;
import backtype.storm.task.OutputCollector;

16
thresh/src/test/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializerTest.java
View File

@ -20,14 +20,14 @@ package monasca.thresh.infrastructure.thresholding.deserializer;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import com.hpcloud.mon.common.event.AlarmDefinitionCreatedEvent;
import com.hpcloud.mon.common.event.AlarmDeletedEvent;
import com.hpcloud.mon.common.event.AlarmUpdatedEvent;
import com.hpcloud.mon.common.model.alarm.AlarmExpression;
import com.hpcloud.mon.common.model.alarm.AlarmState;
import com.hpcloud.mon.common.model.alarm.AlarmSubExpression;
import com.hpcloud.mon.common.model.metric.MetricDefinition;
import com.hpcloud.util.Serialization;
import monasca.common.model.event.AlarmDefinitionCreatedEvent;
import monasca.common.model.event.AlarmDeletedEvent;
import monasca.common.model.event.AlarmUpdatedEvent;
import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmState;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.common.util.Serialization;
import monasca.thresh.domain.model.Alarm;
import monasca.thresh.domain.model.AlarmDefinition;