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/api/src/main/java/org/onosproject/incubator/net/routing/RouteService.java b/incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteService.java
index 4a298ba..c123dc3 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteService.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/routing/RouteService.java
@@ -20,9 +20,7 @@
import org.onosproject.event.ListenerService;
import java.util.Collection;
-import java.util.Map;
import java.util.Optional;
-import java.util.Set;
/**
* Unicast IP route service.
@@ -30,16 +28,6 @@
public interface RouteService extends ListenerService<RouteEvent, RouteListener> {
/**
- * Returns all routes for all route tables in the system.
- *
- * @return map of route table name to routes in that table
- * @deprecated in Kingfisher release. Use {@link #getRoutes(RouteTableId)}
- * instead.
- */
- @Deprecated
- Map<RouteTableId, Collection<Route>> getAllRoutes();
-
- /**
* Returns information about all routes in the given route table.
*
* @param id route table ID
@@ -55,6 +43,14 @@
Collection<RouteTableId> getRouteTables();
/**
+ * Performs a longest prefix lookup on the given IP address.
+ *
+ * @param ip IP address to look up
+ * @return most specific matching route, if one exists
+ */
+ Optional<ResolvedRoute> longestPrefixLookup(IpAddress ip);
+
+ /**
* Performs a longest prefix match on the given IP address. The call will
* return the route with the most specific prefix that contains the given
* IP address.
@@ -66,30 +62,4 @@
*/
@Deprecated
Route longestPrefixMatch(IpAddress ip);
-
- /**
- * Performs a longest prefix lookup on the given IP address.
- *
- * @param ip IP address to look up
- * @return most specific matching route, if one exists
- */
- Optional<ResolvedRoute> longestPrefixLookup(IpAddress ip);
-
- /**
- * Returns the routes for the given next hop.
- *
- * @param nextHop next hop IP address
- * @return routes for this next hop
- */
- @Deprecated
- Collection<Route> getRoutesForNextHop(IpAddress nextHop);
-
- /**
- * Returns all next hops in the route store.
- *
- * @return set of next hops
- */
- @Deprecated
- Set<NextHop> getNextHops();
-
}