Remove inapplicable device web stuff

src/main/java/net/floodlightcontroller/core/web/JacksonCustomConverter.java

@@ -19,9 +19,6 @@ package net.floodlightcontroller.core.web;
 
 import java.util.List;
 
-import net.floodlightcontroller.core.web.serializers.DeviceAttachmentPointJSONSerializer;
-import net.floodlightcontroller.core.web.serializers.DeviceJSONSerializer;
-import net.floodlightcontroller.core.web.serializers.DeviceNetworkAddressJSONSerializer;
 import net.floodlightcontroller.core.web.serializers.EventHistoryAttachmentPointJSONSerializer;
 import net.floodlightcontroller.core.web.serializers.EventHistoryBaseInfoJSONSerializer;
 import net.floodlightcontroller.core.web.serializers.EventHistoryTopologyClusterJSONSerializer;
@@ -76,9 +73,6 @@ public class JacksonCustomConverter extends JacksonConverter {
         jsonModule.addSerializer(new EventHistoryTopologySwitchJSONSerializer());
         jsonModule.addSerializer(new EventHistoryTopologyLinkJSONSerializer());
         jsonModule.addSerializer(new EventHistoryTopologyClusterJSONSerializer());
-        jsonModule.addSerializer(new DeviceJSONSerializer());
-        jsonModule.addSerializer(new DeviceNetworkAddressJSONSerializer());
-        jsonModule.addSerializer(new DeviceAttachmentPointJSONSerializer());
         jsonObjectMapper.registerModule(jsonModule);
     }
 

src/main/java/net/floodlightcontroller/core/web/serializers/DeviceAttachmentPointJSONSerializer.java

-package net.floodlightcontroller.core.web.serializers;
-
-import java.io.IOException;
-
-import net.floodlightcontroller.devicemanager.DeviceAttachmentPoint;
-
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.JsonSerializer;
-import org.codehaus.jackson.map.SerializerProvider;
-
-public class DeviceAttachmentPointJSONSerializer extends JsonSerializer<DeviceAttachmentPoint> {
-    @Override
-    public void serialize(DeviceAttachmentPoint dap, JsonGenerator jgen, SerializerProvider sp) 
-            throws IOException, JsonProcessingException {
-        jgen.writeStartObject();
-        jgen.writeStringField("switch", dap.getSwitchPort().getSw().getStringId());
-        jgen.writeNumberField("port", dap.getSwitchPort().getPort());
-        jgen.writeStringField("last-seen", dap.getLastSeen().toString());
-        jgen.writeEndObject();
-    }
-    
-    @Override
-    public Class<DeviceAttachmentPoint> handledType() {
-        return DeviceAttachmentPoint.class;
-    }
-}

src/main/java/net/floodlightcontroller/core/web/serializers/DeviceJSONSerializer.java

-package net.floodlightcontroller.core.web.serializers;
-
-import java.io.IOException;
-
-import net.floodlightcontroller.devicemanager.Device;
-import net.floodlightcontroller.devicemanager.DeviceAttachmentPoint;
-import net.floodlightcontroller.devicemanager.DeviceNetworkAddress;
-
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.JsonSerializer;
-import org.codehaus.jackson.map.SerializerProvider;
-
-public class DeviceJSONSerializer extends JsonSerializer<Device> {
-
-    @Override
-    public void serialize(Device device, JsonGenerator jgen, SerializerProvider sp)
-            throws IOException, JsonProcessingException {
-        jgen.writeStartObject();
-        jgen.writeStringField("last-seen", device.getLastSeen().toString());
-        if (device.getVlanId() != null)
-            jgen.writeNumberField("vlan", device.getVlanId());
-        else
-            jgen.writeNullField("vlan");
-        jgen.writeArrayFieldStart("network-addresses");
-        for (DeviceNetworkAddress dna : device.getNetworkAddresses()) {
-            sp.defaultSerializeValue(dna, jgen);
-        }
-        jgen.writeEndArray();
-        jgen.writeArrayFieldStart("attachment-points");
-        for (DeviceAttachmentPoint dap : device.getAttachmentPoints()) {
-            sp.defaultSerializeValue(dap, jgen);
-        }
-        jgen.writeEndArray();
-        jgen.writeEndObject();
-    }
-
-    @Override
-    public Class<Device> handledType() {
-        return Device.class;
-    }
-}

src/main/java/net/floodlightcontroller/core/web/serializers/DeviceNetworkAddressJSONSerializer.java

-package net.floodlightcontroller.core.web.serializers;
-
-import java.io.IOException;
-
-import net.floodlightcontroller.devicemanager.DeviceNetworkAddress;
-import net.floodlightcontroller.packet.IPv4;
-
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.JsonProcessingException;
-import org.codehaus.jackson.map.JsonSerializer;
-import org.codehaus.jackson.map.SerializerProvider;
-
-public class DeviceNetworkAddressJSONSerializer extends JsonSerializer<DeviceNetworkAddress> {
-
-    @Override
-    public void serialize(DeviceNetworkAddress dna, JsonGenerator jgen, SerializerProvider sp)
-                                  throws IOException, JsonProcessingException {
-        jgen.writeStartObject();
-        jgen.writeStringField("ip", IPv4.fromIPv4Address(dna.getNetworkAddress()));
-        jgen.writeStringField("last-seen", dna.getLastSeen().toString());
-        jgen.writeEndObject();
-    }
-    
-    @Override
-    public Class<DeviceNetworkAddress> handledType() {
-        return DeviceNetworkAddress.class;
-    }
-}

src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerWebRoutable.java

-package net.floodlightcontroller.devicemanager.internal;
-
-import org.restlet.Context;
-import org.restlet.Restlet;
-import org.restlet.routing.Router;
-
-import net.floodlightcontroller.restserver.RestletRoutable;
-
-/**
- * Restlet Routable to handle DeviceManager API
- * @author alexreimers
- *
- */
-public class DeviceManagerWebRoutable implements RestletRoutable {
-
-    @Override
-    public Restlet getRestlet(Context context) {
-        Router router = new Router(context);
-        router.attach("/device/{device}/json", DeviceResource.class);
-        return router;
-    }
-
-    @Override
-    public String basePath() {
-        return "/wm/devicemanager";
-    }
-}