Missing conditionId used for REST endpoints

hawkular · Mar 17, 2015 · 2a44ad3 · 2a44ad3
1 parent 3648172
commit 2a44ad3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java b/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Condition.java
@@ -65,7 +65,7 @@ public enum Type {
     /**
      * A composed key for the condition
      */
-    @JsonIgnore
+    @JsonInclude
     protected String conditionId;
 
     public Condition() {

diff --git a/hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy b/hawkular-alerts-rest/src/test/groovy/org/hawkular/alerts/rest/DampeningTest.groovy
@@ -44,30 +44,30 @@ class DampeningTest extends AbstractTestBase {
 
         Dampening d = new Dampening("test-trigger-6", Mode.FIRE, Type.RELAXED_COUNT, 1, 1, 1);
 
-        resp = client.post(path: "triggers/test-trigger-6/dampening", body: d)
+        resp = client.post(path: "triggers/test-trigger-6/dampenings", body: d)
         assertEquals(200, resp.status)
 
-        resp = client.get(path: "triggers/test-trigger-6/dampening/" + d.getDampeningId());
+        resp = client.get(path: "triggers/test-trigger-6/dampenings/" + d.getDampeningId());
         assertEquals(200, resp.status)
         assertEquals("RELAXED_COUNT", resp.data.type)
 
         d.setType(Type.STRICT)
-        resp = client.put(path: "triggers/test-trigger-6/dampening/" + d.getDampeningId(), body: d)
+        resp = client.put(path: "triggers/test-trigger-6/dampenings/" + d.getDampeningId(), body: d)
         assertEquals(200, resp.status)
 
-        resp = client.get(path: "triggers/test-trigger-6/dampening/" + d.getDampeningId())
+        resp = client.get(path: "triggers/test-trigger-6/dampenings/" + d.getDampeningId())
         assertEquals(200, resp.status)
         assertEquals("STRICT", resp.data.type)
 
         resp = client.get(path: "triggers/test-trigger-6/dampenings")
         assertEquals(200, resp.status)
         assertEquals(1, resp.data.size())
 
-        resp = client.get(path: "triggers/test-trigger-6/dampening/mode/FIRE")
+        resp = client.get(path: "triggers/test-trigger-6/dampenings/mode/FIRE")
         assertEquals(200, resp.status)
         assertEquals("test-trigger-6", resp.data.triggerId)
 
-        resp = client.delete(path: "triggers/test-trigger-6/dampening/" + d.getDampeningId())
+        resp = client.delete(path: "triggers/test-trigger-6/dampenings/" + d.getDampeningId())
         assertEquals(200, resp.status)
     }