Drop "I" prefix from IAction, IMatch, IMatchActionService. (ONOS-1879)
Change-Id: I6b6e0cc98570d5b95a46a9f204cf330f4cf63273
diff --git a/src/main/java/net/onrc/onos/core/matchaction/MatchAction.java b/src/main/java/net/onrc/onos/core/matchaction/MatchAction.java
index d31ced8..2ff3299 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/MatchAction.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/MatchAction.java
@@ -5,9 +5,9 @@
import net.floodlightcontroller.util.MACAddress;
import net.onrc.onos.api.batchoperation.BatchOperationTarget;
-import net.onrc.onos.core.matchaction.action.IAction;
+import net.onrc.onos.core.matchaction.action.Action;
import net.onrc.onos.core.matchaction.action.OutputAction;
-import net.onrc.onos.core.matchaction.match.IMatch;
+import net.onrc.onos.core.matchaction.match.Match;
import net.onrc.onos.core.matchaction.match.PacketMatch;
import net.onrc.onos.core.util.Dpid;
import net.onrc.onos.core.util.IPv4;
@@ -20,19 +20,19 @@
public class MatchAction implements BatchOperationTarget {
protected final MatchActionId id;
protected SwitchPort port;
- protected List<IMatch> matches;
- protected List<IAction> actions;
+ protected List<Match> matches;
+ protected List<Action> actions;
/**
* Constructor.
*
* @param id ID for this MatchAction object.
* @param port Switch DPID
- * @param matches The list of IMatch objects as match condition on the port.
- * @param actions The list of IAction objects as actions on the switch.
+ * @param matches The list of Match objects as match condition on the port.
+ * @param actions The list of Action objects as actions on the switch.
*/
- public MatchAction(String id, SwitchPort port, List<IMatch> matches,
- List<IAction> actions) {
+ public MatchAction(String id, SwitchPort port, List<Match> matches,
+ List<Action> actions) {
this.id = new MatchActionId(id);
this.port = port;
this.matches = matches;
@@ -59,8 +59,8 @@
IPv4 srcIp, IPv4 dstIp, PortNumber dstPort) {
// CHECKSTYLE:ON
this(id, new SwitchPort(dpid, srcPort),
- Arrays.asList((IMatch) new PacketMatch(srcMac, dstMac, srcIp, dstIp)),
- Arrays.asList((IAction) new OutputAction(dstPort)));
+ Arrays.asList((Match) new PacketMatch(srcMac, dstMac, srcIp, dstIp)),
+ Arrays.asList((Action) new OutputAction(dstPort)));
}
public MatchActionId getId() {
@@ -81,7 +81,7 @@
*
* @return The traffic filter.
*/
- public List<IMatch> getMatches() {
+ public List<Match> getMatches() {
return matches;
}
@@ -90,7 +90,7 @@
*
* @return The list of actions.
*/
- public List<IAction> getActions() {
+ public List<Action> getActions() {
return actions;
}
}
diff --git a/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java b/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java
index cae8df2..2630879 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/MatchActionModule.java
@@ -10,7 +10,7 @@
* <p>
* TODO: Make all methods thread-safe
*/
-public class MatchActionModule implements IMatchActionService {
+public class MatchActionModule implements MatchActionService {
@Override
public boolean addMatchAction(MatchAction matchAction) {
diff --git a/src/main/java/net/onrc/onos/core/matchaction/IMatchActionService.java b/src/main/java/net/onrc/onos/core/matchaction/MatchActionService.java
similarity index 97%
rename from src/main/java/net/onrc/onos/core/matchaction/IMatchActionService.java
rename to src/main/java/net/onrc/onos/core/matchaction/MatchActionService.java
index 1ff8e28..02a7ef3 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/IMatchActionService.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/MatchActionService.java
@@ -8,7 +8,7 @@
/**
* An interface for the match-action service.
*/
-public interface IMatchActionService {
+public interface MatchActionService {
/**
* Adds a new match-action entry.
*
diff --git a/src/main/java/net/onrc/onos/core/matchaction/action/IAction.java b/src/main/java/net/onrc/onos/core/matchaction/action/Action.java
similarity index 77%
rename from src/main/java/net/onrc/onos/core/matchaction/action/IAction.java
rename to src/main/java/net/onrc/onos/core/matchaction/action/Action.java
index b381f85..373e4c8 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/action/IAction.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/action/Action.java
@@ -3,6 +3,6 @@
/**
* An interface of action objects.
*/
-public interface IAction {
+public interface Action {
}
diff --git a/src/main/java/net/onrc/onos/core/matchaction/action/ModifyLambdaAction.java b/src/main/java/net/onrc/onos/core/matchaction/action/ModifyLambdaAction.java
index 5399de3..ab62f5f 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/action/ModifyLambdaAction.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/action/ModifyLambdaAction.java
@@ -6,7 +6,7 @@
* This class does not have a switch ID. The switch ID is handled by
* MatchAction, IFlow or Intent class.
*/
-public class ModifyLambdaAction implements IAction {
+public class ModifyLambdaAction implements Action {
protected int lambda;
/**
diff --git a/src/main/java/net/onrc/onos/core/matchaction/action/OutputAction.java b/src/main/java/net/onrc/onos/core/matchaction/action/OutputAction.java
index f570ea8..6c2e782 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/action/OutputAction.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/action/OutputAction.java
@@ -8,7 +8,7 @@
* This class does not have a switch ID. The switch ID is handled by
* MatchAction, IFlow or Intent class.
*/
-public class OutputAction implements IAction {
+public class OutputAction implements Action {
protected PortNumber portNumber;
/**
diff --git a/src/main/java/net/onrc/onos/core/matchaction/match/IMatch.java b/src/main/java/net/onrc/onos/core/matchaction/match/Match.java
similarity index 78%
rename from src/main/java/net/onrc/onos/core/matchaction/match/IMatch.java
rename to src/main/java/net/onrc/onos/core/matchaction/match/Match.java
index 904e337..6a3dabe 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/match/IMatch.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/match/Match.java
@@ -3,6 +3,6 @@
/**
* An interface for match objects.
*/
-public interface IMatch {
+public interface Match {
}
diff --git a/src/main/java/net/onrc/onos/core/matchaction/match/OpticalMatch.java b/src/main/java/net/onrc/onos/core/matchaction/match/OpticalMatch.java
index 00bae0e..afd9de0 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/match/OpticalMatch.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/match/OpticalMatch.java
@@ -6,7 +6,7 @@
* This class does not have a switch ID and a port number. They are handled by
* MatchAction, IFlow or Intent class.
*/
-public class OpticalMatch implements IMatch {
+public class OpticalMatch implements Match {
// Match fields
protected Integer srcLambda;
diff --git a/src/main/java/net/onrc/onos/core/matchaction/match/PacketMatch.java b/src/main/java/net/onrc/onos/core/matchaction/match/PacketMatch.java
index 3584038..39d3c09 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/match/PacketMatch.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/match/PacketMatch.java
@@ -10,7 +10,7 @@
* This class does not have a switch ID and a port number. They are handled by
* MatchAction, IFlow or Intent class.
*/
-public class PacketMatch implements IMatch {
+public class PacketMatch implements Match {
// Match fields
protected MACAddress srcMacAddress;