commit aba9d009c976ec10bf69504bafde4610513aa522
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu Jan 29 14:51:04 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Feb 03 00:35:23 2015 +0000
tree 64e475265292d4f154f208ae9ebc9ea2519ded0c
parent 0fb1c60fdf69fd6cbeb38ec010f34bda2631c1a0

Apply the naming convention to BatchOperationEntry

Resolve ONOS-889

Change-Id: I2001fabba138b9ff5be9a5943d3f020b4c38d195

core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java

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 44f6473..6d6cd9a 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
@@ -186,7 +186,7 @@
                 ArrayListMultimap.create();
         List<Future<CompletedBatchOperation>> futures = Lists.newArrayList();
         for (FlowRuleBatchEntry fbe : batch.getOperations()) {
-            final FlowRule f = fbe.getTarget();
+            final FlowRule f = fbe.target();
             perDeviceBatches.put(f.deviceId(), fbe);
         }
 
@@ -400,7 +400,7 @@
                 FlowRuleBatchOperation batchOperation = request.asBatchOperation();
 
                 FlowRuleProvider flowRuleProvider =
-                        getProvider(batchOperation.getOperations().get(0).getTarget().deviceId());
+                        getProvider(batchOperation.getOperations().get(0).target().deviceId());
                 final Future<CompletedBatchOperation> result =
                         flowRuleProvider.executeBatch(batchOperation);
                 futureService.submit(new Runnable() {
@@ -416,7 +416,7 @@
 
                             Set<FlowRule> failures = new HashSet<>(batchOperation.size());
                             for (FlowRuleBatchEntry op : batchOperation.getOperations()) {
-                                failures.add(op.getTarget());
+                                failures.add(op.target());
                             }
                             res = new CompletedBatchOperation(false, failures);
                             store.batchOperationComplete(FlowRuleBatchEvent.completed(request, res));
@@ -565,12 +565,12 @@
             log.debug("cleaning up batch");
             // TODO convert these into a batch?
             for (FlowRuleBatchEntry fbe : batches.values()) {
-                if (fbe.getOperator() == FlowRuleOperation.ADD ||
-                    fbe.getOperator() == FlowRuleOperation.MODIFY) {
-                    store.deleteFlowRule(fbe.getTarget());
-                } else if (fbe.getOperator() == FlowRuleOperation.REMOVE) {
-                    store.removeFlowRule(new DefaultFlowEntry(fbe.getTarget()));
-                    store.storeFlowRule(fbe.getTarget());
+                if (fbe.operator() == FlowRuleOperation.ADD ||
+                    fbe.operator() == FlowRuleOperation.MODIFY) {
+                    store.deleteFlowRule(fbe.target());
+                } else if (fbe.operator() == FlowRuleOperation.REMOVE) {
+                    store.removeFlowRule(new DefaultFlowEntry(fbe.target()));
+                    store.storeFlowRule(fbe.target());
                 }
             }
         }