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/api/src/main/java/org/onosproject/net/flow/BatchOperationEntry.java

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 fc24775..7e0d5b5 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,7 +48,17 @@
      *
      * @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;
     }
 
@@ -57,7 +67,17 @@
      *
      * @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;
     }
 

core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchRequest.java

diff --git a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchRequest.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchRequest.java
index a0be81c..35db171 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchRequest.java
@@ -44,7 +44,7 @@
 
             @Override
             public FlowRule apply(FlowRuleBatchEntry input) {
-                return input.getTarget();
+                return input.target();
             }
         }).toList();
     }
@@ -55,7 +55,7 @@
 
                     @Override
                     public FlowRule apply(FlowRuleBatchEntry input) {
-                        return input.getTarget();
+                        return input.target();
                     }
                 }).toList();
     }