Merge "Remove the alarmDefinitionId field in the Alarm JSON"
This commit is contained in:
commit
c6802b8816
|
@ -78,10 +78,6 @@ public class Alarm extends AbstractEntity implements Linked {
|
||||||
this.metrics = metrics;
|
this.metrics = metrics;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* TODO - Remove this when the API no longer uses it
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public AlarmDefinitionShort getAlarmDefinition() {
|
public AlarmDefinitionShort getAlarmDefinition() {
|
||||||
return alarmDefinition;
|
return alarmDefinition;
|
||||||
}
|
}
|
||||||
|
@ -90,10 +86,6 @@ public class Alarm extends AbstractEntity implements Linked {
|
||||||
this.alarmDefinition = alarmDefinition;
|
this.alarmDefinition = alarmDefinition;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getAlarmDefinitionId() {
|
|
||||||
return this.alarmDefinition.getId();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int hashCode() {
|
public int hashCode() {
|
||||||
final int prime = 31;
|
final int prime = 31;
|
||||||
|
|
Loading…
Reference in New Issue