Merge pull request #384 from ppalaga/150731-imports

Make java imports comply to the new Checkstyle rule and IDE settings
hawkular · Jul 31, 2015 · eef979e · eef979e
2 parents 311e646 + 6b15fad
commit eef979e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/console/src/main/java/org/hawkular/console/configuration/PushStateConfigurationProvider.java b/console/src/main/java/org/hawkular/console/configuration/PushStateConfigurationProvider.java
@@ -17,18 +17,19 @@
 
 package org.hawkular.console.configuration;
 
+import javax.servlet.ServletContext;
+
 import org.ocpsoft.logging.Logger;
 import org.ocpsoft.rewrite.annotation.RewriteConfiguration;
 import org.ocpsoft.rewrite.config.Configuration;
 import org.ocpsoft.rewrite.config.ConfigurationBuilder;
 import org.ocpsoft.rewrite.config.Direction;
 import org.ocpsoft.rewrite.config.Log;
+import org.ocpsoft.rewrite.servlet.config.Forward;
 import org.ocpsoft.rewrite.servlet.config.HttpConfigurationProvider;
 import org.ocpsoft.rewrite.servlet.config.Path;
 import org.ocpsoft.rewrite.servlet.config.Resource;
 import org.ocpsoft.rewrite.servlet.config.ServletMapping;
-import org.ocpsoft.rewrite.servlet.config.Forward;
-import javax.servlet.ServletContext;
 
 @RewriteConfiguration
 public class PushStateConfigurationProvider extends HttpConfigurationProvider {

diff --git a/modules/avail-creator/src/main/java/org/hawkular/component/availcreator/Log.java b/modules/avail-creator/src/main/java/org/hawkular/component/availcreator/Log.java
@@ -18,10 +18,10 @@
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
+import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageLogger;
-import org.jboss.logging.annotations.Cause;
 
 /**
  * Log messages of the creator

diff --git a/modules/pinger/src/main/java/org/hawkular/component/pinger/Log.java b/modules/pinger/src/main/java/org/hawkular/component/pinger/Log.java
@@ -20,10 +20,10 @@
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
+import org.jboss.logging.annotations.Cause;
 import org.jboss.logging.annotations.LogMessage;
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageLogger;
-import org.jboss.logging.annotations.Cause;
 
 /**
  * Log messages of the pinger

diff --git a/modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java b/modules/pinger/src/main/java/org/hawkular/component/pinger/PingManager.java
@@ -16,19 +16,6 @@
  */
 package org.hawkular.component.pinger;
 
-import org.hawkular.inventory.api.Action;
-import org.hawkular.inventory.api.Interest;
-import org.hawkular.inventory.api.Inventory;
-import org.hawkular.inventory.api.filters.With;
-import org.hawkular.inventory.api.model.Resource;
-
-import javax.annotation.PostConstruct;
-import javax.ejb.EJB;
-import javax.ejb.Lock;
-import javax.ejb.LockType;
-import javax.ejb.Schedule;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -39,6 +26,20 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
+import javax.annotation.PostConstruct;
+import javax.ejb.EJB;
+import javax.ejb.Lock;
+import javax.ejb.LockType;
+import javax.ejb.Schedule;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+
+import org.hawkular.inventory.api.Action;
+import org.hawkular.inventory.api.Interest;
+import org.hawkular.inventory.api.Inventory;
+import org.hawkular.inventory.api.filters.With;
+import org.hawkular.inventory.api.model.Resource;
+
 /**
  * A SLSB that coordinates the pinging of resources
  *