Fix for non updated tenantId on Definitions import

hawkular · Feb 11, 2016 · 74c88b0 · 74c88b0
1 parent 08f6d5a
commit 74c88b0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/export/Definitions.java b/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/export/Definitions.java
@@ -64,6 +64,24 @@ public void setActions(List<ActionDefinition> actions) {
         this.actions = actions;
     }
 
+    public void updateTenant(String tenantId) {
+        if (triggers != null) {
+            for (FullTrigger t : triggers) {
+                if (t.getTrigger() != null) {
+                    t.getTrigger().setTenantId(tenantId);
+                    t.check();
+                }
+            }
+        }
+        if (actions != null) {
+            for (ActionDefinition a : actions) {
+                if (a != null) {
+                    a.setTenantId(tenantId);
+                }
+            }
+        }
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

diff --git a/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/FullTrigger.java b/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/trigger/FullTrigger.java
@@ -86,6 +86,11 @@ public void setConditions(List<Condition> conditions) {
         checkConditions();
     }
 
+    public void check() {
+        checkDampenings();
+        checkConditions();
+    }
+
     private void checkDampenings() {
         if (trigger != null && !isEmpty(dampenings) && !isEmpty(trigger.getId()) && !isEmpty(trigger.getTenantId())) {
             for (Dampening d : dampenings) {

diff --git a/...erts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java b/...erts-engine/src/main/java/org/hawkular/alerts/engine/impl/CassDefinitionsServiceImpl.java
@@ -2879,6 +2879,7 @@ public Definitions importDefinitions(String tenantId, Definitions definitions, I
         if (null == strategy) {
             throw new IllegalArgumentException("ImportType startegy must be not null");
         }
+        definitions.updateTenant(tenantId);
         Definitions imported = new Definitions();
         try {
             Collection<Trigger> existingTriggers = selectTriggers(tenantId);