Moved pure ONOS code in net.floodlightcontroller.linkdiscovery.web to onos package namespace
* Scope of internal class ExtractLink changed to public to allow access from TopoLinkServiceImpl.
diff --git a/src/main/java/net/floodlightcontroller/core/web/CoreWebRoutable.java b/src/main/java/net/floodlightcontroller/core/web/CoreWebRoutable.java
index bc02dba..95053bd 100644
--- a/src/main/java/net/floodlightcontroller/core/web/CoreWebRoutable.java
+++ b/src/main/java/net/floodlightcontroller/core/web/CoreWebRoutable.java
@@ -18,11 +18,11 @@
package net.floodlightcontroller.core.web;
import net.floodlightcontroller.core.module.ModuleLoaderResource;
-import net.floodlightcontroller.linkdiscovery.web.TopoLinksResource;
import net.floodlightcontroller.restserver.RestletRoutable;
import net.onrc.onos.ofcontroller.core.web.ClearFlowTableResource;
import net.onrc.onos.ofcontroller.core.web.TopoSwitchesResource;
import net.onrc.onos.ofcontroller.devicemanager.web.TopoDevicesResource;
+import net.onrc.onos.ofcontroller.linkdiscovery.web.TopoLinksResource;
import org.restlet.Context;
import org.restlet.Restlet;
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
index 156150d..a6c291f 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
@@ -229,7 +229,8 @@
return links;
}
- static class ExtractLink implements PipeFunction<PathPipe<Vertex>, Link> {
+ // FIXME Scope changed to public to allow access from TopoLinkServiceImpl. Move class definition to appropriate place.
+ static public class ExtractLink implements PipeFunction<PathPipe<Vertex>, Link> {
@Override
public Link compute(PathPipe<Vertex> pipe ) {
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/web/TopoLinksResource.java b/src/main/java/net/floodlightcontroller/linkdiscovery/web/TopoLinksResource.java
deleted file mode 100644
index 47a09f3..0000000
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/web/TopoLinksResource.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.floodlightcontroller.linkdiscovery.web;
-
-import java.util.List;
-import net.floodlightcontroller.routing.Link;
-import net.onrc.onos.ofcontroller.linkdiscovery.internal.TopoLinkServiceImpl;
-
-import org.restlet.resource.Get;
-import org.restlet.resource.ServerResource;
-
-public class TopoLinksResource extends ServerResource {
-
- @Get("json")
- public List<Link> retrieve() {
- TopoLinkServiceImpl impl = new TopoLinkServiceImpl();
-
- List<Link> retval = impl.getActiveLinks();
- return retval;
- }
-
-}