Organized imports for main classes
Change-Id: I3b05d7f289706aef04019a820be9989f8fb54945
diff --git a/src/main/java/net/floodlightcontroller/core/IOFSwitch.java b/src/main/java/net/floodlightcontroller/core/IOFSwitch.java
index d63624c..5359812 100644
--- a/src/main/java/net/floodlightcontroller/core/IOFSwitch.java
+++ b/src/main/java/net/floodlightcontroller/core/IOFSwitch.java
@@ -23,6 +23,7 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.Future;
+
import net.floodlightcontroller.core.IFloodlightProviderService.Role;
import org.jboss.netty.channel.Channel;
diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index c5ebbc5..d475fa6 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -63,8 +63,8 @@
import net.onrc.onos.core.main.IOFSwitchPortListener;
import net.onrc.onos.core.packet.Ethernet;
import net.onrc.onos.core.registry.IControllerRegistryService;
-import net.onrc.onos.core.registry.RegistryException;
import net.onrc.onos.core.registry.IControllerRegistryService.ControlChangeCallback;
+import net.onrc.onos.core.registry.RegistryException;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.buffer.ChannelBuffer;
diff --git a/src/main/java/net/floodlightcontroller/core/internal/IOFSwitchFeatures.java b/src/main/java/net/floodlightcontroller/core/internal/IOFSwitchFeatures.java
index ddbb0ef..f537868 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/IOFSwitchFeatures.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/IOFSwitchFeatures.java
@@ -1,9 +1,9 @@
package net.floodlightcontroller.core.internal;
-import org.openflow.protocol.statistics.OFDescriptionStatistics;
-
import net.floodlightcontroller.core.IOFSwitch;
+import org.openflow.protocol.statistics.OFDescriptionStatistics;
+
public interface IOFSwitchFeatures {
public void setFromDescription(IOFSwitch sw, OFDescriptionStatistics description);
}
diff --git a/src/main/java/net/floodlightcontroller/core/internal/OFMessageFuture.java b/src/main/java/net/floodlightcontroller/core/internal/OFMessageFuture.java
index f01e179..60b932f 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OFMessageFuture.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OFMessageFuture.java
@@ -23,12 +23,12 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import org.openflow.protocol.OFMessage;
-import org.openflow.protocol.OFType;
-
import net.floodlightcontroller.core.IOFSwitch;
import net.floodlightcontroller.threadpool.IThreadPoolService;
+import org.openflow.protocol.OFMessage;
+import org.openflow.protocol.OFType;
+
/**
* A Future object used to retrieve asynchronous OFMessage replies. Unregisters
* and cancels itself by default after 60 seconds. This class is meant to be
diff --git a/src/main/java/net/floodlightcontroller/core/internal/RoleChanger.java b/src/main/java/net/floodlightcontroller/core/internal/RoleChanger.java
index 194935c..4a21cad 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/RoleChanger.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/RoleChanger.java
@@ -8,13 +8,13 @@
import java.util.concurrent.Delayed;
import java.util.concurrent.TimeUnit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import net.floodlightcontroller.core.IFloodlightProviderService.Role;
import net.floodlightcontroller.core.IOFSwitch;
import net.floodlightcontroller.core.annotations.LogMessageDoc;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This class handles sending of RoleRequest messages to all connected switches.
*
diff --git a/src/main/java/net/floodlightcontroller/core/module/ModuleLoaderResource.java b/src/main/java/net/floodlightcontroller/core/module/ModuleLoaderResource.java
index 7f7b903..556b26d 100644
--- a/src/main/java/net/floodlightcontroller/core/module/ModuleLoaderResource.java
+++ b/src/main/java/net/floodlightcontroller/core/module/ModuleLoaderResource.java
@@ -6,7 +6,6 @@
import java.util.Map;
import java.util.Set;
-
import org.restlet.resource.Get;
import org.restlet.resource.ServerResource;
import org.slf4j.Logger;
diff --git a/src/main/java/net/floodlightcontroller/core/util/ListenerDispatcher.java b/src/main/java/net/floodlightcontroller/core/util/ListenerDispatcher.java
index ea63c25..911284e 100644
--- a/src/main/java/net/floodlightcontroller/core/util/ListenerDispatcher.java
+++ b/src/main/java/net/floodlightcontroller/core/util/ListenerDispatcher.java
@@ -21,12 +21,12 @@
import java.util.HashSet;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import net.floodlightcontroller.core.IListener;
import net.floodlightcontroller.core.annotations.LogMessageDoc;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Maintain lists of listeners ordered by dependency.
*
diff --git a/src/main/java/net/floodlightcontroller/core/web/AllSwitchStatisticsResource.java b/src/main/java/net/floodlightcontroller/core/web/AllSwitchStatisticsResource.java
index 2eeec70..5d70cee 100644
--- a/src/main/java/net/floodlightcontroller/core/web/AllSwitchStatisticsResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/AllSwitchStatisticsResource.java
@@ -24,6 +24,7 @@
import java.util.Map;
import net.floodlightcontroller.core.IFloodlightProviderService;
+
import org.openflow.protocol.OFFeaturesReply;
import org.openflow.protocol.statistics.OFStatistics;
import org.openflow.protocol.statistics.OFStatisticsType;
diff --git a/src/main/java/net/floodlightcontroller/core/web/LoadedModuleLoaderResource.java b/src/main/java/net/floodlightcontroller/core/web/LoadedModuleLoaderResource.java
index 38367c3..22bdb77 100644
--- a/src/main/java/net/floodlightcontroller/core/web/LoadedModuleLoaderResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/LoadedModuleLoaderResource.java
@@ -2,10 +2,10 @@
import java.util.Map;
-import org.restlet.resource.Get;
-
import net.floodlightcontroller.core.module.ModuleLoaderResource;
+import org.restlet.resource.Get;
+
public class LoadedModuleLoaderResource extends ModuleLoaderResource {
/**
* Retrieves information about all modules available
diff --git a/src/main/java/net/floodlightcontroller/core/web/SwitchRoleResource.java b/src/main/java/net/floodlightcontroller/core/web/SwitchRoleResource.java
index 944c725..f9eb877 100644
--- a/src/main/java/net/floodlightcontroller/core/web/SwitchRoleResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/SwitchRoleResource.java
@@ -2,13 +2,12 @@
import java.util.HashMap;
-import org.openflow.util.HexString;
-import org.restlet.resource.ServerResource;
-
import net.floodlightcontroller.core.IFloodlightProviderService;
import net.floodlightcontroller.core.IOFSwitch;
+import org.openflow.util.HexString;
import org.restlet.resource.Get;
+import org.restlet.resource.ServerResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/net/floodlightcontroller/core/web/SystemUptimeResource.java b/src/main/java/net/floodlightcontroller/core/web/SystemUptimeResource.java
index fe4b967..a125979 100644
--- a/src/main/java/net/floodlightcontroller/core/web/SystemUptimeResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/SystemUptimeResource.java
@@ -1,6 +1,7 @@
package net.floodlightcontroller.core.web;
import net.floodlightcontroller.core.IFloodlightProviderService;
+
import org.restlet.resource.Get;
import org.restlet.resource.ServerResource;
diff --git a/src/main/java/net/floodlightcontroller/util/EventHistoryBaseInfoJSONSerializer.java b/src/main/java/net/floodlightcontroller/util/EventHistoryBaseInfoJSONSerializer.java
index 6f1d1ff..3916282 100644
--- a/src/main/java/net/floodlightcontroller/util/EventHistoryBaseInfoJSONSerializer.java
+++ b/src/main/java/net/floodlightcontroller/util/EventHistoryBaseInfoJSONSerializer.java
@@ -17,10 +17,8 @@
package net.floodlightcontroller.util;
import java.io.IOException;
-
import java.sql.Timestamp;
-
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.JsonSerializer;
diff --git a/src/main/java/net/floodlightcontroller/util/TimedCache.java b/src/main/java/net/floodlightcontroller/util/TimedCache.java
index 7341df7..3a44556 100644
--- a/src/main/java/net/floodlightcontroller/util/TimedCache.java
+++ b/src/main/java/net/floodlightcontroller/util/TimedCache.java
@@ -17,9 +17,10 @@
package net.floodlightcontroller.util;
-import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
import java.util.concurrent.ConcurrentMap;
+import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
+
/**
* The key is any object/hash-code
* The value is time-stamp in milliseconds