openstack
/
monasca-thresh
Code Issues Proposed changes

Remove warnings 

Remove unused methods, unused imports, unused private constants

Change-Id: Ie900b295cc5410fa9039649e868228d1d3de78ee
This commit is contained in:
Craig Bryant 2015-04-07 16:37:21 -06:00
parent 51e27bab7d
commit e3ac4b0857
4 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,6 @@ 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.SubExpression;
import monasca.thresh.domain.model.TenantIdAndMetricName;
import monasca.thresh.domain.service.AlarmDAO;
@ -151,19 +150,6 @@ public class EventProcessingBolt extends BaseRichBolt {
collector.emit(ALARM_DEFINITION_EVENT_STREAM_ID, new Values(DELETED, event));
}
private void sendUpdateSubAlarm(String alarmId, String subAlarmId, String tenantId,
SubExpression subExpression) {
sendSubAlarm(UPDATED, alarmId, subAlarmId, tenantId, subExpression);
}
private void sendSubAlarm(String eventType, String alarmId, String subAlarmId, String tenantId,
SubExpression subExpression) {
MetricDefinition metricDef = subExpression.getAlarmSubExpression().getMetricDefinition();
collector.emit(METRIC_SUB_ALARM_EVENT_STREAM_ID, new Values(eventType,
new MetricDefinitionAndTenantId(metricDef, tenantId), new SubAlarm(subAlarmId, alarmId,
subExpression)));
}
void handle(AlarmDeletedEvent event) {
logger.debug("Alarm {} deleted", event.alarmId);
processSubAlarms(DELETED, event.tenantId, event.alarmDefinitionId, event.alarmMetrics,

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

@ -33,7 +33,6 @@ import monasca.common.model.metric.MetricDefinition;
import org.testng.annotations.Test;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@ -42,8 +41,6 @@ import java.util.UUID;
@Test
public class AlarmTest {
private static final String TEST_ALARM_ID = "1";
public void shouldBeUndeterminedIfAnySubAlarmIsUndetermined() {
AlarmExpression expr =
new AlarmExpression(

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

@ -64,7 +64,6 @@ public class AlarmThresholdingBoltTest {
private AlarmDefinition alarmDefinition;
private Alarm alarm;
private List<SubAlarm> subAlarms;
private String subAlarmJson;
private AlarmEventForwarder alarmEventForwarder;
private AlarmDAO alarmDAO;
private AlarmDefinitionDAO alarmDefinitionDAO;

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

@ -360,21 +360,6 @@ public class EventProcessingBoltTest {
}
}
private void verifyAddedSubAlarm(final SubAlarm subAlarm) {
sendSubAlarm(subAlarm, EventProcessingBolt.CREATED);
}
private void verifyUpdatedSubAlarm(final SubAlarm subAlarm) {
sendSubAlarm(subAlarm, EventProcessingBolt.UPDATED);
}
private void sendSubAlarm(final SubAlarm subAlarm, String eventType) {
verify(collector, times(1)).emit(
EventProcessingBolt.METRIC_SUB_ALARM_EVENT_STREAM_ID,
new Values(eventType, new MetricDefinitionAndTenantId(subAlarm.getExpression()
.getMetricDefinition(), TENANT_ID), subAlarm));
}
private static Map<String, AlarmSubExpression> createAlarmSubExpressionMap(Alarm alarm) {
final Map<String, AlarmSubExpression> oldAlarmSubExpressions = new HashMap<>();
for (final SubAlarm subAlarm : alarm.getSubAlarms()) {