Fix some potential NPE's in debug logging.

hawkular · Feb 23, 2015 · 104e158 · 104e158
1 parent 88b7143
commit 104e158
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 56 deletions.
diff --git a/...lar-alerts-rest/src/main/java/org/hawkular/alerts/rest/AvailabilityConditionsHandler.java b/...lar-alerts-rest/src/main/java/org/hawkular/alerts/rest/AvailabilityConditionsHandler.java
@@ -16,13 +16,13 @@
  */
 package org.hawkular.alerts.rest;
 
-import com.wordnik.swagger.annotations.Api;
-import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiParam;
-import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
-import org.hawkular.alerts.api.model.condition.Condition;
-import org.hawkular.alerts.api.services.DefinitionsService;
-import org.jboss.logging.Logger;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.ejb.EJB;
 import javax.ws.rs.Consumes;
@@ -37,13 +37,15 @@
 import javax.ws.rs.container.Suspended;
 import javax.ws.rs.core.Response;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
 
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
+import org.hawkular.alerts.api.model.condition.Condition;
+import org.hawkular.alerts.api.services.DefinitionsService;
+
+import org.jboss.logging.Logger;
 
 /**
  * REST endpoint for availability conditions.
@@ -186,7 +188,7 @@ public void getAvailabilityCondition(@Suspended final AsyncResponse response,
                     found = (AvailabilityCondition) c;
                 } else {
                     log.debugf("GET - getAvailabilityCondition - conditionId: %s found " +
-                            "but not instance of AvailabilityCondition class", found.getConditionId());
+                            "but not instance of AvailabilityCondition class", c.getConditionId());
                 }
             }
             if (found != null) {

diff --git a/hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/CompareConditionsHandler.java b/hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/CompareConditionsHandler.java
@@ -16,13 +16,13 @@
  */
 package org.hawkular.alerts.rest;
 
-import com.wordnik.swagger.annotations.Api;
-import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiParam;
-import org.hawkular.alerts.api.model.condition.CompareCondition;
-import org.hawkular.alerts.api.model.condition.Condition;
-import org.hawkular.alerts.api.services.DefinitionsService;
-import org.jboss.logging.Logger;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.ejb.EJB;
 import javax.ws.rs.Consumes;
@@ -36,13 +36,16 @@
 import javax.ws.rs.container.AsyncResponse;
 import javax.ws.rs.container.Suspended;
 import javax.ws.rs.core.Response;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+
+import org.hawkular.alerts.api.model.condition.CompareCondition;
+import org.hawkular.alerts.api.model.condition.Condition;
+import org.hawkular.alerts.api.services.DefinitionsService;
+
+import org.jboss.logging.Logger;
 
 /**
  * REST endpoint for compare conditions.
@@ -181,7 +184,7 @@ public void getCompareCondition(@Suspended final AsyncResponse response,
                     found = (CompareCondition) c;
                 } else {
                     log.debugf("GET - getCompareCondition - conditionId: %s found" +
-                            "but not instance of CompareCondition class", found.getConditionId());
+                            "but not instance of CompareCondition class", c.getConditionId());
                 }
             }
             if (found != null) {

diff --git a/hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/StringConditionsHandler.java b/hawkular-alerts-rest/src/main/java/org/hawkular/alerts/rest/StringConditionsHandler.java
@@ -16,13 +16,13 @@
  */
 package org.hawkular.alerts.rest;
 
-import com.wordnik.swagger.annotations.Api;
-import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiParam;
-import org.hawkular.alerts.api.model.condition.Condition;
-import org.hawkular.alerts.api.model.condition.StringCondition;
-import org.hawkular.alerts.api.services.DefinitionsService;
-import org.jboss.logging.Logger;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.ejb.EJB;
 import javax.ws.rs.Consumes;
@@ -36,13 +36,16 @@
 import javax.ws.rs.container.AsyncResponse;
 import javax.ws.rs.container.Suspended;
 import javax.ws.rs.core.Response;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+
+import org.hawkular.alerts.api.model.condition.Condition;
+import org.hawkular.alerts.api.model.condition.StringCondition;
+import org.hawkular.alerts.api.services.DefinitionsService;
+
+import org.jboss.logging.Logger;
 
 /**
  * REST endpoint for string conditions.
@@ -181,7 +184,7 @@ public void getStringCondition(@Suspended final AsyncResponse response,
                     found = (StringCondition) c;
                 } else {
                     log.debugf("GET - getStringCondition - conditionId: %s found" +
-                            "but not instance of StringCondition class", found.getConditionId());
+                            "but not instance of StringCondition class", c.getConditionId());
                 }
             }
             if (found != null) {

diff --git a/...r-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdRangeConditionsHandler.java b/...r-alerts-rest/src/main/java/org/hawkular/alerts/rest/ThresholdRangeConditionsHandler.java
@@ -16,13 +16,13 @@
  */
 package org.hawkular.alerts.rest;
 
-import com.wordnik.swagger.annotations.Api;
-import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiParam;
-import org.hawkular.alerts.api.model.condition.Condition;
-import org.hawkular.alerts.api.model.condition.ThresholdRangeCondition;
-import org.hawkular.alerts.api.services.DefinitionsService;
-import org.jboss.logging.Logger;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.ejb.EJB;
 import javax.ws.rs.Consumes;
@@ -36,13 +36,16 @@
 import javax.ws.rs.container.AsyncResponse;
 import javax.ws.rs.container.Suspended;
 import javax.ws.rs.core.Response;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
 
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+
+import org.hawkular.alerts.api.model.condition.Condition;
+import org.hawkular.alerts.api.model.condition.ThresholdRangeCondition;
+import org.hawkular.alerts.api.services.DefinitionsService;
+
+import org.jboss.logging.Logger;
 
 /**
  * REST endpoint for threshold range conditions.
@@ -182,7 +185,7 @@ public void getThresholdRangeCondition(@Suspended final AsyncResponse response,
                     found = (ThresholdRangeCondition) c;
                 } else {
                     log.debugf("GET - getThresholdRangeCondition - conditionId: %s " +
-                            "but not instance of ThresholdRangeCondition class", found.getConditionId());
+                            "but not instance of ThresholdRangeCondition class", c.getConditionId());
                 }
             }
             if (found != null) {