openstack
/
monasca-api
Code Issues Proposed changes

Fix issue with state_updated_time 

Fix problem where results were not being returned based on state_update_time.
Remove the code that strips the 'Z' off the end of the date.

Change-Id: I3699369a5d99839c491a0a7519847c89c121c9df
This commit is contained in:
Deklan Dieterly 2015-09-09 13:58:02 -06:00
parent 775b63a326
commit 1cb32a96c2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java/src/main/java/monasca/api/infrastructure/persistence/mysql/AlarmMySqlRepoImpl.java
View File

@ -212,7 +212,7 @@ public class AlarmMySqlRepoImpl implements AlarmRepo {
}
if (stateUpdatedStart != null) {
q.bind("stateUpdatedStart", stateUpdatedStart.toString().replace('Z', ' '));
q.bind("stateUpdatedStart", stateUpdatedStart.toString());
}
if (offset != null) {
@ -227,9 +227,8 @@ public class AlarmMySqlRepoImpl implements AlarmRepo {
final List<Map<String, Object>> rows = q.list();
final List<Alarm> alarms = createAlarms(tenantId, rows);
return createAlarms(tenantId, rows);
return alarms;
}
}
@ -256,7 +255,7 @@ public class AlarmMySqlRepoImpl implements AlarmRepo {
}
private List<Alarm> createAlarms(String tenantId, List<Map<String, Object>> rows) {
Alarm alarm = null;
Alarm alarm;
String previousAlarmId = null;
final List<Alarm> alarms = new LinkedList<>();
List<MetricDefinition> alarmedMetrics = null;
@ -362,7 +361,7 @@ public class AlarmMySqlRepoImpl implements AlarmRepo {
final List<SubAlarm> result = h
.createQuery("select * from sub_alarm where alarm_id = :alarmId")
.bind("alarmId", alarmId)
.map(new BeanMapper<SubAlarm>(SubAlarm.class)).list();
.map(new BeanMapper<>(SubAlarm.class)).list();
final Map<String, AlarmSubExpression> subAlarms = new HashMap<>(result.size());
for (SubAlarm row : result) {