Order imports to comply with the new Checkstyle rule

hawkular · Aug 3, 2015 · a289bd5 · a289bd5
1 parent 0719ca3
commit a289bd5
Show file tree

Hide file tree

Showing 40 changed files with 96 additions and 66 deletions.
diff --git a/hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/PluginMessage.java b/hawkular-alerts-actions-api/src/main/java/org/hawkular/alerts/actions/api/PluginMessage.java
@@ -16,10 +16,12 @@
  */
 package org.hawkular.alerts.actions.api;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Map;
+
 import org.hawkular.alerts.api.model.action.Action;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 /**
  * A message sent to the plugin from the alerts engine
  * It has the alert payload as well as action properties

diff --git a/...rts-actions-api/src/main/java/org/hawkular/alerts/actions/api/PluginOperationMessage.java b/...rts-actions-api/src/main/java/org/hawkular/alerts/actions/api/PluginOperationMessage.java
@@ -16,10 +16,11 @@
  */
 package org.hawkular.alerts.actions.api;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Map;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 /**
  * A message sent to the alerts engine from the plugin
  * It defines a code of operation and payloads

diff --git a/...ular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java b/...ular-alerts-actions-api/src/test/java/org/hawkular/alerts/actions/api/model/JsonTest.java
@@ -19,13 +19,13 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.Severity;
 import org.hawkular.alerts.api.model.action.Action;

diff --git a/...s-actions-aerogear/src/main/java/org/hawkular/alerts/actions/aerogear/AerogearPlugin.java b/...s-actions-aerogear/src/main/java/org/hawkular/alerts/actions/aerogear/AerogearPlugin.java
@@ -19,9 +19,10 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import org.hawkular.alerts.actions.api.MsgLogger;
+
 import org.hawkular.alerts.actions.api.ActionPlugin;
 import org.hawkular.alerts.actions.api.ActionPluginListener;
+import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.condition.Alert;
 import org.jboss.aerogear.unifiedpush.DefaultPushSender;

diff --git a/...tions-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java b/...tions-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/AerogearPluginTest.java
@@ -40,12 +40,12 @@
 import org.hawkular.alerts.api.model.condition.ThresholdConditionEval;
 import org.hawkular.alerts.api.model.data.Availability;
 import org.hawkular.alerts.api.model.data.NumericData;
+import org.jboss.aerogear.unifiedpush.PushSender;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.jboss.aerogear.unifiedpush.PushSender;
 
 /**
  * @author Thomas Segismont

diff --git a/...ns-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/UnifiedMessageMatcher.java b/...ns-aerogear/src/test/java/org/hawkular/alerts/actions/aerogear/UnifiedMessageMatcher.java
@@ -23,7 +23,6 @@
 import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
-
 import org.jboss.aerogear.unifiedpush.message.UnifiedMessage;
 import org.jboss.aerogear.unifiedpush.message.UnifiedPushMessage;
 

diff --git a/...lar-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java b/...lar-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailPlugin.java
@@ -31,9 +31,9 @@
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMultipart;
 
-import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.ActionPlugin;
 import org.hawkular.alerts.actions.api.ActionPluginListener;
+import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.condition.Alert;
 import org.jboss.logging.Logger;

diff --git a/...alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailPluginTest.java b/...alerts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailPluginTest.java
@@ -16,9 +16,6 @@
  */
 package org.hawkular.alerts.actions.email;
 
-import static org.hawkular.alerts.api.model.condition.Alert.Status;
-import static org.hawkular.alerts.api.model.data.Availability.AvailabilityType;
-import static org.hawkular.alerts.api.model.trigger.Trigger.Mode;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
@@ -35,6 +32,7 @@
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.action.Action;
 import org.hawkular.alerts.api.model.condition.Alert;
+import org.hawkular.alerts.api.model.condition.Alert.Status;
 import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
 import org.hawkular.alerts.api.model.condition.AvailabilityConditionEval;
 import org.hawkular.alerts.api.model.condition.Condition;
@@ -43,9 +41,11 @@
 import org.hawkular.alerts.api.model.condition.ThresholdConditionEval;
 import org.hawkular.alerts.api.model.dampening.Dampening;
 import org.hawkular.alerts.api.model.data.Availability;
