Fix json visibility only for definition

hawkular · Mar 13, 2015 · a5ef67b · a5ef67b
1 parent c70d11f
commit a5ef67b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java b/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/Trigger.java
@@ -42,7 +42,7 @@ public enum Mode {
     @JsonInclude
     private boolean safetyEnabled;
 
-    @JsonInclude
+    @JsonIgnore
     private Mode mode;
 
     @JsonIgnore
@@ -89,6 +89,7 @@ public void setId(String id) {
         this.id = id;
     }
 
+    @JsonIgnore
     public Mode getMode() {
         return mode;
     }
@@ -153,7 +154,14 @@ public boolean equals(Object obj) {
 
     @Override
     public String toString() {
-        return "Trigger [id=" + id + ", enabled=" + enabled + ", mode=" + mode + ", match=" + getMatch() + "]";
+        return "Trigger [id=" + id + ", " +
+                "name=" + getName() + ", " +
+                "description=" + getDescription() + ", " +
+                "firingMatch=" + getFiringMatch() + ", " +
+                "safetyMatch=" + getSafetyMatch() + ", " +
+                "enabled=" + enabled + ", " +
+                "mode=" + mode + ", " +
+                "match=" + getMatch() + "]";
     }
 
 }
diff --git a/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java b/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/TriggerTemplate.java
@@ -19,7 +19,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 
@@ -78,7 +77,6 @@ public void setDescription(String description) {
         this.description = description;
     }
 
-    @JsonIgnore
     public Match getFiringMatch() {
         return firingMatch;
     }
@@ -87,7 +85,6 @@ public void setFiringMatch(Match firingMatch) {
         this.firingMatch = firingMatch;
     }
 
-    @JsonIgnore
     public Match getSafetyMatch() {
         return safetyMatch;
     }
@@ -127,8 +124,10 @@ public void removeAction(String actionId) {
 
     @Override
     public String toString() {
-        return "TriggerTemplate [name=" + name + ", description=" + description + ", firingMatch=" + firingMatch
-                + ", safetyMatch=" + safetyMatch + "]";
+        return "TriggerTemplate [name=" + name + ", " +
+                "description=" + description + ", " +
+                "firingMatch=" + firingMatch + ", " +
+                "safetyMatch=" + safetyMatch + "]";
     }
 
 }
diff --git a/hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java b/hawkular-alerts-api/src/test/java/org/hawkular/alerts/api/JsonTest.java
@@ -710,8 +710,7 @@ public void jsonTriggerTest() throws Exception {
                 "\"safetyMatch\":\"ALL\"," +
                 "\"id\":\"test\"," +
                 "\"enabled\":true," +
-                "\"safetyEnabled\":true," +
-                "\"mode\":\"FIRE\"}";
+                "\"safetyEnabled\":true}";
         Trigger trigger = objectMapper.readValue(str, Trigger.class);
 
         assert trigger.getName().equals("test-name");
@@ -722,12 +721,10 @@ public void jsonTriggerTest() throws Exception {
         assert trigger.getId().equals("test");
         assert trigger.isEnabled() == true;
         assert trigger.isSafetyEnabled() == true;
-        assert trigger.getMode().equals(Mode.FIRE);
 
         String output = objectMapper.writeValueAsString(trigger);
 
-        assert !output.contains("firingMatch");
-        assert !output.contains("safetyMatch");
+        assert !output.contains("mode");
         assert !output.contains("match");
     }