Tidied up some import warnings and unused variables from recently-pulled Firewall REST API changes.

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

@@ -17,22 +17,14 @@
 
 package net.floodlightcontroller.firewall;
 
-import java.io.IOException;
-
 import org.restlet.resource.Get;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 
 public class FirewallStorageRulesResource extends FirewallResourceBase {
-    // REST API for retrieving rules from storage
-
-    private static final Logger log = LoggerFactory.getLogger(FirewallStorageRulesResource.class);
-
-    @Get("json")
-    public Object handleRequest() {
-        IFirewallService firewall = getFirewallService();
+	// REST API for retrieving rules from storage
 
-	return firewall.getStorageRules();
-    }
+	@Get("json")
+	public Object handleRequest() {
+		IFirewallService firewall = getFirewallService();
+		return firewall.getStorageRules();
+	}
 }

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

@@ -25,84 +25,80 @@ import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.MappingJsonFactory;
 import org.restlet.resource.Post;
 import org.restlet.resource.Get;
-import org.restlet.resource.ServerResource;
 import org.restlet.data.Status;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 public class FirewallSubnetMaskResource extends FirewallResourceBase {
-    // REST API to get or set local subnet mask -- this only makes sense for one subnet
-    // will remove later
-
-    private static final Logger log = LoggerFactory.getLogger(FirewallSubnetMaskResource.class);
-
-    @Get("json")
-    public Object handleRequest() {
-        IFirewallService firewall = getFirewallService();
-
-	return "{\"subnet-mask\":\"" + firewall.getSubnetMask() + "\"}";
-    }
-
-
-    @Post
-    public String handlePost(String fmJson) {
-        IFirewallService firewall = getFirewallService();
-
-        String newMask;
-        try {
-            newMask = jsonExtractSubnetMask(fmJson);
-        } catch (IOException e) {
-            log.error("Error parsing new subnet mask: " + fmJson, e);
-            setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
-            return "{\"status\" : \"Error! Could not parse new subnet mask, see log for details.\"}";
-        }
-
-        firewall.setSubnetMask(newMask);
-
-        setStatus(Status.SUCCESS_OK);
-
-        return ("{\"status\" : \"subnet mask set\"}");
-    }
-
-    /**
-     * Extracts subnet mask from a JSON string
-     * @param fmJson The JSON formatted string
-     * @return The subnet mask
-     * @throws IOException If there was an error parsing the JSON
-     */
-    public static String jsonExtractSubnetMask(String fmJson) throws IOException {
-        String subnet_mask = "";
-        MappingJsonFactory f = new MappingJsonFactory();
-        JsonParser jp;
-
-        try {
-            jp = f.createJsonParser(fmJson);
-        } catch (JsonParseException e) {
-            throw new IOException(e);
-        }
-
-        jp.nextToken();
-        if (jp.getCurrentToken() != JsonToken.START_OBJECT) {
-            throw new IOException("Expected START_OBJECT");
-        }
-
-        while (jp.nextToken() != JsonToken.END_OBJECT) {
-            if (jp.getCurrentToken() != JsonToken.FIELD_NAME) {
-                throw new IOException("Expected FIELD_NAME");
-            }
-
-            String n = jp.getCurrentName();
-            jp.nextToken();
-            if (jp.getText().equals(""))
-                continue;
-
-            if (n == "subnet-mask") {
-                subnet_mask = jp.getText();
-                break;
-            }
-        }
-
-        return subnet_mask;
-    }
+	// REST API to get or set local subnet mask -- this only makes sense for one subnet
+	// will remove later
+
+	private static final Logger log = LoggerFactory.getLogger(FirewallSubnetMaskResource.class);
+
+	@Get("json")
+	public Object handleRequest() {
+		IFirewallService firewall = getFirewallService();
+		return "{\"subnet-mask\":\"" + firewall.getSubnetMask() + "\"}";
+	}
+
+
+	@Post
+	public String handlePost(String fmJson) {
+		IFirewallService firewall = getFirewallService();
+
+		String newMask;
+		try {
+			newMask = jsonExtractSubnetMask(fmJson);
+		} catch (IOException e) {
+			log.error("Error parsing new subnet mask: " + fmJson, e);
+			setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
+			return "{\"status\" : \"Error! Could not parse new subnet mask, see log for details.\"}";
+		}
+
+		firewall.setSubnetMask(newMask);
+
+		setStatus(Status.SUCCESS_OK);
+		return ("{\"status\" : \"subnet mask set\"}");
+	}
+
+	/**
+	 * Extracts subnet mask from a JSON string
+	 * @param fmJson The JSON formatted string
+	 * @return The subnet mask
+	 * @throws IOException If there was an error parsing the JSON
+	 */
+	public static String jsonExtractSubnetMask(String fmJson) throws IOException {
+		String subnet_mask = "";
+		MappingJsonFactory f = new MappingJsonFactory();
+		JsonParser jp;
+
+		try {
+			jp = f.createJsonParser(fmJson);
+		} catch (JsonParseException e) {
+			throw new IOException(e);
+		}
+
+		jp.nextToken();
+		if (jp.getCurrentToken() != JsonToken.START_OBJECT) {
+			throw new IOException("Expected START_OBJECT");
+		}
+
+		while (jp.nextToken() != JsonToken.END_OBJECT) {
+			if (jp.getCurrentToken() != JsonToken.FIELD_NAME) {
+				throw new IOException("Expected FIELD_NAME");
+			}
+
+			String n = jp.getCurrentName();
+			jp.nextToken();
+			if (jp.getText().equals(""))
+				continue;
+
+			if (n == "subnet-mask") {
+				subnet_mask = jp.getText();
+				break;
+			}
+		}
+
+		return subnet_mask;
+	}
 }