openstack
/
monasca-api
Code Issues Proposed changes

Fix alarm definition ok action validation 

We are checking multiple times that each notification id exists
when you give multiple ok actions

Change-Id: I48f5933dc14a4e30da51d8d1ad44d23038a529d5
This commit is contained in:
Michael James Hoppal 2016-05-31 09:24:56 -06:00
parent 0602f6848a
commit fcb85d19b3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
java/src/main/java/monasca/api/app/validation/AlarmValidation.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014 Hewlett-Packard Development Company, L.P.
* (C) Copyright 2014-2016 Hewlett Packard Enterprise Development Company LP
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
@ -55,16 +55,16 @@ public final class AlarmValidation {
.unprocessableEntity("Alarm definition cannot have Duplicate alarm notification methods");
}
}
if (okActions != null)
for (String action : okActions) {
if (okActions != null) {
for (String action : okActions)
if (action.length() > 50)
throw Exceptions
.unprocessableEntity("Ok action %s must be 50 characters or less", action);
if (checkForDuplicateNotificationMethodsInAlarmDef(okActions)) {
throw Exceptions
.unprocessableEntity("Alarm definition cannot have Duplicate OK notification methods");
}
if (checkForDuplicateNotificationMethodsInAlarmDef(okActions)) {
throw Exceptions
.unprocessableEntity("Alarm definition cannot have Duplicate OK notification methods");
}
}
if (undeterminedActions != null) {
for (String action : undeterminedActions)
if (action.length() > 50)