From adf36b0ae5b400ca8a939e862d617087934aa0d3 Mon Sep 17 00:00:00 2001 From: Craig Bryant Date: Mon, 13 Oct 2014 15:19:30 -0600 Subject: [PATCH] Use new monasca-common package names Change-Id: I1fd7497b5ef7f983c4b3957a185030a6cacef987 --- .../java/monasca/thresh/KafkaSpoutConfig.java | 2 +- .../thresh/ThresholdingConfiguration.java | 2 +- .../monasca/thresh/ThresholdingEngine.java | 4 +-- .../java/monasca/thresh/TopologyModule.java | 2 +- .../monasca/thresh/domain/model/Alarm.java | 8 ++--- .../thresh/domain/model/AlarmDefinition.java | 4 +-- .../model/MetricDefinitionAndTenantId.java | 2 +- .../MetricDefinitionAndTenantIdMatcher.java | 2 +- .../monasca/thresh/domain/model/SubAlarm.java | 6 ++-- .../thresh/domain/model/SubAlarmStats.java | 6 ++-- .../thresh/domain/service/AlarmDAO.java | 2 +- .../persistence/AlarmDAOImpl.java | 8 ++--- .../persistence/AlarmDefinitionDAOImpl.java | 2 +- .../thresholding/AlarmCreationBolt.java | 12 ++++---- .../thresholding/AlarmThresholdingBolt.java | 20 ++++++------- .../thresholding/EventProcessingBolt.java | 16 +++++----- .../KafkaAlarmEventForwarder.java | 4 +-- .../thresholding/KafkaSpout.java | 2 +- .../thresholding/MetricAggregationBolt.java | 8 ++--- .../thresholding/MetricFilteringBolt.java | 16 +++++----- .../thresholding/MetricSpout.java | 4 +-- .../thresholding/ProducerModule.java | 2 +- .../deserializer/EventDeserializer.java | 15 +++++----- .../thresh/ThresholdingEngineAlarmTest.java | 30 +++++++++---------- .../thresh/ThresholdingEngineTest.java | 22 +++++++------- .../thresh/domain/model/AlarmTest.java | 12 ++++---- ...etricDefinitionAndTenantIdMatcherTest.java | 2 +- .../domain/model/SubAlarmStatsTest.java | 4 +-- .../persistence/AlarmDAOImplTest.java | 6 ++-- .../AlarmDefinitionDAOImplTest.java | 2 +- .../thresholding/AlarmCreationBoltTest.java | 10 +++---- .../AlarmThresholdingBoltTest.java | 14 ++++----- .../thresholding/EventProcessingBoltTest.java | 20 ++++++------- .../MetricAggregationBoltTest.java | 12 ++++---- .../thresholding/MetricFilteringBoltTest.java | 16 +++++----- .../deserializer/EventDeserializerTest.java | 16 +++++----- 36 files changed, 158 insertions(+), 157 deletions(-) diff --git a/thresh/src/main/java/monasca/thresh/KafkaSpoutConfig.java b/thresh/src/main/java/monasca/thresh/KafkaSpoutConfig.java index 0be58b6..a1f27e0 100644 --- a/thresh/src/main/java/monasca/thresh/KafkaSpoutConfig.java +++ b/thresh/src/main/java/monasca/thresh/KafkaSpoutConfig.java @@ -17,7 +17,7 @@ package monasca.thresh; -import com.hpcloud.configuration.KafkaConsumerConfiguration; +import monasca.common.configuration.KafkaConsumerConfiguration; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/thresh/src/main/java/monasca/thresh/ThresholdingConfiguration.java b/thresh/src/main/java/monasca/thresh/ThresholdingConfiguration.java index 2918445..5a74f17 100644 --- a/thresh/src/main/java/monasca/thresh/ThresholdingConfiguration.java +++ b/thresh/src/main/java/monasca/thresh/ThresholdingConfiguration.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/ThresholdingEngine.java b/thresh/src/main/java/monasca/thresh/ThresholdingEngine.java index 1bcc0b8..a603c2f 100644 --- a/thresh/src/main/java/monasca/thresh/ThresholdingEngine.java +++ b/thresh/src/main/java/monasca/thresh/ThresholdingEngine.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/TopologyModule.java b/thresh/src/main/java/monasca/thresh/TopologyModule.java index 662de26..3fa323e 100644 --- a/thresh/src/main/java/monasca/thresh/TopologyModule.java +++ b/thresh/src/main/java/monasca/thresh/TopologyModule.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/domain/model/Alarm.java b/thresh/src/main/java/monasca/thresh/domain/model/Alarm.java index 362dc41..da88981 100644 --- a/thresh/src/main/java/monasca/thresh/domain/model/Alarm.java +++ b/thresh/src/main/java/monasca/thresh/domain/model/Alarm.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/domain/model/AlarmDefinition.java b/thresh/src/main/java/monasca/thresh/domain/model/AlarmDefinition.java index 7f6d2a8..f4f260d 100644 --- a/thresh/src/main/java/monasca/thresh/domain/model/AlarmDefinition.java +++ b/thresh/src/main/java/monasca/thresh/domain/model/AlarmDefinition.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantId.java b/thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantId.java index a84b6cb..e5a90f3 100644 --- a/thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantId.java +++ b/thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantId.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcher.java b/thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcher.java index 862d6fd..06fb5d6 100644 --- a/thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcher.java +++ b/thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcher.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/domain/model/SubAlarm.java b/thresh/src/main/java/monasca/thresh/domain/model/SubAlarm.java index 2862d47..3b397c1 100644 --- a/thresh/src/main/java/monasca/thresh/domain/model/SubAlarm.java +++ b/thresh/src/main/java/monasca/thresh/domain/model/SubAlarm.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/domain/model/SubAlarmStats.java b/thresh/src/main/java/monasca/thresh/domain/model/SubAlarmStats.java index 8aea8e2..faed3a9 100644 --- a/thresh/src/main/java/monasca/thresh/domain/model/SubAlarmStats.java +++ b/thresh/src/main/java/monasca/thresh/domain/model/SubAlarmStats.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/domain/service/AlarmDAO.java b/thresh/src/main/java/monasca/thresh/domain/service/AlarmDAO.java index 4f54e70..08a2d20 100644 --- a/thresh/src/main/java/monasca/thresh/domain/service/AlarmDAO.java +++ b/thresh/src/main/java/monasca/thresh/domain/service/AlarmDAO.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDAOImpl.java b/thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDAOImpl.java index 859e324..0a25a37 100644 --- a/thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDAOImpl.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDAOImpl.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDefinitionDAOImpl.java b/thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDefinitionDAOImpl.java index 9e8df1e..2e0ece1 100644 --- a/thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDefinitionDAOImpl.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDefinitionDAOImpl.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmCreationBolt.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmCreationBolt.java index 3d23692..e6c36da 100644 --- a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmCreationBolt.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmCreationBolt.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBolt.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBolt.java index 6d1ee6f..63e90eb 100644 --- a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBolt.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBolt.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/EventProcessingBolt.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/EventProcessingBolt.java index 9ad531b..e910d4e 100644 --- a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/EventProcessingBolt.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/EventProcessingBolt.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaAlarmEventForwarder.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaAlarmEventForwarder.java index c2975e0..2f811e3 100644 --- a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaAlarmEventForwarder.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaAlarmEventForwarder.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaSpout.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaSpout.java index ab51a25..ce22c86 100644 --- a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaSpout.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaSpout.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBolt.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBolt.java index 15ddec0..594ca80 100644 --- a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBolt.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBolt.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBolt.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBolt.java index 178ad1b..a9203f4 100644 --- a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBolt.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBolt.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricSpout.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricSpout.java index 523b0bf..8d41b9e 100644 --- a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricSpout.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricSpout.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/ProducerModule.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/ProducerModule.java index 3e85087..bf058cc 100644 --- a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/ProducerModule.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/ProducerModule.java @@ -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; diff --git a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializer.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializer.java index 0d5450c..a435314 100644 --- a/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializer.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializer.java @@ -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; diff --git a/thresh/src/test/java/monasca/thresh/ThresholdingEngineAlarmTest.java b/thresh/src/test/java/monasca/thresh/ThresholdingEngineAlarmTest.java index ece8ab9..6c93e3b 100644 --- a/thresh/src/test/java/monasca/thresh/ThresholdingEngineAlarmTest.java +++ b/thresh/src/test/java/monasca/thresh/ThresholdingEngineAlarmTest.java @@ -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; diff --git a/thresh/src/test/java/monasca/thresh/ThresholdingEngineTest.java b/thresh/src/test/java/monasca/thresh/ThresholdingEngineTest.java index 94450c2..f98559f 100644 --- a/thresh/src/test/java/monasca/thresh/ThresholdingEngineTest.java +++ b/thresh/src/test/java/monasca/thresh/ThresholdingEngineTest.java @@ -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; diff --git a/thresh/src/test/java/monasca/thresh/domain/model/AlarmTest.java b/thresh/src/test/java/monasca/thresh/domain/model/AlarmTest.java index e8cfc5c..29c1c9c 100644 --- a/thresh/src/test/java/monasca/thresh/domain/model/AlarmTest.java +++ b/thresh/src/test/java/monasca/thresh/domain/model/AlarmTest.java @@ -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; diff --git a/thresh/src/test/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcherTest.java b/thresh/src/test/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcherTest.java index 0c94eaf..ee806ab 100644 --- a/thresh/src/test/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcherTest.java +++ b/thresh/src/test/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcherTest.java @@ -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; diff --git a/thresh/src/test/java/monasca/thresh/domain/model/SubAlarmStatsTest.java b/thresh/src/test/java/monasca/thresh/domain/model/SubAlarmStatsTest.java index cc76313..2e759d3 100644 --- a/thresh/src/test/java/monasca/thresh/domain/model/SubAlarmStatsTest.java +++ b/thresh/src/test/java/monasca/thresh/domain/model/SubAlarmStatsTest.java @@ -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; diff --git a/thresh/src/test/java/monasca/thresh/infrastructure/persistence/AlarmDAOImplTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/persistence/AlarmDAOImplTest.java index b04e25c..4cf7dff 100644 --- a/thresh/src/test/java/monasca/thresh/infrastructure/persistence/AlarmDAOImplTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/persistence/AlarmDAOImplTest.java @@ -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; diff --git a/thresh/src/test/java/monasca/thresh/infrastructure/persistence/AlarmDefinitionDAOImplTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/persistence/AlarmDefinitionDAOImplTest.java index 46b4d76..31642cb 100644 --- a/thresh/src/test/java/monasca/thresh/infrastructure/persistence/AlarmDefinitionDAOImplTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/persistence/AlarmDefinitionDAOImplTest.java @@ -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; diff --git a/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmCreationBoltTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmCreationBoltTest.java index 547419f..1491d88 100644 --- a/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmCreationBoltTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmCreationBoltTest.java @@ -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; diff --git a/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBoltTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBoltTest.java index a285d8c..f75218b 100644 --- a/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBoltTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBoltTest.java @@ -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; diff --git a/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/EventProcessingBoltTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/EventProcessingBoltTest.java index 2b20f31..aa7fb22 100644 --- a/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/EventProcessingBoltTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/EventProcessingBoltTest.java @@ -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; diff --git a/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBoltTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBoltTest.java index 603366b..4e14107 100644 --- a/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBoltTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBoltTest.java @@ -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; diff --git a/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBoltTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBoltTest.java index 10e5b48..ef3f3a4 100644 --- a/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBoltTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBoltTest.java @@ -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; diff --git a/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializerTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializerTest.java index b1dda6c..f400828 100644 --- a/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializerTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializerTest.java @@ -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;