+import org.hawkular.alerts.api.model.data.Availability.AvailabilityType;
 import org.hawkular.alerts.api.model.data.Data;
 import org.hawkular.alerts.api.model.data.NumericData;
 import org.hawkular.alerts.api.model.trigger.Trigger;
+import org.hawkular.alerts.api.model.trigger.Trigger.Mode;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

diff --git a/...erts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailTemplateTest.java b/...erts-actions-email/src/test/java/org/hawkular/alerts/actions/email/EmailTemplateTest.java
@@ -29,6 +29,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.hawkular.alerts.api.model.condition.Alert;
 import org.hawkular.alerts.api.model.condition.AvailabilityCondition;
 import org.hawkular.alerts.api.model.condition.AvailabilityConditionEval;

diff --git a/...wkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.java b/...wkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.java
@@ -16,21 +16,22 @@
  */
 package org.hawkular.alerts.actions.file;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.ActionPlugin;
 import org.hawkular.alerts.actions.api.ActionPluginListener;
+import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.condition.Alert;
 import org.jboss.logging.Logger;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 /**
  * A simple file action plugin
  *

diff --git a/...ctions-pagerduty/src/main/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPlugin.java b/...ctions-pagerduty/src/main/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPlugin.java
@@ -22,9 +22,9 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.ActionPlugin;
 import org.hawkular.alerts.actions.api.ActionPluginListener;
+import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.condition.Alert;
 

diff --git a/...ns-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java b/...ns-pagerduty/src/test/java/org/hawkular/alerts/actions/pagerduty/PagerDutyPluginTest.java
@@ -20,16 +20,13 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 
-import com.google.gson.InstanceCreator;
-import com.squareup.pagerduty.incidents.FakePagerDuty;
-import com.squareup.pagerduty.incidents.NotifyResult;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.Severity;
 import org.hawkular.alerts.api.model.action.Action;
@@ -45,6 +42,10 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import com.google.gson.InstanceCreator;
+import com.squareup.pagerduty.incidents.FakePagerDuty;
+import com.squareup.pagerduty.incidents.NotifyResult;
+
 /**
  * @author Thomas Segismont
  */

diff --git a/.../hawkular-alerts-actions-sms/src/main/java/org/hawkular/alerts/actions/sms/SmsPlugin.java b/.../hawkular-alerts-actions-sms/src/main/java/org/hawkular/alerts/actions/sms/SmsPlugin.java
@@ -16,24 +16,26 @@
  */
 package org.hawkular.alerts.actions.sms;
 
-import com.twilio.sdk.TwilioRestClient;
-import com.twilio.sdk.TwilioRestException;
-import com.twilio.sdk.resource.factory.MessageFactory;
-import com.twilio.sdk.resource.instance.Account;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
-import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.ActionPlugin;
 import org.hawkular.alerts.actions.api.ActionPluginListener;
+import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.condition.Alert;
 
+import com.twilio.sdk.TwilioRestClient;
+import com.twilio.sdk.TwilioRestException;
+import com.twilio.sdk.resource.factory.MessageFactory;
+import com.twilio.sdk.resource.instance.Account;
+
 /**
  * An example of listener for sms processing.
  *

diff --git a/...kular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java b/...kular-alerts-actions-sms/src/test/java/org/hawkular/alerts/actions/sms/SmsPluginTest.java
@@ -25,12 +25,9 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-
-import com.google.common.collect.ImmutableList;
-import com.twilio.sdk.resource.factory.MessageFactory;
-
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.http.NameValuePair;
 import org.apache.http.message.BasicNameValuePair;
 import org.hawkular.alerts.actions.api.PluginMessage;
@@ -50,6 +47,9 @@
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import com.google.common.collect.ImmutableList;
+import com.twilio.sdk.resource.factory.MessageFactory;
+
 /**
  * @author Thomas Segismont
  */

diff --git a/...wkular-alerts-actions-snmp/src/main/java/org/hawkular/alerts/actions/snmp/SnmpPlugin.java b/...wkular-alerts-actions-snmp/src/main/java/org/hawkular/alerts/actions/snmp/SnmpPlugin.java
@@ -19,9 +19,10 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-import org.hawkular.alerts.actions.api.MsgLogger;
+
 import org.hawkular.alerts.actions.api.ActionPlugin;
 import org.hawkular.alerts.actions.api.ActionPluginListener;
