FL-82 - Get rid of warnings in the Firewall module and test.

src/main/java/net/floodlightcontroller/firewall/Firewall.java

@@ -33,7 +33,6 @@ import net.floodlightcontroller.storage.StorageException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 public class Firewall implements IFirewallService, IOFMessageListener, IFloodlightModule {
 
     protected IFloodlightProviderService floodlightProvider;
@@ -273,6 +272,9 @@ public class Firewall implements IFirewallService, IOFMessageListener, IFloodlig
                             decision,
                             cntx);
                 }
+                break;
+            default:
+            	break;
         }
 
         return Command.CONTINUE;

src/main/java/net/floodlightcontroller/firewall/FirewallResource.java

@@ -12,12 +12,6 @@ import org.restlet.resource.ServerResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-import net.floodlightcontroller.firewall.Firewall;
-import net.floodlightcontroller.packet.Ethernet;
-import net.floodlightcontroller.packet.IPv4;
-
-
 public class FirewallResource extends ServerResource {
     protected static Logger log = LoggerFactory.getLogger(FirewallResource.class);
 

src/main/java/net/floodlightcontroller/firewall/FirewallRule.java

@@ -9,8 +9,7 @@ import net.floodlightcontroller.packet.IPv4;
 import net.floodlightcontroller.packet.TCP;
 import net.floodlightcontroller.packet.UDP;
 
-
-public class FirewallRule implements Comparable {
+public class FirewallRule implements Comparable<FirewallRule> {
     public int ruleid;
     public short src_inport;
     public long src_mac;
@@ -78,7 +77,7 @@ public class FirewallRule implements Comparable {
      * negative if less than 'rule'
      * greater than zero if greater priority rule than 'rule'
      */
-    public int compareTo(Object rule) {
+    public int compareTo(FirewallRule rule) {
         return this.priority - ((FirewallRule)rule).priority;
     }
 

src/main/java/net/floodlightcontroller/firewall/FirewallRulesResource.java

@@ -15,12 +15,9 @@ import org.restlet.resource.ServerResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-import net.floodlightcontroller.firewall.Firewall;
 import net.floodlightcontroller.packet.Ethernet;
 import net.floodlightcontroller.packet.IPv4;
 
-
 public class FirewallRulesResource extends ServerResource {
     protected static Logger log = LoggerFactory.getLogger(FirewallRulesResource.class);
 

src/main/java/net/floodlightcontroller/firewall/IFirewallService.java

 package net.floodlightcontroller.firewall;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

src/test/java/net/floodlightcontroller/firewall/FirewallTest.java

 package net.floodlightcontroller.firewall;
 
-import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;