From f72caef55fbe238c763db79420deb0fe3142780e Mon Sep 17 00:00:00 2001 From: Craig Bryant Date: Tue, 5 Aug 2014 22:03:47 -0600 Subject: [PATCH] Change packages to monasca.thresh The diffs are going to be very hard to read on this change, but basically the change is from com.hpcloud.mon to monasca.thresh. Since monasca-common packages haven't changed, yet, they are still referenced as com.hpcloud.mon, but everything else has changed to monasca.thresh. The init script has also been changed to invoke the new package path. Change-Id: I5aad9302a8f5b11ed1b9874160f0d7a9882c5b2d --- thresh/pom.xml | 2 +- .../src/deb/etc/mon-thresh-config.yml-sample | 2 +- thresh/src/deb/init/mon-thresh | 2 +- .../thresh}/EventSpoutConfig.java | 2 +- .../thresh}/KafkaSpoutConfig.java | 2 +- .../thresh}/MetricSpoutConfig.java | 2 +- .../thresh}/ThresholdingConfiguration.java | 4 +-- .../thresh}/ThresholdingEngine.java | 4 +-- .../thresh}/TopologyModule.java | 16 ++++++------ .../thresh}/domain/model/Alarm.java | 2 +- .../model/MetricDefinitionAndTenantId.java | 2 +- .../MetricDefinitionAndTenantIdMatcher.java | 2 +- .../thresh}/domain/model/SubAlarm.java | 2 +- .../thresh}/domain/model/SubAlarmStats.java | 2 +- .../thresh}/domain/service/AlarmDAO.java | 4 +-- .../domain/service/MetricDefinitionDAO.java | 2 +- .../thresh}/domain/service/SubAlarmDAO.java | 6 ++--- .../service/SubAlarmMetricDefinition.java | 4 +-- .../service/SubAlarmStatsRepository.java | 6 ++--- .../persistence/AlarmDAOImpl.java | 8 +++--- .../persistence/MetricDefinitionDAOImpl.java | 8 +++--- .../persistence/PersistenceModule.java | 10 +++---- .../persistence/SubAlarmDAOImpl.java | 8 +++--- .../thresholding/AlarmEventForwarder.java | 2 +- .../thresholding/AlarmThresholdingBolt.java | 12 ++++----- .../thresholding/DataSourceFactory.java | 2 +- .../thresholding/EventProcessingBolt.java | 6 ++--- .../thresholding/EventSpout.java | 6 ++--- .../KafkaAlarmEventForwarder.java | 2 +- .../thresholding/KafkaSpout.java | 4 +-- .../thresholding/MetricAggregationBolt.java | 16 ++++++------ .../thresholding/MetricFilteringBolt.java | 22 ++++++++-------- .../thresholding/MetricSpout.java | 6 ++--- .../thresholding/ProducerModule.java | 2 +- .../thresholding/PropertyFinder.java | 2 +- .../deserializer/EventDeserializer.java | 2 +- thresh/src/main/resources/logback.xml | 4 +-- .../mon => monasca/thresh}/Assert.java | 2 +- .../thresh}/ThresholdingEngineAlarmTest.java | 26 +++++++++---------- .../thresh}/ThresholdingEngineRunner.java | 4 +-- .../thresh}/ThresholdingEngineTest.java | 22 ++++++++-------- .../thresh}/ThresholdingEngineTest1.java | 24 ++++++++--------- .../thresh}/domain/model/AlarmTest.java | 2 +- ...etricDefinitionAndTenantIdMatcherTest.java | 6 ++--- .../domain/model/SubAlarmStatsTest.java | 2 +- .../persistence/AlarmDAOImplTest.java | 8 +++--- .../MetricDefinitionDAOImplTest.java | 8 +++--- .../persistence/SubAlarmDAOImplTest.java | 8 +++--- .../AlarmThresholdingBoltTest.java | 10 +++---- .../thresholding/EventProcessingBoltTest.java | 8 +++--- .../MetricAggregationBoltTest.java | 12 ++++----- .../thresholding/MetricFilteringBoltTest.java | 10 +++---- .../thresholding/PropertyFinderTest.java | 4 +-- .../deserializer/EventDeserializerTest.java | 2 +- thresh/src/test/resources/logback.xml | 2 +- .../infrastructure/persistence/alarm.sql | 0 56 files changed, 175 insertions(+), 175 deletions(-) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/EventSpoutConfig.java (96%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/KafkaSpoutConfig.java (97%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/MetricSpoutConfig.java (96%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/ThresholdingConfiguration.java (96%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/ThresholdingEngine.java (96%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/TopologyModule.java (90%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/domain/model/Alarm.java (99%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/domain/model/MetricDefinitionAndTenantId.java (98%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/domain/model/MetricDefinitionAndTenantIdMatcher.java (99%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/domain/model/SubAlarm.java (99%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/domain/model/SubAlarmStats.java (99%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/domain/service/AlarmDAO.java (91%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/domain/service/MetricDefinitionDAO.java (95%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/domain/service/SubAlarmDAO.java (85%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/domain/service/SubAlarmMetricDefinition.java (95%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/domain/service/SubAlarmStatsRepository.java (92%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/persistence/AlarmDAOImpl.java (95%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/persistence/MetricDefinitionDAOImpl.java (91%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/persistence/PersistenceModule.java (84%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/persistence/SubAlarmDAOImpl.java (95%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/AlarmEventForwarder.java (93%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/AlarmThresholdingBolt.java (96%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/DataSourceFactory.java (98%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/EventProcessingBolt.java (97%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/EventSpout.java (91%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/KafkaAlarmEventForwarder.java (97%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/KafkaSpout.java (98%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/MetricAggregationBolt.java (96%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/MetricFilteringBolt.java (93%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/MetricSpout.java (93%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/ProducerModule.java (96%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/PropertyFinder.java (96%) rename thresh/src/main/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/deserializer/EventDeserializer.java (96%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/Assert.java (98%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/ThresholdingEngineAlarmTest.java (94%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/ThresholdingEngineRunner.java (92%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/ThresholdingEngineTest.java (94%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/ThresholdingEngineTest1.java (92%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/domain/model/AlarmTest.java (99%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/domain/model/MetricDefinitionAndTenantIdMatcherTest.java (97%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/domain/model/SubAlarmStatsTest.java (99%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/persistence/AlarmDAOImplTest.java (95%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/persistence/MetricDefinitionDAOImplTest.java (95%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/persistence/SubAlarmDAOImplTest.java (97%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/AlarmThresholdingBoltTest.java (97%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/EventProcessingBoltTest.java (98%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/MetricAggregationBoltTest.java (98%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/MetricFilteringBoltTest.java (98%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/PropertyFinderTest.java (93%) rename thresh/src/test/java/{com/hpcloud/mon => monasca/thresh}/infrastructure/thresholding/deserializer/EventDeserializerTest.java (97%) rename thresh/src/test/resources/{com/hpcloud/mon => monasca/thresh}/infrastructure/persistence/alarm.sql (100%) diff --git a/thresh/pom.xml b/thresh/pom.xml index 8403bc6..462b2da 100644 --- a/thresh/pom.xml +++ b/thresh/pom.xml @@ -228,7 +228,7 @@ - com.hpcloud.mon.ThresholdingEngine + monasca.thresh.ThresholdingEngine true diff --git a/thresh/src/deb/etc/mon-thresh-config.yml-sample b/thresh/src/deb/etc/mon-thresh-config.yml-sample index e2f5aed..369a982 100755 --- a/thresh/src/deb/etc/mon-thresh-config.yml-sample +++ b/thresh/src/deb/etc/mon-thresh-config.yml-sample @@ -63,7 +63,7 @@ sporadicMetricNamespaces: database: driverClass: com.vertica.jdbc.Driver - url: jdbc:vertica://mon-aw1rdd1-vertica0001.rndd.aw1.hpcloud.net:5433/som + url: jdbc:vertica://mini-mon:5433/monasca user: thresh password: password properties: diff --git a/thresh/src/deb/init/mon-thresh b/thresh/src/deb/init/mon-thresh index f70331f..8553aef 100755 --- a/thresh/src/deb/init/mon-thresh +++ b/thresh/src/deb/init/mon-thresh @@ -13,7 +13,7 @@ case "$1" in start) $0 status if [ $? -ne 0 ]; then - sudo -Hu thresh /opt/storm/current/bin/storm jar /opt/mon/mon-thresh.jar com.hpcloud.mon.ThresholdingEngine /etc/mon/mon-thresh-config.yml thresh-cluster + sudo -Hu thresh /opt/storm/current/bin/storm jar /opt/mon/mon-thresh.jar monasca.thresh.ThresholdingEngine /etc/mon/mon-thresh-config.yml thresh-cluster else echo "Mon-thresh is already running" fi diff --git a/thresh/src/main/java/com/hpcloud/mon/EventSpoutConfig.java b/thresh/src/main/java/monasca/thresh/EventSpoutConfig.java similarity index 96% rename from thresh/src/main/java/com/hpcloud/mon/EventSpoutConfig.java rename to thresh/src/main/java/monasca/thresh/EventSpoutConfig.java index 6a75d25..3a9bdf4 100644 --- a/thresh/src/main/java/com/hpcloud/mon/EventSpoutConfig.java +++ b/thresh/src/main/java/monasca/thresh/EventSpoutConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon; +package monasca.thresh; public class EventSpoutConfig extends KafkaSpoutConfig { diff --git a/thresh/src/main/java/com/hpcloud/mon/KafkaSpoutConfig.java b/thresh/src/main/java/monasca/thresh/KafkaSpoutConfig.java similarity index 97% rename from thresh/src/main/java/com/hpcloud/mon/KafkaSpoutConfig.java rename to thresh/src/main/java/monasca/thresh/KafkaSpoutConfig.java index 1255b6e..0be58b6 100644 --- a/thresh/src/main/java/com/hpcloud/mon/KafkaSpoutConfig.java +++ b/thresh/src/main/java/monasca/thresh/KafkaSpoutConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon; +package monasca.thresh; import com.hpcloud.configuration.KafkaConsumerConfiguration; diff --git a/thresh/src/main/java/com/hpcloud/mon/MetricSpoutConfig.java b/thresh/src/main/java/monasca/thresh/MetricSpoutConfig.java similarity index 96% rename from thresh/src/main/java/com/hpcloud/mon/MetricSpoutConfig.java rename to thresh/src/main/java/monasca/thresh/MetricSpoutConfig.java index 2beb498..622332a 100644 --- a/thresh/src/main/java/com/hpcloud/mon/MetricSpoutConfig.java +++ b/thresh/src/main/java/monasca/thresh/MetricSpoutConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon; +package monasca.thresh; public class MetricSpoutConfig extends KafkaSpoutConfig { diff --git a/thresh/src/main/java/com/hpcloud/mon/ThresholdingConfiguration.java b/thresh/src/main/java/monasca/thresh/ThresholdingConfiguration.java similarity index 96% rename from thresh/src/main/java/com/hpcloud/mon/ThresholdingConfiguration.java rename to thresh/src/main/java/monasca/thresh/ThresholdingConfiguration.java index 278c38c..73d0dd1 100644 --- a/thresh/src/main/java/com/hpcloud/mon/ThresholdingConfiguration.java +++ b/thresh/src/main/java/monasca/thresh/ThresholdingConfiguration.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.hpcloud.mon; +package monasca.thresh; import com.hpcloud.configuration.KafkaProducerConfiguration; -import com.hpcloud.mon.infrastructure.thresholding.DataSourceFactory; +import monasca.thresh.infrastructure.thresholding.DataSourceFactory; import org.hibernate.validator.constraints.NotEmpty; diff --git a/thresh/src/main/java/com/hpcloud/mon/ThresholdingEngine.java b/thresh/src/main/java/monasca/thresh/ThresholdingEngine.java similarity index 96% rename from thresh/src/main/java/com/hpcloud/mon/ThresholdingEngine.java rename to thresh/src/main/java/monasca/thresh/ThresholdingEngine.java index 110f90d..1bcc0b8 100644 --- a/thresh/src/main/java/com/hpcloud/mon/ThresholdingEngine.java +++ b/thresh/src/main/java/monasca/thresh/ThresholdingEngine.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon; +package monasca.thresh; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.core.util.StatusPrinter; @@ -83,7 +83,7 @@ public class ThresholdingEngine { protected void run() throws Exception { Config config = Injector.getInstance(Config.class); StormTopology topology = Injector.getInstance(StormTopology.class); - config.registerSerialization(com.hpcloud.mon.domain.model.SubAlarm.class); + config.registerSerialization(monasca.thresh.domain.model.SubAlarm.class); if (local) { logger.info("submitting topology {} to local storm cluster", topologyName); diff --git a/thresh/src/main/java/com/hpcloud/mon/TopologyModule.java b/thresh/src/main/java/monasca/thresh/TopologyModule.java similarity index 90% rename from thresh/src/main/java/com/hpcloud/mon/TopologyModule.java rename to thresh/src/main/java/monasca/thresh/TopologyModule.java index 173b31e..408a293 100644 --- a/thresh/src/main/java/com/hpcloud/mon/TopologyModule.java +++ b/thresh/src/main/java/monasca/thresh/TopologyModule.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.hpcloud.mon; +package monasca.thresh; -import com.hpcloud.mon.infrastructure.thresholding.AlarmThresholdingBolt; -import com.hpcloud.mon.infrastructure.thresholding.EventProcessingBolt; -import com.hpcloud.mon.infrastructure.thresholding.EventSpout; -import com.hpcloud.mon.infrastructure.thresholding.MetricAggregationBolt; -import com.hpcloud.mon.infrastructure.thresholding.MetricFilteringBolt; -import com.hpcloud.mon.infrastructure.thresholding.MetricSpout; -import com.hpcloud.mon.infrastructure.thresholding.deserializer.EventDeserializer; +import monasca.thresh.infrastructure.thresholding.AlarmThresholdingBolt; +import monasca.thresh.infrastructure.thresholding.EventProcessingBolt; +import monasca.thresh.infrastructure.thresholding.EventSpout; +import monasca.thresh.infrastructure.thresholding.MetricAggregationBolt; +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 backtype.storm.Config; diff --git a/thresh/src/main/java/com/hpcloud/mon/domain/model/Alarm.java b/thresh/src/main/java/monasca/thresh/domain/model/Alarm.java similarity index 99% rename from thresh/src/main/java/com/hpcloud/mon/domain/model/Alarm.java rename to thresh/src/main/java/monasca/thresh/domain/model/Alarm.java index de69bae..ea99b28 100644 --- a/thresh/src/main/java/com/hpcloud/mon/domain/model/Alarm.java +++ b/thresh/src/main/java/monasca/thresh/domain/model/Alarm.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.domain.model; +package monasca.thresh.domain.model; import com.hpcloud.mon.common.model.alarm.AlarmExpression; import com.hpcloud.mon.common.model.alarm.AlarmState; diff --git a/thresh/src/main/java/com/hpcloud/mon/domain/model/MetricDefinitionAndTenantId.java b/thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantId.java similarity index 98% rename from thresh/src/main/java/com/hpcloud/mon/domain/model/MetricDefinitionAndTenantId.java rename to thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantId.java index 2dc2b9f..a84b6cb 100644 --- a/thresh/src/main/java/com/hpcloud/mon/domain/model/MetricDefinitionAndTenantId.java +++ b/thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantId.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.domain.model; +package monasca.thresh.domain.model; import com.hpcloud.mon.common.model.metric.MetricDefinition; diff --git a/thresh/src/main/java/com/hpcloud/mon/domain/model/MetricDefinitionAndTenantIdMatcher.java b/thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcher.java similarity index 99% rename from thresh/src/main/java/com/hpcloud/mon/domain/model/MetricDefinitionAndTenantIdMatcher.java rename to thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcher.java index a92144f..b3e4c59 100644 --- a/thresh/src/main/java/com/hpcloud/mon/domain/model/MetricDefinitionAndTenantIdMatcher.java +++ b/thresh/src/main/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcher.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.domain.model; +package monasca.thresh.domain.model; import com.hpcloud.mon.common.model.metric.MetricDefinition; diff --git a/thresh/src/main/java/com/hpcloud/mon/domain/model/SubAlarm.java b/thresh/src/main/java/monasca/thresh/domain/model/SubAlarm.java similarity index 99% rename from thresh/src/main/java/com/hpcloud/mon/domain/model/SubAlarm.java rename to thresh/src/main/java/monasca/thresh/domain/model/SubAlarm.java index c0bdf3d..1d30ebf 100644 --- a/thresh/src/main/java/com/hpcloud/mon/domain/model/SubAlarm.java +++ b/thresh/src/main/java/monasca/thresh/domain/model/SubAlarm.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.domain.model; +package monasca.thresh.domain.model; import com.hpcloud.mon.common.model.alarm.AlarmState; import com.hpcloud.mon.common.model.alarm.AlarmSubExpression; diff --git a/thresh/src/main/java/com/hpcloud/mon/domain/model/SubAlarmStats.java b/thresh/src/main/java/monasca/thresh/domain/model/SubAlarmStats.java similarity index 99% rename from thresh/src/main/java/com/hpcloud/mon/domain/model/SubAlarmStats.java rename to thresh/src/main/java/monasca/thresh/domain/model/SubAlarmStats.java index d38efdb..8aea8e2 100644 --- a/thresh/src/main/java/com/hpcloud/mon/domain/model/SubAlarmStats.java +++ b/thresh/src/main/java/monasca/thresh/domain/model/SubAlarmStats.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.domain.model; +package monasca.thresh.domain.model; import com.hpcloud.mon.common.model.alarm.AlarmState; import com.hpcloud.util.stats.SlidingWindowStats; diff --git a/thresh/src/main/java/com/hpcloud/mon/domain/service/AlarmDAO.java b/thresh/src/main/java/monasca/thresh/domain/service/AlarmDAO.java similarity index 91% rename from thresh/src/main/java/com/hpcloud/mon/domain/service/AlarmDAO.java rename to thresh/src/main/java/monasca/thresh/domain/service/AlarmDAO.java index 735cd6e..bf52a3b 100644 --- a/thresh/src/main/java/com/hpcloud/mon/domain/service/AlarmDAO.java +++ b/thresh/src/main/java/monasca/thresh/domain/service/AlarmDAO.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.hpcloud.mon.domain.service; +package monasca.thresh.domain.service; import com.hpcloud.mon.common.model.alarm.AlarmState; -import com.hpcloud.mon.domain.model.Alarm; +import monasca.thresh.domain.model.Alarm; /** * Alarm DAO. diff --git a/thresh/src/main/java/com/hpcloud/mon/domain/service/MetricDefinitionDAO.java b/thresh/src/main/java/monasca/thresh/domain/service/MetricDefinitionDAO.java similarity index 95% rename from thresh/src/main/java/com/hpcloud/mon/domain/service/MetricDefinitionDAO.java rename to thresh/src/main/java/monasca/thresh/domain/service/MetricDefinitionDAO.java index 491b8f4..e0aed00 100644 --- a/thresh/src/main/java/com/hpcloud/mon/domain/service/MetricDefinitionDAO.java +++ b/thresh/src/main/java/monasca/thresh/domain/service/MetricDefinitionDAO.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.domain.service; +package monasca.thresh.domain.service; import java.util.List; diff --git a/thresh/src/main/java/com/hpcloud/mon/domain/service/SubAlarmDAO.java b/thresh/src/main/java/monasca/thresh/domain/service/SubAlarmDAO.java similarity index 85% rename from thresh/src/main/java/com/hpcloud/mon/domain/service/SubAlarmDAO.java rename to thresh/src/main/java/monasca/thresh/domain/service/SubAlarmDAO.java index 55957aa..e4c5596 100644 --- a/thresh/src/main/java/com/hpcloud/mon/domain/service/SubAlarmDAO.java +++ b/thresh/src/main/java/monasca/thresh/domain/service/SubAlarmDAO.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.hpcloud.mon.domain.service; +package monasca.thresh.domain.service; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId; -import com.hpcloud.mon.domain.model.SubAlarm; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.model.SubAlarm; import java.util.List; diff --git a/thresh/src/main/java/com/hpcloud/mon/domain/service/SubAlarmMetricDefinition.java b/thresh/src/main/java/monasca/thresh/domain/service/SubAlarmMetricDefinition.java similarity index 95% rename from thresh/src/main/java/com/hpcloud/mon/domain/service/SubAlarmMetricDefinition.java rename to thresh/src/main/java/monasca/thresh/domain/service/SubAlarmMetricDefinition.java index 7114289..3c249ce 100644 --- a/thresh/src/main/java/com/hpcloud/mon/domain/service/SubAlarmMetricDefinition.java +++ b/thresh/src/main/java/monasca/thresh/domain/service/SubAlarmMetricDefinition.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.hpcloud.mon.domain.service; +package monasca.thresh.domain.service; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; public class SubAlarmMetricDefinition { private final String subAlarmId; diff --git a/thresh/src/main/java/com/hpcloud/mon/domain/service/SubAlarmStatsRepository.java b/thresh/src/main/java/monasca/thresh/domain/service/SubAlarmStatsRepository.java similarity index 92% rename from thresh/src/main/java/com/hpcloud/mon/domain/service/SubAlarmStatsRepository.java rename to thresh/src/main/java/monasca/thresh/domain/service/SubAlarmStatsRepository.java index 43e2ad8..e69de20 100644 --- a/thresh/src/main/java/com/hpcloud/mon/domain/service/SubAlarmStatsRepository.java +++ b/thresh/src/main/java/monasca/thresh/domain/service/SubAlarmStatsRepository.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.hpcloud.mon.domain.service; +package monasca.thresh.domain.service; -import com.hpcloud.mon.domain.model.SubAlarm; -import com.hpcloud.mon.domain.model.SubAlarmStats; +import monasca.thresh.domain.model.SubAlarm; +import monasca.thresh.domain.model.SubAlarmStats; import java.util.Collection; import java.util.HashMap; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/AlarmDAOImpl.java b/thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDAOImpl.java similarity index 95% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/AlarmDAOImpl.java rename to thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDAOImpl.java index c108254..9d54ac2 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/AlarmDAOImpl.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDAOImpl.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.persistence; +package monasca.thresh.infrastructure.persistence; import com.hpcloud.mon.common.model.alarm.AggregateFunction; 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 com.hpcloud.mon.domain.model.Alarm; -import com.hpcloud.mon.domain.model.SubAlarm; -import com.hpcloud.mon.domain.service.AlarmDAO; +import monasca.thresh.domain.model.Alarm; +import monasca.thresh.domain.model.SubAlarm; +import monasca.thresh.domain.service.AlarmDAO; import com.hpcloud.persistence.BeanMapper; import com.hpcloud.persistence.SqlQueries; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/MetricDefinitionDAOImpl.java b/thresh/src/main/java/monasca/thresh/infrastructure/persistence/MetricDefinitionDAOImpl.java similarity index 91% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/MetricDefinitionDAOImpl.java rename to thresh/src/main/java/monasca/thresh/infrastructure/persistence/MetricDefinitionDAOImpl.java index c982ed9..e2ed4ed 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/MetricDefinitionDAOImpl.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/persistence/MetricDefinitionDAOImpl.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.persistence; +package monasca.thresh.infrastructure.persistence; import com.hpcloud.mon.common.model.metric.MetricDefinition; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId; -import com.hpcloud.mon.domain.service.MetricDefinitionDAO; -import com.hpcloud.mon.domain.service.SubAlarmMetricDefinition; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.service.MetricDefinitionDAO; +import monasca.thresh.domain.service.SubAlarmMetricDefinition; import org.skife.jdbi.v2.DBI; import org.skife.jdbi.v2.Handle; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/PersistenceModule.java b/thresh/src/main/java/monasca/thresh/infrastructure/persistence/PersistenceModule.java similarity index 84% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/PersistenceModule.java rename to thresh/src/main/java/monasca/thresh/infrastructure/persistence/PersistenceModule.java index a770282..325ca27 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/PersistenceModule.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/persistence/PersistenceModule.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.persistence; +package monasca.thresh.infrastructure.persistence; -import com.hpcloud.mon.domain.service.AlarmDAO; -import com.hpcloud.mon.domain.service.MetricDefinitionDAO; -import com.hpcloud.mon.domain.service.SubAlarmDAO; -import com.hpcloud.mon.infrastructure.thresholding.DataSourceFactory; +import monasca.thresh.domain.service.AlarmDAO; +import monasca.thresh.domain.service.MetricDefinitionDAO; +import monasca.thresh.domain.service.SubAlarmDAO; +import monasca.thresh.infrastructure.thresholding.DataSourceFactory; import com.google.inject.AbstractModule; import com.google.inject.Provides; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/SubAlarmDAOImpl.java b/thresh/src/main/java/monasca/thresh/infrastructure/persistence/SubAlarmDAOImpl.java similarity index 95% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/SubAlarmDAOImpl.java rename to thresh/src/main/java/monasca/thresh/infrastructure/persistence/SubAlarmDAOImpl.java index 6cd1b91..bc701f9 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/persistence/SubAlarmDAOImpl.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/persistence/SubAlarmDAOImpl.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.persistence; +package monasca.thresh.infrastructure.persistence; import com.hpcloud.mon.common.model.alarm.AggregateFunction; import com.hpcloud.mon.common.model.alarm.AlarmOperator; import com.hpcloud.mon.common.model.alarm.AlarmSubExpression; import com.hpcloud.mon.common.model.metric.MetricDefinition; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId; -import com.hpcloud.mon.domain.model.SubAlarm; -import com.hpcloud.mon.domain.service.SubAlarmDAO; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.model.SubAlarm; +import monasca.thresh.domain.service.SubAlarmDAO; import com.hpcloud.persistence.SqlStatements; import org.skife.jdbi.v2.DBI; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/AlarmEventForwarder.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmEventForwarder.java similarity index 93% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/AlarmEventForwarder.java rename to thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmEventForwarder.java index 39c2f1e..bf01407 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/AlarmEventForwarder.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmEventForwarder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; public interface AlarmEventForwarder { diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/AlarmThresholdingBolt.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBolt.java similarity index 96% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/AlarmThresholdingBolt.java rename to thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBolt.java index 50d3a97..30414e7 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/AlarmThresholdingBolt.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBolt.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; import com.hpcloud.configuration.KafkaProducerConfiguration; -import com.hpcloud.mon.ThresholdingConfiguration; +import monasca.thresh.ThresholdingConfiguration; 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.alarm.AlarmSubExpression; -import com.hpcloud.mon.domain.model.Alarm; -import com.hpcloud.mon.domain.model.SubAlarm; -import com.hpcloud.mon.domain.service.AlarmDAO; -import com.hpcloud.mon.infrastructure.persistence.PersistenceModule; +import monasca.thresh.domain.model.Alarm; +import monasca.thresh.domain.model.SubAlarm; +import monasca.thresh.domain.service.AlarmDAO; +import monasca.thresh.infrastructure.persistence.PersistenceModule; import com.hpcloud.streaming.storm.Logging; import com.hpcloud.streaming.storm.Streams; import com.hpcloud.util.Injector; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/DataSourceFactory.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/DataSourceFactory.java similarity index 98% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/DataSourceFactory.java rename to thresh/src/main/java/monasca/thresh/infrastructure/thresholding/DataSourceFactory.java index 4e55439..fab6f5e 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/DataSourceFactory.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/DataSourceFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; import java.io.Serializable; import java.util.Properties; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/EventProcessingBolt.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/EventProcessingBolt.java similarity index 97% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/EventProcessingBolt.java rename to thresh/src/main/java/monasca/thresh/infrastructure/thresholding/EventProcessingBolt.java index d6ec35b..cdaa000 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/EventProcessingBolt.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/EventProcessingBolt.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; import com.hpcloud.mon.common.event.AlarmCreatedEvent; 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 com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId; -import com.hpcloud.mon.domain.model.SubAlarm; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.model.SubAlarm; import com.hpcloud.streaming.storm.Logging; import backtype.storm.task.OutputCollector; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/EventSpout.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/EventSpout.java similarity index 91% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/EventSpout.java rename to thresh/src/main/java/monasca/thresh/infrastructure/thresholding/EventSpout.java index 8f5e314..5fbd1e2 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/EventSpout.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/EventSpout.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; -import com.hpcloud.mon.EventSpoutConfig; -import com.hpcloud.mon.infrastructure.thresholding.deserializer.EventDeserializer; +import monasca.thresh.EventSpoutConfig; +import monasca.thresh.infrastructure.thresholding.deserializer.EventDeserializer; import backtype.storm.spout.SpoutOutputCollector; import backtype.storm.topology.OutputFieldsDeclarer; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/KafkaAlarmEventForwarder.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaAlarmEventForwarder.java similarity index 97% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/KafkaAlarmEventForwarder.java rename to thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaAlarmEventForwarder.java index a8888ba..c2975e0 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/KafkaAlarmEventForwarder.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaAlarmEventForwarder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; import com.hpcloud.configuration.KafkaProducerConfiguration; import com.hpcloud.configuration.KafkaProducerProperties; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/KafkaSpout.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaSpout.java similarity index 98% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/KafkaSpout.java rename to thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaSpout.java index daca92d..ab51a25 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/KafkaSpout.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/KafkaSpout.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; import com.hpcloud.configuration.KafkaConsumerProperties; -import com.hpcloud.mon.KafkaSpoutConfig; +import monasca.thresh.KafkaSpoutConfig; import backtype.storm.spout.SpoutOutputCollector; import backtype.storm.task.TopologyContext; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/MetricAggregationBolt.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBolt.java similarity index 96% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/MetricAggregationBolt.java rename to thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBolt.java index 33d7634..7855b0f 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/MetricAggregationBolt.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBolt.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; import com.hpcloud.mon.common.model.metric.Metric; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId; -import com.hpcloud.mon.domain.model.SubAlarm; -import com.hpcloud.mon.domain.model.SubAlarmStats; -import com.hpcloud.mon.domain.service.SubAlarmDAO; -import com.hpcloud.mon.domain.service.SubAlarmStatsRepository; -import com.hpcloud.mon.infrastructure.persistence.PersistenceModule; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.model.SubAlarm; +import monasca.thresh.domain.model.SubAlarmStats; +import monasca.thresh.domain.service.SubAlarmDAO; +import monasca.thresh.domain.service.SubAlarmStatsRepository; +import monasca.thresh.infrastructure.persistence.PersistenceModule; import com.hpcloud.streaming.storm.Logging; import com.hpcloud.streaming.storm.Streams; import com.hpcloud.streaming.storm.Tuples; @@ -66,7 +66,7 @@ import java.util.Set; */ public class MetricAggregationBolt extends BaseRichBolt { private static final long serialVersionUID = 5624314196838090726L; - public static final String TICK_TUPLE_SECONDS_KEY = "com.hpcloud.mon.aggregation.tick.seconds"; + public static final String TICK_TUPLE_SECONDS_KEY = "monasca.thresh.aggregation.tick.seconds"; public static final String[] FIELDS = new String[] {"alarmId", "subAlarm"}; public static final String METRIC_AGGREGATION_CONTROL_STREAM = "MetricAggregationControl"; public static final String[] METRIC_AGGREGATION_CONTROL_FIELDS = new String[] {"directive"}; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/MetricFilteringBolt.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBolt.java similarity index 93% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/MetricFilteringBolt.java rename to thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBolt.java index 0fe917f..60ab980 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/MetricFilteringBolt.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBolt.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; import com.hpcloud.mon.common.model.metric.Metric; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantIdMatcher; -import com.hpcloud.mon.domain.model.SubAlarm; -import com.hpcloud.mon.domain.service.MetricDefinitionDAO; -import com.hpcloud.mon.domain.service.SubAlarmDAO; -import com.hpcloud.mon.domain.service.SubAlarmMetricDefinition; -import com.hpcloud.mon.infrastructure.persistence.PersistenceModule; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.model.MetricDefinitionAndTenantIdMatcher; +import monasca.thresh.domain.model.SubAlarm; +import monasca.thresh.domain.service.MetricDefinitionDAO; +import monasca.thresh.domain.service.SubAlarmDAO; +import monasca.thresh.domain.service.SubAlarmMetricDefinition; +import monasca.thresh.infrastructure.persistence.PersistenceModule; import com.hpcloud.streaming.storm.Logging; import com.hpcloud.streaming.storm.Streams; import com.hpcloud.util.Injector; @@ -77,11 +77,11 @@ import java.util.concurrent.ConcurrentHashMap; public class MetricFilteringBolt extends BaseRichBolt { private static final long serialVersionUID = 1096706128973976599L; - public static final String MIN_LAG_VALUE_KEY = "com.hpcloud.mon.filtering.minLagValue"; + public static final String MIN_LAG_VALUE_KEY = "monasca.thresh.filtering.minLagValue"; public static final int MIN_LAG_VALUE_DEFAULT = 10; - public static final String MAX_LAG_MESSAGES_KEY = "com.hpcloud.mon.filtering.maxLagMessages"; + public static final String MAX_LAG_MESSAGES_KEY = "monasca.thresh.filtering.maxLagMessages"; public static final int MAX_LAG_MESSAGES_DEFAULT = 10; - public static final String LAG_MESSAGE_PERIOD_KEY = "com.hpcloud.mon.filtering.lagMessagePeriod"; + public static final String LAG_MESSAGE_PERIOD_KEY = "monasca.thresh.filtering.lagMessagePeriod"; public static final int LAG_MESSAGE_PERIOD_DEFAULT = 30; public static final String[] FIELDS = new String[] {"metricDefinitionAndTenantId", "metric"}; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/MetricSpout.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricSpout.java similarity index 93% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/MetricSpout.java rename to thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricSpout.java index ff5c7fd..67dfa9b 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/MetricSpout.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/MetricSpout.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; -import com.hpcloud.mon.MetricSpoutConfig; +import monasca.thresh.MetricSpoutConfig; import com.hpcloud.mon.common.model.metric.MetricEnvelope; import com.hpcloud.mon.common.model.metric.MetricEnvelopes; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; import backtype.storm.spout.SpoutOutputCollector; import backtype.storm.topology.OutputFieldsDeclarer; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/ProducerModule.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/ProducerModule.java similarity index 96% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/ProducerModule.java rename to thresh/src/main/java/monasca/thresh/infrastructure/thresholding/ProducerModule.java index 721d317..3e85087 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/ProducerModule.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/ProducerModule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; import com.hpcloud.configuration.KafkaProducerConfiguration; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/PropertyFinder.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/PropertyFinder.java similarity index 96% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/PropertyFinder.java rename to thresh/src/main/java/monasca/thresh/infrastructure/thresholding/PropertyFinder.java index 25ce2a7..be82f96 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/PropertyFinder.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/PropertyFinder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/deserializer/EventDeserializer.java b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializer.java similarity index 96% rename from thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/deserializer/EventDeserializer.java rename to thresh/src/main/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializer.java index b0abd55..be4ffd6 100644 --- a/thresh/src/main/java/com/hpcloud/mon/infrastructure/thresholding/deserializer/EventDeserializer.java +++ b/thresh/src/main/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding.deserializer; +package monasca.thresh.infrastructure.thresholding.deserializer; import com.hpcloud.mon.common.event.AlarmCreatedEvent; import com.hpcloud.mon.common.event.AlarmDeletedEvent; diff --git a/thresh/src/main/resources/logback.xml b/thresh/src/main/resources/logback.xml index 0279392..8f36d50 100644 --- a/thresh/src/main/resources/logback.xml +++ b/thresh/src/main/resources/logback.xml @@ -17,10 +17,10 @@ - + - \ No newline at end of file + diff --git a/thresh/src/test/java/com/hpcloud/mon/Assert.java b/thresh/src/test/java/monasca/thresh/Assert.java similarity index 98% rename from thresh/src/test/java/com/hpcloud/mon/Assert.java rename to thresh/src/test/java/monasca/thresh/Assert.java index f851ad6..0581a69 100644 --- a/thresh/src/test/java/com/hpcloud/mon/Assert.java +++ b/thresh/src/test/java/monasca/thresh/Assert.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon; +package monasca.thresh; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; diff --git a/thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineAlarmTest.java b/thresh/src/test/java/monasca/thresh/ThresholdingEngineAlarmTest.java similarity index 94% rename from thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineAlarmTest.java rename to thresh/src/test/java/monasca/thresh/ThresholdingEngineAlarmTest.java index cac1b76..77700af 100644 --- a/thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineAlarmTest.java +++ b/thresh/src/test/java/monasca/thresh/ThresholdingEngineAlarmTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon; +package monasca.thresh; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; @@ -33,18 +33,18 @@ 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.domain.model.Alarm; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId; -import com.hpcloud.mon.domain.model.SubAlarm; -import com.hpcloud.mon.domain.service.AlarmDAO; -import com.hpcloud.mon.domain.service.MetricDefinitionDAO; -import com.hpcloud.mon.domain.service.SubAlarmDAO; -import com.hpcloud.mon.domain.service.SubAlarmMetricDefinition; -import com.hpcloud.mon.infrastructure.thresholding.AlarmEventForwarder; -import com.hpcloud.mon.infrastructure.thresholding.EventProcessingBoltTest; -import com.hpcloud.mon.infrastructure.thresholding.MetricAggregationBolt; -import com.hpcloud.mon.infrastructure.thresholding.MetricSpout; -import com.hpcloud.mon.infrastructure.thresholding.ProducerModule; +import monasca.thresh.domain.model.Alarm; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.model.SubAlarm; +import monasca.thresh.domain.service.AlarmDAO; +import monasca.thresh.domain.service.MetricDefinitionDAO; +import monasca.thresh.domain.service.SubAlarmDAO; +import monasca.thresh.domain.service.SubAlarmMetricDefinition; +import monasca.thresh.infrastructure.thresholding.AlarmEventForwarder; +import monasca.thresh.infrastructure.thresholding.EventProcessingBoltTest; +import monasca.thresh.infrastructure.thresholding.MetricAggregationBolt; +import monasca.thresh.infrastructure.thresholding.MetricSpout; +import monasca.thresh.infrastructure.thresholding.ProducerModule; import com.hpcloud.streaming.storm.TopologyTestCase; import com.hpcloud.util.Injector; import com.hpcloud.util.Serialization; diff --git a/thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineRunner.java b/thresh/src/test/java/monasca/thresh/ThresholdingEngineRunner.java similarity index 92% rename from thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineRunner.java rename to thresh/src/test/java/monasca/thresh/ThresholdingEngineRunner.java index 0de49bc..e6a29ee 100644 --- a/thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineRunner.java +++ b/thresh/src/test/java/monasca/thresh/ThresholdingEngineRunner.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.hpcloud.mon; +package monasca.thresh; -import com.hpcloud.mon.ThresholdingEngine; +import monasca.thresh.ThresholdingEngine; public class ThresholdingEngineRunner { public static void main(String... args) throws Exception { diff --git a/thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineTest.java b/thresh/src/test/java/monasca/thresh/ThresholdingEngineTest.java similarity index 94% rename from thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineTest.java rename to thresh/src/test/java/monasca/thresh/ThresholdingEngineTest.java index 5254d59..4abad9c 100644 --- a/thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineTest.java +++ b/thresh/src/test/java/monasca/thresh/ThresholdingEngineTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon; +package monasca.thresh; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; @@ -31,16 +31,16 @@ import com.hpcloud.mon.common.model.alarm.AlarmExpression; import com.hpcloud.mon.common.model.alarm.AlarmState; import com.hpcloud.mon.common.model.metric.Metric; import com.hpcloud.mon.common.model.metric.MetricDefinition; -import com.hpcloud.mon.domain.model.Alarm; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId; -import com.hpcloud.mon.domain.model.SubAlarm; -import com.hpcloud.mon.domain.service.AlarmDAO; -import com.hpcloud.mon.domain.service.MetricDefinitionDAO; -import com.hpcloud.mon.domain.service.SubAlarmDAO; -import com.hpcloud.mon.domain.service.SubAlarmMetricDefinition; -import com.hpcloud.mon.infrastructure.thresholding.AlarmEventForwarder; -import com.hpcloud.mon.infrastructure.thresholding.MetricSpout; -import com.hpcloud.mon.infrastructure.thresholding.ProducerModule; +import monasca.thresh.domain.model.Alarm; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.model.SubAlarm; +import monasca.thresh.domain.service.AlarmDAO; +import monasca.thresh.domain.service.MetricDefinitionDAO; +import monasca.thresh.domain.service.SubAlarmDAO; +import monasca.thresh.domain.service.SubAlarmMetricDefinition; +import monasca.thresh.infrastructure.thresholding.AlarmEventForwarder; +import monasca.thresh.infrastructure.thresholding.MetricSpout; +import monasca.thresh.infrastructure.thresholding.ProducerModule; import com.hpcloud.streaming.storm.TopologyTestCase; import com.hpcloud.util.Injector; import com.hpcloud.util.Serialization; diff --git a/thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineTest1.java b/thresh/src/test/java/monasca/thresh/ThresholdingEngineTest1.java similarity index 92% rename from thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineTest1.java rename to thresh/src/test/java/monasca/thresh/ThresholdingEngineTest1.java index bf6b8b4..9326e42 100644 --- a/thresh/src/test/java/com/hpcloud/mon/ThresholdingEngineTest1.java +++ b/thresh/src/test/java/monasca/thresh/ThresholdingEngineTest1.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon; +package monasca.thresh; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; @@ -29,17 +29,17 @@ 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.mon.domain.model.Alarm; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId; -import com.hpcloud.mon.domain.model.SubAlarm; -import com.hpcloud.mon.domain.service.AlarmDAO; -import com.hpcloud.mon.domain.service.MetricDefinitionDAO; -import com.hpcloud.mon.domain.service.SubAlarmDAO; -import com.hpcloud.mon.domain.service.SubAlarmMetricDefinition; -import com.hpcloud.mon.infrastructure.thresholding.AlarmEventForwarder; -import com.hpcloud.mon.infrastructure.thresholding.MetricAggregationBolt; -import com.hpcloud.mon.infrastructure.thresholding.MetricSpout; -import com.hpcloud.mon.infrastructure.thresholding.ProducerModule; +import monasca.thresh.domain.model.Alarm; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.model.SubAlarm; +import monasca.thresh.domain.service.AlarmDAO; +import monasca.thresh.domain.service.MetricDefinitionDAO; +import monasca.thresh.domain.service.SubAlarmDAO; +import monasca.thresh.domain.service.SubAlarmMetricDefinition; +import monasca.thresh.infrastructure.thresholding.AlarmEventForwarder; +import monasca.thresh.infrastructure.thresholding.MetricAggregationBolt; +import monasca.thresh.infrastructure.thresholding.MetricSpout; +import monasca.thresh.infrastructure.thresholding.ProducerModule; import com.hpcloud.streaming.storm.TopologyTestCase; import com.hpcloud.util.Injector; diff --git a/thresh/src/test/java/com/hpcloud/mon/domain/model/AlarmTest.java b/thresh/src/test/java/monasca/thresh/domain/model/AlarmTest.java similarity index 99% rename from thresh/src/test/java/com/hpcloud/mon/domain/model/AlarmTest.java rename to thresh/src/test/java/monasca/thresh/domain/model/AlarmTest.java index 18170f6..f043109 100644 --- a/thresh/src/test/java/com/hpcloud/mon/domain/model/AlarmTest.java +++ b/thresh/src/test/java/monasca/thresh/domain/model/AlarmTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.domain.model; +package monasca.thresh.domain.model; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/thresh/src/test/java/com/hpcloud/mon/domain/model/MetricDefinitionAndTenantIdMatcherTest.java b/thresh/src/test/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcherTest.java similarity index 97% rename from thresh/src/test/java/com/hpcloud/mon/domain/model/MetricDefinitionAndTenantIdMatcherTest.java rename to thresh/src/test/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcherTest.java index 3c49332..3d2e761 100644 --- a/thresh/src/test/java/com/hpcloud/mon/domain/model/MetricDefinitionAndTenantIdMatcherTest.java +++ b/thresh/src/test/java/monasca/thresh/domain/model/MetricDefinitionAndTenantIdMatcherTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.hpcloud.mon.domain.model; +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 com.hpcloud.mon.domain.model.MetricDefinitionAndTenantIdMatcher.DimensionPair; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantIdMatcher.DimensionSet; +import monasca.thresh.domain.model.MetricDefinitionAndTenantIdMatcher.DimensionPair; +import monasca.thresh.domain.model.MetricDefinitionAndTenantIdMatcher.DimensionSet; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/thresh/src/test/java/com/hpcloud/mon/domain/model/SubAlarmStatsTest.java b/thresh/src/test/java/monasca/thresh/domain/model/SubAlarmStatsTest.java similarity index 99% rename from thresh/src/test/java/com/hpcloud/mon/domain/model/SubAlarmStatsTest.java rename to thresh/src/test/java/monasca/thresh/domain/model/SubAlarmStatsTest.java index 9188af0..cc76313 100644 --- a/thresh/src/test/java/com/hpcloud/mon/domain/model/SubAlarmStatsTest.java +++ b/thresh/src/test/java/monasca/thresh/domain/model/SubAlarmStatsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.domain.model; +package monasca.thresh.domain.model; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/thresh/src/test/java/com/hpcloud/mon/infrastructure/persistence/AlarmDAOImplTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/persistence/AlarmDAOImplTest.java similarity index 95% rename from thresh/src/test/java/com/hpcloud/mon/infrastructure/persistence/AlarmDAOImplTest.java rename to thresh/src/test/java/monasca/thresh/infrastructure/persistence/AlarmDAOImplTest.java index 6907db7..a210d81 100644 --- a/thresh/src/test/java/com/hpcloud/mon/infrastructure/persistence/AlarmDAOImplTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/persistence/AlarmDAOImplTest.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.persistence; +package monasca.thresh.infrastructure.persistence; import static org.testng.Assert.assertEquals; 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.model.Alarm; -import com.hpcloud.mon.domain.model.SubAlarm; -import com.hpcloud.mon.domain.service.AlarmDAO; +import monasca.thresh.domain.model.Alarm; +import monasca.thresh.domain.model.SubAlarm; +import monasca.thresh.domain.service.AlarmDAO; import com.google.common.io.Resources; diff --git a/thresh/src/test/java/com/hpcloud/mon/infrastructure/persistence/MetricDefinitionDAOImplTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/persistence/MetricDefinitionDAOImplTest.java similarity index 95% rename from thresh/src/test/java/com/hpcloud/mon/infrastructure/persistence/MetricDefinitionDAOImplTest.java rename to thresh/src/test/java/monasca/thresh/infrastructure/persistence/MetricDefinitionDAOImplTest.java index 4d18a67..5c82c25 100644 --- a/thresh/src/test/java/com/hpcloud/mon/infrastructure/persistence/MetricDefinitionDAOImplTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/persistence/MetricDefinitionDAOImplTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.persistence; +package monasca.thresh.infrastructure.persistence; import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertFalse; @@ -32,9 +32,9 @@ import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; import com.hpcloud.mon.common.model.metric.MetricDefinition; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId; -import com.hpcloud.mon.domain.service.MetricDefinitionDAO; -import com.hpcloud.mon.domain.service.SubAlarmMetricDefinition; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.service.MetricDefinitionDAO; +import monasca.thresh.domain.service.SubAlarmMetricDefinition; /** * Note: MySQL dependent test because of the group_concat() used in the SQL in diff --git a/thresh/src/test/java/com/hpcloud/mon/infrastructure/persistence/SubAlarmDAOImplTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/persistence/SubAlarmDAOImplTest.java similarity index 97% rename from thresh/src/test/java/com/hpcloud/mon/infrastructure/persistence/SubAlarmDAOImplTest.java rename to thresh/src/test/java/monasca/thresh/infrastructure/persistence/SubAlarmDAOImplTest.java index 689dd7b..0c96fe9 100644 --- a/thresh/src/test/java/com/hpcloud/mon/infrastructure/persistence/SubAlarmDAOImplTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/persistence/SubAlarmDAOImplTest.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.persistence; +package monasca.thresh.infrastructure.persistence; import static org.testng.Assert.assertEquals; 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.mon.domain.model.MetricDefinitionAndTenantId; -import com.hpcloud.mon.domain.model.SubAlarm; -import com.hpcloud.mon.domain.service.SubAlarmDAO; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.model.SubAlarm; +import monasca.thresh.domain.service.SubAlarmDAO; import com.google.common.io.Resources; diff --git a/thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/AlarmThresholdingBoltTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBoltTest.java similarity index 97% rename from thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/AlarmThresholdingBoltTest.java rename to thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBoltTest.java index ce671c1..61aff3f 100644 --- a/thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/AlarmThresholdingBoltTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/AlarmThresholdingBoltTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -23,14 +23,14 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.hpcloud.mon.ThresholdingConfiguration; +import monasca.thresh.ThresholdingConfiguration; 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.domain.model.Alarm; -import com.hpcloud.mon.domain.model.SubAlarm; -import com.hpcloud.mon.domain.service.AlarmDAO; +import monasca.thresh.domain.model.Alarm; +import monasca.thresh.domain.model.SubAlarm; +import monasca.thresh.domain.service.AlarmDAO; import com.hpcloud.streaming.storm.Streams; import backtype.storm.Testing; diff --git a/thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/EventProcessingBoltTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/EventProcessingBoltTest.java similarity index 98% rename from thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/EventProcessingBoltTest.java rename to thresh/src/test/java/monasca/thresh/infrastructure/thresholding/EventProcessingBoltTest.java index e00d31f..abefa72 100644 --- a/thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/EventProcessingBoltTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/EventProcessingBoltTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; @@ -28,9 +28,9 @@ 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.mon.domain.model.Alarm; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId; -import com.hpcloud.mon.domain.model.SubAlarm; +import monasca.thresh.domain.model.Alarm; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.model.SubAlarm; import com.hpcloud.streaming.storm.Streams; import backtype.storm.Testing; diff --git a/thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/MetricAggregationBoltTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBoltTest.java similarity index 98% rename from thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/MetricAggregationBoltTest.java rename to thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBoltTest.java index db586bc..1971939 100644 --- a/thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/MetricAggregationBoltTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricAggregationBoltTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; @@ -35,11 +35,11 @@ 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.mon.domain.model.MetricDefinitionAndTenantId; -import com.hpcloud.mon.domain.model.SubAlarm; -import com.hpcloud.mon.domain.model.SubAlarmStats; -import com.hpcloud.mon.domain.service.SubAlarmDAO; -import com.hpcloud.mon.domain.service.SubAlarmStatsRepository; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.model.SubAlarm; +import monasca.thresh.domain.model.SubAlarmStats; +import monasca.thresh.domain.service.SubAlarmDAO; +import monasca.thresh.domain.service.SubAlarmStatsRepository; import com.hpcloud.streaming.storm.Streams; import backtype.storm.Constants; diff --git a/thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/MetricFilteringBoltTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBoltTest.java similarity index 98% rename from thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/MetricFilteringBoltTest.java rename to thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBoltTest.java index 80b9bb9..c2a8550 100644 --- a/thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/MetricFilteringBoltTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/MetricFilteringBoltTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -28,10 +28,10 @@ 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.mon.common.model.metric.MetricDefinition; -import com.hpcloud.mon.domain.model.MetricDefinitionAndTenantId; -import com.hpcloud.mon.domain.model.SubAlarm; -import com.hpcloud.mon.domain.service.MetricDefinitionDAO; -import com.hpcloud.mon.domain.service.SubAlarmMetricDefinition; +import monasca.thresh.domain.model.MetricDefinitionAndTenantId; +import monasca.thresh.domain.model.SubAlarm; +import monasca.thresh.domain.service.MetricDefinitionDAO; +import monasca.thresh.domain.service.SubAlarmMetricDefinition; import com.hpcloud.streaming.storm.Streams; import backtype.storm.Testing; diff --git a/thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/PropertyFinderTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/PropertyFinderTest.java similarity index 93% rename from thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/PropertyFinderTest.java rename to thresh/src/test/java/monasca/thresh/infrastructure/thresholding/PropertyFinderTest.java index 406ab62..69b65d0 100644 --- a/thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/PropertyFinderTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/PropertyFinderTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding; +package monasca.thresh.infrastructure.thresholding; import static org.testng.Assert.assertEquals; @@ -25,7 +25,7 @@ import org.testng.annotations.Test; @Test public class PropertyFinderTest { - private static String PROPERTY_NAME = "com.hpcloud.mon.infrastructure.thresholding.Prop"; + private static String PROPERTY_NAME = "monasca.thresh.infrastructure.thresholding.Prop"; @BeforeMethod public void beforeMethod() { diff --git a/thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/deserializer/EventDeserializerTest.java b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializerTest.java similarity index 97% rename from thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/deserializer/EventDeserializerTest.java rename to thresh/src/test/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializerTest.java index e397c19..7466265 100644 --- a/thresh/src/test/java/com/hpcloud/mon/infrastructure/thresholding/deserializer/EventDeserializerTest.java +++ b/thresh/src/test/java/monasca/thresh/infrastructure/thresholding/deserializer/EventDeserializerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.hpcloud.mon.infrastructure.thresholding.deserializer; +package monasca.thresh.infrastructure.thresholding.deserializer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/thresh/src/test/resources/logback.xml b/thresh/src/test/resources/logback.xml index 274588a..86e386a 100644 --- a/thresh/src/test/resources/logback.xml +++ b/thresh/src/test/resources/logback.xml @@ -17,7 +17,7 @@ - + diff --git a/thresh/src/test/resources/com/hpcloud/mon/infrastructure/persistence/alarm.sql b/thresh/src/test/resources/monasca/thresh/infrastructure/persistence/alarm.sql similarity index 100% rename from thresh/src/test/resources/com/hpcloud/mon/infrastructure/persistence/alarm.sql rename to thresh/src/test/resources/monasca/thresh/infrastructure/persistence/alarm.sql