Removal of deprecated APIs
- OchSignal constructor
- unfiltered connect point methods in single point to multi point intents
- useBackup() method from disjoint paths
- ChannelAdapter class
- getLastUpdatedInstant() method from cluster store
- switchWorkingPath() method from protection config behaviour
- getVersion() method from partition
- getFlowRulesById() method from flow rule service
Change-Id: I5c6c2f31725f7e7e44ac2abb18ce3fb96b09d93e
diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
index 1af7c82..99ee528 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
@@ -296,13 +296,6 @@
@Override
public void removeFlowRulesById(ApplicationId id) {
checkPermission(FLOWRULE_WRITE);
- removeFlowRules(Iterables.toArray(getFlowRulesById(id), FlowRule.class));
- }
-
- @Deprecated
- @Override
- public Iterable<FlowRule> getFlowRulesById(ApplicationId id) {
- checkPermission(FLOWRULE_READ);
Set<FlowRule> flowEntries = Sets.newHashSet();
for (Device d : deviceService.getDevices()) {
@@ -312,7 +305,7 @@
}
}
}
- return flowEntries;
+ removeFlowRules(Iterables.toArray(flowEntries, FlowRule.class));
}
@Override
diff --git a/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
index f4549c5..67ed692 100644
--- a/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
@@ -420,16 +420,6 @@
}
@Test
- public void getByAppId() {
- FlowRule f1 = flowRule(1, 1);
- FlowRule f2 = flowRule(2, 2);
- mgr.applyFlowRules(f1, f2);
-
- assertTrue("should have two rules",
- Lists.newLinkedList(mgr.getFlowRulesById(appId)).size() == 2);
- }
-
- @Test
public void removeByAppId() {
FlowRule f1 = flowRule(1, 1);
FlowRule f2 = flowRule(2, 2);
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/MockFlowRuleService.java b/core/net/src/test/java/org/onosproject/net/intent/impl/MockFlowRuleService.java
index 21271b6..31cebe0 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/MockFlowRuleService.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/MockFlowRuleService.java
@@ -96,13 +96,6 @@
}
@Override
- public Iterable<FlowRule> getFlowRulesById(ApplicationId id) {
- return flows.stream()
- .filter(flow -> flow.appId() == id.id())
- .collect(Collectors.toList());
- }
-
- @Override
public Iterable<FlowRule> getFlowRulesByGroupId(ApplicationId appId, short groupId) {
return flows.stream()
.filter(flow -> flow.appId() == appId.id() && flow.groupId().id() == groupId)