From fc10fc9fd47ea71592cd6fbd6017432c7f51f362 Mon Sep 17 00:00:00 2001
From: Ryan Izard <rizard@g.clemson.edu>
Date: Thu, 21 Aug 2014 14:48:21 -0400
Subject: [PATCH] Incorporate Hung-Wei's and my stats reply and other REST API
 changes. A couple of bug fixes from Hung-Wei too.

---
 .../core/web/ControllerSwitchesResource.java        | 13 -------------
 .../core/web/serializers/IOFSwitchSerializer.java   |  2 --
 2 files changed, 15 deletions(-)

diff --git a/src/main/java/net/floodlightcontroller/core/web/ControllerSwitchesResource.java b/src/main/java/net/floodlightcontroller/core/web/ControllerSwitchesResource.java
index f749345ac..1df4aaf56 100644
--- a/src/main/java/net/floodlightcontroller/core/web/ControllerSwitchesResource.java
+++ b/src/main/java/net/floodlightcontroller/core/web/ControllerSwitchesResource.java
@@ -17,29 +17,16 @@
 
 package net.floodlightcontroller.core.web;
 
-import java.net.SocketAddress;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Set;
 
-import net.floodlightcontroller.core.HARole;
 import net.floodlightcontroller.core.IOFSwitch;
 import net.floodlightcontroller.core.internal.IOFSwitchService;
-import net.floodlightcontroller.util.FilterIterator;
-import net.floodlightcontroller.core.web.serializers.IOFSwitchSerializer;
-import org.projectfloodlight.openflow.protocol.OFCapabilities;
-import org.projectfloodlight.openflow.protocol.OFPortDesc;
 import org.projectfloodlight.openflow.types.DatapathId;
-import org.projectfloodlight.openflow.protocol.OFActionType;
 import org.restlet.data.Form;
 import org.restlet.data.Status;
 import org.restlet.resource.Get;
 import org.restlet.resource.ServerResource;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 /**
  * Get a list of switches connected to the controller
  * @author readams
diff --git a/src/main/java/net/floodlightcontroller/core/web/serializers/IOFSwitchSerializer.java b/src/main/java/net/floodlightcontroller/core/web/serializers/IOFSwitchSerializer.java
index 667ff543a..aa8d6936f 100644
--- a/src/main/java/net/floodlightcontroller/core/web/serializers/IOFSwitchSerializer.java
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/IOFSwitchSerializer.java
@@ -26,8 +26,6 @@ import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import org.projectfloodlight.openflow.util.HexString;
-import org.projectfloodlight.openflow.types.DatapathId;
 import org.projectfloodlight.openflow.protocol.OFCapabilities;
 import org.projectfloodlight.openflow.protocol.OFPortDesc;
 import org.projectfloodlight.openflow.protocol.OFPortConfig;
-- 
GitLab