Unify helper isEmpty() in a single location (#428)

Minor itest profile renaming
hawkular · Aug 9, 2017 · b522650 · b522650
1 parent 0f4dd0b
commit b522650
Show file tree

Hide file tree

Showing 44 changed files with 193 additions and 205 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ install:
 # unshallow is needed by license-maven-plugin
 - git fetch origin --unshallow
 script:
-- ./mvnw -s .travis.maven.settings.xml verify -Pitest-ispn
+- ./mvnw -s .travis.maven.settings.xml verify -Pitest
 env:
   global:
   - secure: TQJ1pIBM6dGgCQj59OiYxmKI2Nk+0XIT9His/iBt4FGRXHQ4BqWZuMVbtiX0ngGJbyg6Ntq9mJwmioGNl3tyK3jY9eqD/pWg8XjA9YAn+UINSBS3ooPYgAwIjTuJp6o7x9xExLEKCdzyttFjQ0BG+AkNvIEVyjSTZq7ky/ngbP4=

diff --git a/.../src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginRegister.java b/.../src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginRegister.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.actions.standalone;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -69,7 +71,7 @@ public void init() {
                 Set<String> properties = actionPluginListener.getProperties();
                 Map<String, String> defaultProperties = actionPluginListener.getDefaultProperties();
                 try {
-                    if (defaultProperties != null && !defaultProperties.isEmpty() ) {
+                    if (!isEmpty(defaultProperties)) {
                         definitions.addActionPlugin(actionPlugin, defaultProperties);
                     } else {
                         definitions.addActionPlugin(actionPlugin, properties);

diff --git a/...icsearch/src/main/java/org/hawkular/alerts/actions/elasticsearch/ElasticsearchPlugin.java b/...icsearch/src/main/java/org/hawkular/alerts/actions/elasticsearch/ElasticsearchPlugin.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.actions.elasticsearch;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -366,8 +368,4 @@ private void sendResult(Action action) {
             log.error("Error sending ActionResponseMessage", e);
         }
     }
-
-    private boolean isEmpty(String s) {
-        return s == null || s.isEmpty();
-    }
 }
diff --git a/...ns-plugins/actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java b/...ns-plugins/actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.actions.email;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -311,7 +313,7 @@ protected Message createMimeMessage(ActionMessage msg) throws Exception {
         Message email = new EmailMimeMessage(mailSession);
 
         Map<String, String> props = msg.getAction().getProperties();
-        if (null == props || props.isEmpty()) {
+        if (isEmpty(props)) {
             log.warnf("Properties empty on plugin %s.", PLUGIN_NAME);
         }
         Event event = msg.getAction() != null ? msg.getAction().getEvent() : null;
@@ -349,14 +351,14 @@ protected Message createMimeMessage(ActionMessage msg) throws Exception {
 
         String to = props.get(PROP_TO + "." + statusStr);
         to = to == null ? props.get(PROP_TO) : to;
-        if (to != null && !to.isEmpty()) {
+        if (!isEmpty(to)) {
             Address toAddress = new InternetAddress(to);
             email.addRecipient(Message.RecipientType.TO, toAddress);
         }
 
         String ccs = props.get(PROP_CC + "." + statusStr);
         ccs = ccs == null ? props.get(PROP_CC) : ccs;
-        if (ccs != null && !ccs.isEmpty()) {
+        if (!isEmpty(ccs)) {
             String[] multipleCc = ccs.split(",");
             for (String cc : multipleCc) {
                 Address toAddress = new InternetAddress(cc);
@@ -367,7 +369,7 @@ protected Message createMimeMessage(ActionMessage msg) throws Exception {
         Map<String, String> emailProcessed = emailTemplate.processTemplate(msg);
 
         String subject = emailProcessed.get("emailSubject");
-        if (null != subject && !subject.isEmpty()) {
+        if (!isEmpty(subject)) {
             email.setSubject(subject);
         } else {
             log.debugf("Subject not found processing email on message: %s", msg);
@@ -389,8 +391,4 @@ protected Message createMimeMessage(ActionMessage msg) throws Exception {
         }
         return email;
     }
-
-    private boolean isEmpty(String s) {
-        return s == null || s.isEmpty();
-    }
 }
diff --git a/...-plugins/actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailTemplate.java b/...-plugins/actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailTemplate.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.actions.email;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
@@ -155,14 +157,14 @@ public Map<String, String> processTemplate(ActionMessage msg) throws Exception {
          */
         StringWriter writerPlain = new StringWriter();
         StringWriter writerHtml = new StringWriter();
-        if (plain != null && !plain.isEmpty()) {
+        if (!isEmpty(plain)) {
             StringReader plainReader = new StringReader(plain);
             ftlTemplate = new Template("plainTemplate", plainReader, ftlCfg);
             ftlTemplate.process(pmDesc, writerPlain);
         }  else {
             ftlTemplatePlain.process(pmDesc, writerPlain);
         }
-        if (html != null && !html.isEmpty()) {
+        if (!isEmpty(html)) {
             StringReader htmlReader = new StringReader(html);
             ftlTemplate = new Template("htmlTemplate", htmlReader, ftlCfg);
             ftlTemplate.process(pmDesc, writerHtml);

diff --git a/...tions-email/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java b/...tions-email/src/main/java/org/hawkular/alerts/actions/email/PluginMessageDescription.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.actions.email;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
@@ -235,8 +237,7 @@ public PluginMessageDescription(ActionMessage pm) {
         }
         if (event != null && event.getTrigger() != null) {
             trigger = event.getTrigger();
-            if (trigger.getContext() != null &&
-                    !trigger.getContext().isEmpty() &&
+            if (!isEmpty(trigger.getContext()) &&
                     trigger.getContext().containsKey(CONTEXT_PROPERTY_RESOURCE_TYPE) &&
                     trigger.getContext().containsKey(CONTEXT_PROPERTY_RESOURCE_NAME)) {
                 triggerDescription = trigger.getContext().get(CONTEXT_PROPERTY_RESOURCE_TYPE) + " " +

diff --git a/...ns-plugins/actions-kafka/src/main/java/org/hawkular/alerts/actions/kafka/KafkaPlugin.java b/...ns-plugins/actions-kafka/src/main/java/org/hawkular/alerts/actions/kafka/KafkaPlugin.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.actions.kafka;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -249,7 +251,4 @@ private void sendResult(Action action) {
         }
     }
 
-    private boolean isEmpty(String s) {
-        return s == null || s.isEmpty();
-    }
 }
diff --git a/...gins/actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/WebHookPlugin.java b/...gins/actions-webhook/src/main/java/org/hawkular/alerts/actions/webhook/WebHookPlugin.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.actions.webhook;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -164,9 +166,4 @@ private void sendResult(Action action) {
             log.error("Error sending ActionResponseMessage", e);
         }
     }
-
-    private boolean isEmpty(String s) {
-        return s == null || s.isEmpty();
-    }
-
 }
diff --git a/...-elasticsearch/src/main/java/org/hawkular/alerter/elasticsearch/ElasticsearchAlerter.java b/...-elasticsearch/src/main/java/org/hawkular/alerter/elasticsearch/ElasticsearchAlerter.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerter.elasticsearch;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -321,7 +323,7 @@ private synchronized void update() {
     }
 
     public static int getIntervalValue(String interval) {
-        if (interval == null || interval.isEmpty()) {
+        if (isEmpty(interval)) {
             interval = INTERVAL_DEFAULT;
         }
         try {

diff --git a/...rs-elasticsearch/src/main/java/org/hawkular/alerter/elasticsearch/ElasticsearchQuery.java b/...rs-elasticsearch/src/main/java/org/hawkular/alerter/elasticsearch/ElasticsearchQuery.java
@@ -20,6 +20,7 @@
 import static org.hawkular.alerter.elasticsearch.ElasticsearchAlerter.getIntervalUnit;
 import static org.hawkular.alerter.elasticsearch.ElasticsearchAlerter.getIntervalValue;
 import static org.hawkular.alerts.api.model.event.EventField.DATAID;
+import static org.hawkular.alerts.api.util.Util.isEmpty;
 
 import java.time.Instant;
 import java.time.ZoneId;
@@ -509,8 +510,4 @@ public void run() {
             log.error("Error querying Elasticsearch.", e);
         }
     }
-
-    private boolean isEmpty(String s) {
-        return s == null || s.isEmpty();
-    }
 }
diff --git a/.../alerters-plugins/alerters-kafka/src/main/java/org/hawkular/alerter/kafka/KafkaQuery.java b/.../alerters-plugins/alerters-kafka/src/main/java/org/hawkular/alerter/kafka/KafkaQuery.java
@@ -17,6 +17,7 @@
 package org.hawkular.alerter.kafka;
 
 import static org.hawkular.alerts.api.model.event.EventField.DATAID;
+import static org.hawkular.alerts.api.util.Util.isEmpty;
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
@@ -287,11 +288,4 @@ protected long parseTimestamp(String timestamp) {
         return System.currentTimeMillis();
     }
 
-    private boolean isEmpty(String s) {
-        return s == null || s.isEmpty();
-    }
-
-    private boolean isEmpty(Map m) {
-        return m == null || m.isEmpty();
-    }
 }
diff --git a/api/src/main/java/org/hawkular/alerts/api/model/action/TimeConstraint.java b/api/src/main/java/org/hawkular/alerts/api/model/action/TimeConstraint.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.api.model.action;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.io.Serializable;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -739,10 +741,6 @@ private void updateAbsolute() {
         }
     }
 
-    private boolean isEmpty(String s) {
-        return s == null || s.isEmpty();
-    }
-
     @Override
     public String toString() {
         return "TimeConstraint" + '[' +

diff --git a/api/src/main/java/org/hawkular/alerts/api/model/condition/EventCondition.java b/api/src/main/java/org/hawkular/alerts/api/model/condition/EventCondition.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.api.model.condition;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -211,7 +213,7 @@ public boolean match(Event value) {
         if (null == value) {
             return false;
         }
-        if (null == expression || expression.isEmpty()) {
+        if (isEmpty(expression)) {
             return true;
         }
         List<String> expressions = new ArrayList<>();
@@ -251,7 +253,7 @@ public boolean match(Event value) {
     private static final String GTE = ">=";
 
     private boolean processExpression(String expression, Event value) {
-        if (null == expression || expression.isEmpty() || null == value) {
+        if (isEmpty(expression) || null == value) {
             return false;
         }
         String[] tokens = expression.split(" ");
@@ -270,7 +272,7 @@ private boolean processExpression(String expression, Event value) {
         String sConstantValue = null;
         Double dConstantValue = null;
 
-        if (eventField == null || eventField.isEmpty()) {
+        if (isEmpty(eventField)) {
             return false;
         }
         if (TENANT_ID.equals(eventField)) {

diff --git a/api/src/main/java/org/hawkular/alerts/api/model/condition/NelsonCondition.java b/api/src/main/java/org/hawkular/alerts/api/model/condition/NelsonCondition.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.api.model.condition;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -199,10 +201,6 @@ public boolean match(List<NelsonRule> violations) {
         return false;
     }
 
-    private boolean isEmpty(Collection<?> c) {
-        return null == c || c.isEmpty();
-    }
-
     @Override
     public void updateDisplayString() {
         String s = String.format("%s activeNelsonRules=%s sampleSize=%d", this.dataId,

diff --git a/api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java b/api/src/main/java/org/hawkular/alerts/api/model/dampening/Dampening.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.api.model.dampening;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -416,7 +418,7 @@ public void perform(Match match, Set<ConditionEval> conditionEvalSet) {
         if (null == match) {
             throw new IllegalArgumentException("Match can not be null");
         }
-        if (null == conditionEvalSet || isEmpty(conditionEvalSet)) {
+        if (isEmpty(conditionEvalSet)) {
             throw new IllegalArgumentException("ConditionEval Set can not be null or empty");
         }
 
@@ -555,10 +557,6 @@ private void updateId() {
         this.dampeningId = sb.toString();
     }
 
-    private boolean isEmpty(Collection<?> c) {
-        return null == c || c.isEmpty();
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;

diff --git a/api/src/main/java/org/hawkular/alerts/api/model/data/Data.java b/api/src/main/java/org/hawkular/alerts/api/model/data/Data.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.api.model.data;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
@@ -226,10 +228,6 @@ public static Data forAvailability(String tenantId, String source, String id, lo
         return new Data(tenantId, source, id, timestamp, value.name(), null, context);
     }
 
-    private boolean isEmpty(String s) {
-        return null == s || s.trim().isEmpty();
-    }
-
     public String getTenantId() {
         return tenantId;
     }

diff --git a/api/src/main/java/org/hawkular/alerts/api/model/event/Event.java b/api/src/main/java/org/hawkular/alerts/api/model/event/Event.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.api.model.event;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
@@ -529,8 +531,4 @@ public boolean same(Object obj) {
         return true;
     }
 
-    private static boolean isEmpty(String s) {
-        return null == s || s.trim().isEmpty();
-    }
-
 }
diff --git a/api/src/main/java/org/hawkular/alerts/api/model/paging/ActionComparator.java b/api/src/main/java/org/hawkular/alerts/api/model/paging/ActionComparator.java
@@ -16,6 +16,8 @@
  */
 package org.hawkular.alerts.api.model.paging;
 
+import static org.hawkular.alerts.api.util.Util.isEmpty;
+
 import java.util.Comparator;
 
 import org.hawkular.alerts.api.model.action.Action;
@@ -44,7 +46,7 @@ public String getText() {
         }
 
         public static Field getField(String text) {
-            if (text == null || text.isEmpty()) {
+            if (isEmpty(text)) {
                 return ALERT_ID;
             }
             for (Field f : values()) {