Drop "I" prefix from IAction, IMatch, IMatchActionService. (ONOS-1879)
Change-Id: I6b6e0cc98570d5b95a46a9f204cf330f4cf63273
diff --git a/src/main/java/net/onrc/onos/api/flowmanager/Flow.java b/src/main/java/net/onrc/onos/api/flowmanager/Flow.java
index bd1c619..50c9d16 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/Flow.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/Flow.java
@@ -2,7 +2,7 @@
import net.onrc.onos.api.batchoperation.BatchOperationTarget;
import net.onrc.onos.core.matchaction.MatchActionPlan;
-import net.onrc.onos.core.matchaction.match.IMatch;
+import net.onrc.onos.core.matchaction.match.Match;
/**
* An interface class to define flow object which is managed by
@@ -24,7 +24,7 @@
*
* @return a traffic filter for this flow object.
*/
- public IMatch getMatch();
+ public Match getMatch();
/**
* Compiles this object to MatchAction plan.
diff --git a/src/main/java/net/onrc/onos/api/flowmanager/OpticalPathFlow.java b/src/main/java/net/onrc/onos/api/flowmanager/OpticalPathFlow.java
index 00a4785..1b37d7f 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/OpticalPathFlow.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/OpticalPathFlow.java
@@ -3,7 +3,7 @@
import java.util.List;
import net.onrc.onos.core.matchaction.MatchActionPlan;
-import net.onrc.onos.core.matchaction.action.IAction;
+import net.onrc.onos.core.matchaction.action.Action;
import net.onrc.onos.core.util.PortNumber;
/**
@@ -21,11 +21,11 @@
* @param id ID for this new IFlow object.
* @param inPort Ingress port number at the ingress edge node.
* @param path Path between ingress and egress edge node.
- * @param actions The list of IAction objects at the egress edge node.
+ * @param actions The list of Action objects at the egress edge node.
* @param lambda The lambda to be used throughout the path.
*/
public OpticalPathFlow(String id,
- PortNumber inPort, Path path, List<IAction> actions, int lambda) {
+ PortNumber inPort, Path path, List<Action> actions, int lambda) {
super(id, null, inPort, path, actions);
this.lambda = lambda;
// TODO Auto-generated constructor stub
diff --git a/src/main/java/net/onrc/onos/api/flowmanager/PacketPathFlow.java b/src/main/java/net/onrc/onos/api/flowmanager/PacketPathFlow.java
index 087ef47..5f3aa31 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/PacketPathFlow.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/PacketPathFlow.java
@@ -3,7 +3,7 @@
import java.util.List;
import net.onrc.onos.core.matchaction.MatchActionPlan;
-import net.onrc.onos.core.matchaction.action.IAction;
+import net.onrc.onos.core.matchaction.action.Action;
import net.onrc.onos.core.matchaction.match.PacketMatch;
import net.onrc.onos.core.util.PortNumber;
@@ -23,12 +23,12 @@
* @param match Match object at the source node of the path.
* @param inPort Ingress port number at the ingress edge node.
* @param path Path between ingress and egress edge node.
- * @param edgeActions The list of IAction objects at the egress edge node.
+ * @param edgeActions The list of Action objects at the egress edge node.
* @param hardTimeout hard-timeout value.
* @param idleTimeout idle-timeout value.
*/
public PacketPathFlow(String id,
- PacketMatch match, PortNumber inPort, Path path, List<IAction> edgeActions,
+ PacketMatch match, PortNumber inPort, Path path, List<Action> edgeActions,
int hardTimeout, int idleTimeout) {
super(id, match, inPort, path, edgeActions);
this.hardTimeout = hardTimeout;
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 787a11f..b09d8bf 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/PathFlow.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/PathFlow.java
@@ -3,8 +3,8 @@
import java.util.List;
import net.onrc.onos.core.matchaction.MatchActionPlan;
-import net.onrc.onos.core.matchaction.action.IAction;
-import net.onrc.onos.core.matchaction.match.IMatch;
+import net.onrc.onos.core.matchaction.action.Action;
+import net.onrc.onos.core.matchaction.match.Match;
import net.onrc.onos.core.util.PortNumber;
/**
@@ -15,10 +15,10 @@
*/
public class PathFlow implements Flow {
protected final FlowId id;
- protected IMatch match;
+ protected Match match;
protected PortNumber ingressPort;
protected Path path;
- protected List<IAction> egressActions;
+ protected List<Action> egressActions;
/**
* Constructor.
@@ -28,10 +28,10 @@
* @param ingressPort The ingress port number at the ingress node of the
* path.
* @param path Path between ingress and egress edge node.
- * @param egressActions The list of IAction objects at the egress edge node.
+ * @param egressActions The list of Action objects at the egress edge node.
*/
public PathFlow(String id,
- IMatch match, PortNumber ingressPort, Path path, List<IAction> egressActions) {
+ Match match, PortNumber ingressPort, Path path, List<Action> egressActions) {
this.id = new FlowId(id);
this.match = match;
this.ingressPort = ingressPort;
@@ -45,7 +45,7 @@
}
@Override
- public IMatch getMatch() {
+ public Match getMatch() {
return match;
}
@@ -74,11 +74,11 @@
}
/**
- * Gets the list of IAction objects at the egress edge node.
+ * Gets the list of Action objects at the egress edge node.
*
- * @return The list of IAction objects at the egress edge node.
+ * @return The list of Action objects at the egress edge node.
*/
- public List<IAction> getEgressActions() {
+ public List<Action> getEgressActions() {
return egressActions;
}
}