Remove some deprecated APIs and warnings from BatchOperationEntry
Change-Id: I44daf9646f6d2a60fd7c0ce96d6692ab8a9cdda2
diff --git a/core/api/src/main/java/org/onosproject/net/flow/BatchOperationEntry.java b/core/api/src/main/java/org/onosproject/net/flow/BatchOperationEntry.java
index 7e0d5b5..e47f420 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/BatchOperationEntry.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/BatchOperationEntry.java
@@ -48,16 +48,6 @@
*
* @return the target object of this operation
*/
- @Deprecated
- public U getTarget() {
- return target();
- }
-
- /**
- * Gets the target object of this operation.
- *
- * @return the target object of this operation
- */
public U target() {
return target;
}
@@ -67,16 +57,6 @@
*
* @return the operator of this operation
*/
- @Deprecated
- public T getOperator() {
- return operator();
- }
-
- /**
- * Gets the operator of this operation.
- *
- * @return the operator of this operation
- */
public T operator() {
return operator;
}
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 3641895..97a2b68 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
@@ -200,18 +200,18 @@
FlowRuleOperations.Builder fopsBuilder = FlowRuleOperations.builder();
batch.getOperations().stream().forEach(op -> {
- switch (op.getOperator()) {
+ switch (op.operator()) {
case ADD:
- fopsBuilder.add(op.getTarget());
+ fopsBuilder.add(op.target());
break;
case REMOVE:
- fopsBuilder.remove(op.getTarget());
+ fopsBuilder.remove(op.target());
break;
case MODIFY:
- fopsBuilder.modify(op.getTarget());
+ fopsBuilder.modify(op.target());
break;
default:
- log.warn("Unknown flow operation operator: {}", op.getOperator());
+ log.warn("Unknown flow operation operator: {}", op.operator());
}
}
@@ -438,25 +438,25 @@
// Request has been forwarded to MASTER Node, and was
request.ops().stream().forEach(
op -> {
- switch (op.getOperator()) {
+ switch (op.operator()) {
case ADD:
eventDispatcher.post(
new FlowRuleEvent(
FlowRuleEvent.Type.RULE_ADD_REQUESTED,
- op.getTarget()));
+ op.target()));
break;
case REMOVE:
eventDispatcher.post(
new FlowRuleEvent(
FlowRuleEvent.Type.RULE_REMOVE_REQUESTED,
- op.getTarget()));
+ op.target()));
break;
case MODIFY:
//TODO: do something here when the time comes.
break;
default:
- log.warn("Unknown flow operation operator: {}", op.getOperator());
+ log.warn("Unknown flow operation operator: {}", op.operator());
}
}
);
diff --git a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
index 5da8657..e854201 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
@@ -384,7 +384,7 @@
log.warn("Failed to storeBatch: {}", e.getMessage());
Set<FlowRule> allFailures = operation.getOperations().stream()
- .map(op -> op.getTarget())
+ .map(op -> op.target())
.collect(Collectors.toSet());
notifyDelegate(FlowRuleBatchEvent.completed(
@@ -418,9 +418,9 @@
return operation.getOperations().stream().map(
op -> {
StoredFlowEntry entry;
- switch (op.getOperator()) {
+ switch (op.operator()) {
case ADD:
- entry = new DefaultFlowEntry(op.getTarget());
+ entry = new DefaultFlowEntry(op.target());
// always add requested FlowRule

// Note: 2 equal FlowEntry may have different treatment
flowTable.remove(entry.deviceId(), entry);
@@ -438,7 +438,7 @@
//TODO: figure this out at some point
break;
default:
- log.warn("Unknown flow operation operator: {}", op.getOperator());
+ log.warn("Unknown flow operation operator: {}", op.operator());
}
return null;
}
@@ -712,15 +712,15 @@
ops.stream().forEach(
op -> {
- final FlowRule entry = op.getTarget();
+ final FlowRule entry = op.target();
final FlowId id = entry.id();
ImmutableList<StoredFlowEntry> original = backupFlowTable.get(id);
List<StoredFlowEntry> list = new ArrayList<>();
if (original != null) {
list.addAll(original);
}
- list.remove(op.getTarget());
- if (op.getOperator() == FlowRuleOperation.ADD) {
+ list.remove(op.target());
+ if (op.operator() == FlowRuleOperation.ADD) {
list.add((StoredFlowEntry) entry);
}
diff --git a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleFlowRuleStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleFlowRuleStore.java
index 177618d..c7dc390 100644
--- a/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleFlowRuleStore.java
+++ b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleFlowRuleStore.java
@@ -265,8 +265,8 @@
List<FlowRuleBatchEntry> toRemove = new ArrayList<>();
for (FlowRuleBatchEntry entry : operation.getOperations()) {
- final FlowRule flowRule = entry.getTarget();
- if (entry.getOperator().equals(FlowRuleOperation.ADD)) {
+ final FlowRule flowRule = entry.target();
+ if (entry.operator().equals(FlowRuleOperation.ADD)) {
if (!getFlowEntries(flowRule.deviceId(), flowRule.id()).contains(flowRule)) {
storeFlowRule(flowRule);
toAdd.add(entry);