Drop "I" prefix from IBatchOperationTarget, IFlow and IFlowManagerService.
- This task is a part of ONOS-1687.
Change-Id: I24d14b5ecf4152bfb3f239c7b03725302bc307dd
diff --git a/src/main/java/net/onrc/onos/api/flowmanager/IFlow.java b/src/main/java/net/onrc/onos/api/flowmanager/Flow.java
similarity index 88%
rename from src/main/java/net/onrc/onos/api/flowmanager/IFlow.java
rename to src/main/java/net/onrc/onos/api/flowmanager/Flow.java
index fbd6b2b..bd1c619 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/IFlow.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/Flow.java
@@ -1,6 +1,6 @@
package net.onrc.onos.api.flowmanager;
-import net.onrc.onos.api.batchoperation.IBatchOperationTarget;
+import net.onrc.onos.api.batchoperation.BatchOperationTarget;
import net.onrc.onos.core.matchaction.MatchActionPlan;
import net.onrc.onos.core.matchaction.match.IMatch;
@@ -11,7 +11,7 @@
* The flow objects (eg. path, tree, disjoint-paths, etc.) must implement this
* interface.
*/
-public interface IFlow extends IBatchOperationTarget {
+public interface Flow extends BatchOperationTarget {
/**
* Gets ID for this flow object.
*
diff --git a/src/main/java/net/onrc/onos/api/flowmanager/FlowBatchOperation.java b/src/main/java/net/onrc/onos/api/flowmanager/FlowBatchOperation.java
index 42eb81d..71d5378 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/FlowBatchOperation.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/FlowBatchOperation.java
@@ -29,9 +29,9 @@
* @param flow the flow to be added
* @return the FlowBatchOperation object if succeeded, null otherwise
*/
- public FlowBatchOperation addAddFlowOperation(IFlow flow) {
+ public FlowBatchOperation addAddFlowOperation(Flow flow) {
return (null == super.addOperation(
- new BatchOperationEntry<Operator, IFlow>(Operator.ADD, flow)))
+ new BatchOperationEntry<Operator, Flow>(Operator.ADD, flow)))
? null : this;
}
diff --git a/src/main/java/net/onrc/onos/api/flowmanager/FlowId.java b/src/main/java/net/onrc/onos/api/flowmanager/FlowId.java
index a0ebd2d..4fef792 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/FlowId.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/FlowId.java
@@ -1,11 +1,11 @@
package net.onrc.onos.api.flowmanager;
-import net.onrc.onos.api.batchoperation.IBatchOperationTarget;
+import net.onrc.onos.api.batchoperation.BatchOperationTarget;
/**
* Represents ID for IFlow objects.
*/
-public class FlowId implements IBatchOperationTarget {
+public class FlowId implements BatchOperationTarget {
private final String value;
/**
diff --git a/src/main/java/net/onrc/onos/api/flowmanager/IFlowManagerService.java b/src/main/java/net/onrc/onos/api/flowmanager/FlowManagerService.java
similarity index 94%
rename from src/main/java/net/onrc/onos/api/flowmanager/IFlowManagerService.java
rename to src/main/java/net/onrc/onos/api/flowmanager/FlowManagerService.java
index efd7b98..a87eb65 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/IFlowManagerService.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/FlowManagerService.java
@@ -14,14 +14,14 @@
* <p>
* TODO: add more getter with filter for IFlow objects.
*/
-public interface IFlowManagerService {
+public interface FlowManagerService {
/**
* Adds IFlow object, calculates match-action plan and executes it.
*
* @param flow IFlow object to be added
* @return true if succeeded, false otherwise
*/
- boolean addFlow(IFlow flow);
+ boolean addFlow(Flow flow);
/**
* Removes IFlow object, calculates match-action plan and executes it.
@@ -37,14 +37,14 @@
* @param id ID of IFlow object
* @return IFlow object if found, null otherwise
*/
- IFlow getFlow(FlowId id);
+ Flow getFlow(FlowId id);
/**
* Gets All IFlow objects.
*
* @return the collection of IFlow objects
*/
- Collection<IFlow> getFlows();
+ Collection<Flow> getFlows();
/**
* Executes batch operation of IFlow object.
diff --git a/src/main/java/net/onrc/onos/api/flowmanager/PathFlow.java b/src/main/java/net/onrc/onos/api/flowmanager/PathFlow.java
index 48053ef..787a11f 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/PathFlow.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/PathFlow.java
@@ -13,7 +13,7 @@
* TODO: Think this: Should this class be an abstract class? Is it enough to
* have only the PacketPathFlow and OpticalPathFlow classes?
*/
-public class PathFlow implements IFlow {
+public class PathFlow implements Flow {
protected final FlowId id;
protected IMatch match;
protected PortNumber ingressPort;
diff --git a/src/main/java/net/onrc/onos/api/flowmanager/SingleDstTreeFlow.java b/src/main/java/net/onrc/onos/api/flowmanager/SingleDstTreeFlow.java
index 473b7e8..58c5b38 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/SingleDstTreeFlow.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/SingleDstTreeFlow.java
@@ -17,7 +17,7 @@
* NOTE: This class might generate the MatchActionPlan which includes the MAC
* address modifications or other the label-switching-like schemes.
*/
-public class SingleDstTreeFlow implements IFlow {
+public class SingleDstTreeFlow implements Flow {
protected final FlowId id;
protected PacketMatch match;
protected Set<SwitchPort> ingressPorts;
diff --git a/src/main/java/net/onrc/onos/api/flowmanager/SingleSrcTreeFlow.java b/src/main/java/net/onrc/onos/api/flowmanager/SingleSrcTreeFlow.java
index 538315c..b9fdb88 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/SingleSrcTreeFlow.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/SingleSrcTreeFlow.java
@@ -13,7 +13,7 @@
* An IFlow object expressing the point-to-multipoints tree flow for the packet
* layer.
*/
-public class SingleSrcTreeFlow implements IFlow {
+public class SingleSrcTreeFlow implements Flow {
protected final FlowId id;
protected PacketMatch match;
protected SwitchPort ingressPort;