Remove deprecated RouteService APIs.
The goal is to clean up the interfaces a little bit in preparation for
a major RouteService refactoring that is coming.
Change-Id: Ifbde9a507dd0dc3cddcd7fa1c02c426dad386e5f
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java
index 267bb69..f057942 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/routing/impl/RouteManager.java
@@ -26,7 +26,6 @@
import org.onlab.packet.IpPrefix;
import org.onosproject.cluster.ClusterService;
import org.onosproject.incubator.net.routing.InternalRouteEvent;
-import org.onosproject.incubator.net.routing.NextHop;
import org.onosproject.incubator.net.routing.ResolvedRoute;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteAdminService;
@@ -48,7 +47,6 @@
import javax.annotation.concurrent.GuardedBy;
import java.util.Collection;
-import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
@@ -59,7 +57,6 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadFactory;
-import java.util.function.Function;
import java.util.stream.Collectors;
import static java.util.concurrent.Executors.newSingleThreadExecutor;
@@ -175,14 +172,6 @@
}
}
- @Override
- public Map<RouteTableId, Collection<Route>> getAllRoutes() {
- return routeStore.getRouteTables().stream()
- .collect(Collectors.toMap(Function.identity(),
- table -> (table == null) ?
- Collections.emptySet() : reformatRoutes(routeStore.getRoutes(table))));
- }
-
private Collection<Route> reformatRoutes(Collection<RouteSet> routeSets) {
return routeSets.stream().flatMap(r -> r.routes().stream()).collect(Collectors.toList());
}
@@ -214,30 +203,11 @@
}
@Override
- public Route longestPrefixMatch(IpAddress ip) {
- return longestPrefixLookup(ip)
- .map(ResolvedRoute::route)
- .orElse(null);
- }
-
- @Override
public Optional<ResolvedRoute> longestPrefixLookup(IpAddress ip) {
return resolvedRouteStore.longestPrefixMatch(ip);
}
@Override
- public Collection<Route> getRoutesForNextHop(IpAddress nextHop) {
- return routeStore.getRoutesForNextHop(nextHop);
- }
-
- @Override
- public Set<NextHop> getNextHops() {
- return routeStore.getNextHops().entrySet().stream()
- .map(entry -> new NextHop(entry.getKey(), entry.getValue()))
- .collect(Collectors.toSet());
- }
-
- @Override
public void update(Collection<Route> routes) {
synchronized (this) {
routes.forEach(route -> {
@@ -257,6 +227,13 @@
}
}
+ @Override
+ public Route longestPrefixMatch(IpAddress ip) {
+ return longestPrefixLookup(ip)
+ .map(ResolvedRoute::route)
+ .orElse(null);
+ }
+
private ResolvedRoute resolve(Route route) {
hostService.startMonitoringIp(route.nextHop());
Set<Host> hosts = hostService.getHostsByIp(route.nextHop());