| commit | f05c480aad2a33371257465de79f0d2260f2cdb9 | [log] [tgz] |
|---|---|---|
| author | HIGUCHI Yuta <y-higuchi@onlab.us> | Mon Jun 17 11:15:50 2013 -0700 |
| committer | HIGUCHI Yuta <y-higuchi@onlab.us> | Mon Jun 17 15:39:39 2013 -0700 |
| tree | e7d3d970ffe9b7e306aa0250294dd3c313efb648 | |
| parent | b1d3e51a5e79ee37bfa4c9db58c1af612b35bc5f [diff] |
Moce ONOS Service Impl to core package
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java b/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java index f3de81d..ef625a8 100644 --- a/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java +++ b/src/main/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImpl.java
@@ -221,8 +221,7 @@ return links; } - // 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> { + static class ExtractLink implements PipeFunction<PathPipe<Vertex>, Link> { @Override public Link compute(PathPipe<Vertex> pipe ) {
diff --git a/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/TopoLinkServiceImpl.java b/src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoLinkServiceImpl.java similarity index 96% rename from src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/TopoLinkServiceImpl.java rename to src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoLinkServiceImpl.java index a9b54b8..4a0c35c 100644 --- a/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/TopoLinkServiceImpl.java +++ b/src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoLinkServiceImpl.java
@@ -1,4 +1,4 @@ -package net.onrc.onos.ofcontroller.linkdiscovery.internal; +package net.onrc.onos.ofcontroller.core.internal; import java.util.ArrayList; import java.util.List;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/web/TopoLinksResource.java b/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/web/TopoLinksResource.java index b692517..b48ebde 100644 --- a/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/web/TopoLinksResource.java +++ b/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/web/TopoLinksResource.java
@@ -2,7 +2,7 @@ import java.util.List; import net.floodlightcontroller.routing.Link; -import net.onrc.onos.ofcontroller.linkdiscovery.internal.TopoLinkServiceImpl; +import net.onrc.onos.ofcontroller.core.internal.TopoLinkServiceImpl; import org.restlet.resource.Get; import org.restlet.resource.ServerResource;