+import org.hawkular.alerts.actions.api.MsgLogger;
 import org.hawkular.alerts.actions.api.PluginMessage;
 
 /**

diff --git a/.../src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginRegister.java b/.../src/main/java/org/hawkular/alerts/actions/standalone/StandaloneActionPluginRegister.java
@@ -17,16 +17,16 @@
 package org.hawkular.alerts.actions.standalone;
 
 import java.util.Map;
-
 import java.util.Set;
+
 import javax.annotation.PostConstruct;
 import javax.ejb.Singleton;
 import javax.ejb.Startup;
 import javax.ejb.TransactionAttribute;
 import javax.ejb.TransactionAttributeType;
-
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+
 import org.hawkular.alerts.actions.api.ActionPluginListener;
 import org.hawkular.alerts.api.services.ActionListener;
 import org.hawkular.alerts.api.services.ActionsService;

diff --git a/...ndalone/src/main/java/org/hawkular/alerts/actions/standalone/StandalonePluginMessage.java b/...ndalone/src/main/java/org/hawkular/alerts/actions/standalone/StandalonePluginMessage.java
@@ -17,6 +17,7 @@
 package org.hawkular.alerts.actions.standalone;
 
 import java.util.Map;
+
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.action.Action;
 

diff --git a/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java b/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/action/Action.java
@@ -16,9 +16,10 @@
  */
 package org.hawkular.alerts.api.model.action;
 
+import org.hawkular.alerts.api.model.condition.Alert;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import org.hawkular.alerts.api.model.condition.Alert;
 
 /**
  * A base class for action representation from the perspective of the alerts engine.

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,12 +18,13 @@
 
 import static org.hawkular.alerts.api.model.trigger.Trigger.Mode.FIRING;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import org.hawkular.alerts.api.log.MsgLogger;
 import org.hawkular.alerts.api.model.data.Availability.AvailabilityType;
 import org.hawkular.alerts.api.model.trigger.Trigger.Mode;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
 /**
  * An availability condition definition.
  *

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,11 +16,12 @@
  */
 package org.hawkular.alerts.api.model.condition;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import org.hawkular.alerts.api.log.MsgLogger;
 import org.hawkular.alerts.api.model.trigger.Trigger.Mode;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
 /**
  * A string comparison condition.
  *

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,11 +16,12 @@
  */
 package org.hawkular.alerts.api.model.condition;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import org.hawkular.alerts.api.log.MsgLogger;
 import org.hawkular.alerts.api.model.trigger.Trigger.Mode;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+
 /**
  * A numeric threshold condition.
  *

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,10 +16,11 @@
  */
 package org.hawkular.alerts.api.model.condition;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import org.hawkular.alerts.api.log.MsgLogger;
 import org.hawkular.alerts.api.model.trigger.Trigger.Mode;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 /**
  * A numeric threshold range condition.
  *

diff --git a/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/AlertComparator.java b/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/paging/AlertComparator.java
@@ -17,6 +17,7 @@
 package org.hawkular.alerts.api.model.paging;
 
 import java.util.Comparator;
+
 import org.hawkular.alerts.api.model.condition.Alert;
 
 /**

diff --git a/hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/BusPluginMessage.java b/hawkular-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/BusPluginMessage.java
@@ -16,12 +16,14 @@
  */
 package org.hawkular.alerts.bus.api;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Map;
+
 import org.hawkular.alerts.actions.api.PluginMessage;
 import org.hawkular.alerts.api.model.action.Action;
 import org.hawkular.bus.common.BasicMessage;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 /**
  * Message send from the alerts engine through the bus and received by the action plugins architecture.
  *

diff --git a/...r-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/BusPluginOperationMessage.java b/...r-alerts-bus-api/src/main/java/org/hawkular/alerts/bus/api/BusPluginOperationMessage.java
@@ -18,6 +18,7 @@
 
 import java.util.Map;
 import java.util.Set;
+
 import org.hawkular.alerts.actions.api.PluginOperationMessage;
 import org.hawkular.bus.common.BasicMessage;