Rebase with master

hawkular · Jan 21, 2016 · 22dff0e · 22dff0e
1 parent 0cfb21f
commit 22dff0e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
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
@@ -513,7 +513,7 @@ public void updateTriggerEnablement(String tenantId, String triggerId, boolean e
             return;
         }
 
-        session = CassCluster.getSession();
+        Session session = CassCluster.getSession();
         PreparedStatement updateTriggerEnabled = CassStatement.get(session, CassStatement.UPDATE_TRIGGER_ENABLED);
         if (updateTriggerEnabled == null) {
             throw new RuntimeException("updateTriggerEnabled PreparedStatement is null");
@@ -525,7 +525,7 @@ public void updateTriggerEnablement(String tenantId, String triggerId, boolean e
             throw e;
         }
 
-        if (initialized && null != alertsEngine) {
+        if (alertsContext.isInitialized() && null != alertsEngine) {
             alertsEngine.reloadTrigger(tenantId, triggerId);
         }
 

diff --git a/hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassPersistenceTest.java b/hawkular-alerts-engine/src/test/java/org/hawkular/alerts/engine/CassPersistenceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Red Hat, Inc. and/or its affiliates
+ * Copyright 2015-2016 Red Hat, Inc. and/or its affiliates
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,7 +41,6 @@ public class CassPersistenceTest extends PersistenceTest {
     private static final String JBOSS_DATA_DIR = "jboss.server.data.dir";
     private static final String EXTERNAL_CASSANDRA = "external_cassandra";
 
-    static Session session;
     static boolean externalCassandra;
     static String keyspace;
 
@@ -62,14 +61,15 @@ public static void initSessionAndResetTestSchema() throws Exception {
 
         keyspace = AlertProperties.getProperty("hawkular-alerts.cassandra-keyspace", "hawkular_alerts_test");
 
-        // try an clean up if this was somehow left around by a prior run
+        Session session = CassCluster.getSession();
+
+        // try and clean up if this was somehow left around by a prior run
         try {
             session.execute("DROP KEYSPACE " + keyspace);
         } catch (Throwable t) {
             // never mind, it may not be there
         }
 
-        session = CassCluster.getSession();
         definitionsService = StandaloneAlerts.getDefinitionsService();
         alertsService = StandaloneAlerts.getAlertsService();
         actionsService = StandaloneAlerts.getActionsService();
@@ -80,6 +80,7 @@ public static void cleanTestSchema() throws Exception {
 
         // try an clean up
         try {
+            Session session = CassCluster.getSession();
             session.execute("DROP KEYSPACE " + keyspace);
             if (!externalCassandra) {
                 System.out.print("Stopping embedded Cassandra for unit testing...");

diff --git a/hawkular-alerts-engine/src/test/resources/hawkular-alerts/alerts-data.json b/hawkular-alerts-engine/src/test/resources/hawkular-alerts/alerts-data.json
@@ -211,11 +211,11 @@
       "trigger":{
         "tenantId": "28026b36-8fe4-4332-84c8-524e173a68bf",
         "id": "trigger-7",
+        "type": "GROUP",
         "enabled": true,
         "name": "Parent-NumericData-Token-low",
         "description": "description 8",
         "severity": "HIGH",
-        "group": true,
         "actions": {
           "email": ["email-to-admin"]
         }

diff --git a/hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/alerts-data.json b/hawkular-alerts-rest-tests/src/test/wildfly-data/hawkular-alerts/alerts-data.json
@@ -211,11 +211,11 @@
       "trigger":{
         "tenantId": "28026b36-8fe4-4332-84c8-524e173a68bf",
         "id": "trigger-7",
+        "type": "GROUP",
         "enabled": true,
         "name": "Parent-NumericData-Token-low",
         "description": "description 8",
         "severity": "HIGH",
-        "group": true,
         "actions": {
           "email": ["email-to-admin"]
         }