Refactor logger dependencies on java API

hawkular · Sep 28, 2015 · 5397141 · 5397141
1 parent 38c2090
commit 5397141
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 80 deletions.
diff --git a/hawkular-alerts-api/pom.xml b/hawkular-alerts-api/pom.xml
@@ -34,24 +34,6 @@
   <dependencies>
 
     <!-- Wildfly dependencies -->
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging-processor</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jackson2-provider</artifactId>

diff --git a/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/log/MsgLogger.java b/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/log/MsgLogger.java
diff --git a/...erts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityCondition.java b/...erts-api/src/main/java/org/hawkular/alerts/api/model/condition/AvailabilityCondition.java
@@ -18,7 +18,6 @@
 
 import static org.hawkular.alerts.api.model.trigger.Mode.FIRING;
 
-import org.hawkular.alerts.api.log.MsgLogger;
 import org.hawkular.alerts.api.model.data.AvailabilityType;
 import org.hawkular.alerts.api.model.trigger.Mode;
 
@@ -32,7 +31,6 @@
  * @author Lucas Ponce
  */
 public class AvailabilityCondition extends Condition {
-    private static final MsgLogger msgLog = MsgLogger.LOGGER;
 
     public enum Operator {
         DOWN, NOT_UP, UP
@@ -102,8 +100,7 @@ public boolean match(AvailabilityType value) {
             case NOT_UP:
                 return value != AvailabilityType.UP;
             default:
-                msgLog.warnUnknowOperatorOnCondition(operator.name(), this.getClass().getName());
-                return false;
+                throw new IllegalStateException("Unknown operator: " + operator.name());
         }
     }
 

diff --git a/...ar-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java b/...ar-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/CompareCondition.java
@@ -18,7 +18,6 @@
 
 import static org.hawkular.alerts.api.model.trigger.Mode.FIRING;
 
-import org.hawkular.alerts.api.log.MsgLogger;
 import org.hawkular.alerts.api.model.trigger.Mode;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -32,7 +31,6 @@
  * @author Lucas Ponce
  */
 public class CompareCondition extends Condition {
-    private static final MsgLogger msgLog = MsgLogger.LOGGER;
 
     public enum Operator {
         LT, GT, LTE, GTE
@@ -132,8 +130,7 @@ public boolean match(double dataValue, double data2Value) {
             case GTE:
                 return dataValue >= threshold;
             default:
-                msgLog.warnUnknowOperatorOnCondition(operator.name(), this.getClass().getName());
-                return false;
+                throw new IllegalStateException("Unknown operator: " + operator.name());
         }
     }
 

diff --git a/...lar-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringCondition.java b/...lar-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/StringCondition.java
@@ -16,7 +16,6 @@
  */
 package org.hawkular.alerts.api.model.condition;
 
-import org.hawkular.alerts.api.log.MsgLogger;
 import org.hawkular.alerts.api.model.trigger.Mode;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -29,7 +28,6 @@
  * @author Lucas Ponce
  */
 public class StringCondition extends Condition {
-    private static final MsgLogger msgLog = MsgLogger.LOGGER;
 
     public enum Operator {
         EQUAL, NOT_EQUAL, STARTS_WITH, ENDS_WITH, CONTAINS, MATCH
@@ -136,8 +134,7 @@ public boolean match(String value) {
             case MATCH:
                 return value.matches(ignoreCase ? ("(?i)" + pattern) : pattern);
             default:
-                msgLog.warnUnknowOperatorOnCondition(operator.name(), this.getClass().getName());
-                return false;
+                throw new IllegalStateException("Unknown operator: " + operator.name());
         }
     }
 

diff --git a/...-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdCondition.java b/...-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdCondition.java
@@ -16,7 +16,6 @@
  */
 package org.hawkular.alerts.api.model.condition;
 
-import org.hawkular.alerts.api.log.MsgLogger;
 import org.hawkular.alerts.api.model.trigger.Mode;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -29,7 +28,6 @@
  * @author Lucas Ponce
  */
 public class ThresholdCondition extends Condition {
-    private static final MsgLogger msgLog = MsgLogger.LOGGER;
 
     public enum Operator {
         LT, GT, LTE, GTE
@@ -116,8 +114,7 @@ public boolean match(double value) {
             case GTE:
                 return value >= threshold;
             default:
-                msgLog.warnUnknowOperatorOnCondition(operator.name(), this.getClass().getName());
-                return false;
+                throw new IllegalStateException("Unknown operator: " + operator.name());
         }
     }
 

diff --git a/...ts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeCondition.java b/...ts-api/src/main/java/org/hawkular/alerts/api/model/condition/ThresholdRangeCondition.java
@@ -16,7 +16,6 @@
  */
 package org.hawkular.alerts.api.model.condition;
 
-import org.hawkular.alerts.api.log.MsgLogger;
 import org.hawkular.alerts.api.model.trigger.Mode;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -28,7 +27,6 @@
  * @author Lucas Ponce
  */
 public class ThresholdRangeCondition extends Condition {
-    private static final MsgLogger msgLog = MsgLogger.LOGGER;
 
     public enum Operator {
         INCLUSIVE("[", "]"), EXCLUSIVE("(", ")");
@@ -175,8 +173,7 @@ public boolean match(double value) {
                 aboveLow = value > thresholdLow;
                 break;
             default:
-                msgLog.warnUnknowOperatorOnCondition(operatorLow.name(), this.getClass().getName());
-                return false;
+                throw new IllegalStateException("Unknown operatorLow: " + operatorLow.name());
         }
 
         if (!aboveLow) {
@@ -191,8 +188,7 @@ public boolean match(double value) {
                 belowHigh = value < thresholdHigh;
                 break;
             default:
-                msgLog.warnUnknowOperatorOnCondition(operatorHigh.name(), this.getClass().getName());
-                return false;
+                throw new IllegalStateException("Unknown operatorHigh: " + operatorLow.name());
         }
 
         return (belowHigh == inRange);