Fix checkstyle whitespace issues - WHITESPACE ONLY
Change-Id: Ic205c1afd639c6008d61d9de95cb764eeb6238ca
diff --git a/src/main/java/net/onrc/onos/core/util/FlowEntry.java b/src/main/java/net/onrc/onos/core/util/FlowEntry.java
index fb5e3a3..0204590 100644
--- a/src/main/java/net/onrc/onos/core/util/FlowEntry.java
+++ b/src/main/java/net/onrc/onos/core/util/FlowEntry.java
@@ -6,25 +6,25 @@
/**
* The class representing the Flow Entry.
- *
+ * <p/>
* NOTE: The specification is incomplete. E.g., the entry needs to
* support multiple in-ports and multiple out-ports.
*/
public class FlowEntry {
- private FlowId flowId; // FlowID of the Flow Entry
- private FlowEntryId flowEntryId; // The Flow Entry ID
- private int idleTimeout; // The Flow idle timeout
- private int hardTimeout; // The Flow hard timeout
- private int priority; // The Flow priority
- private FlowEntryMatch flowEntryMatch; // The Flow Entry Match
- private FlowEntryActions flowEntryActions; // The Flow Entry Actions
- private Dpid dpid; // The Switch DPID
- private Port inPort; // The Switch incoming port. Used only
- // when the entry is used to return
- // Shortest Path computation.
- private Port outPort; // The Switch outgoing port. Used only
- // when the entry is used to return
- // Shortest Path computation.
+ private FlowId flowId; // FlowID of the Flow Entry
+ private FlowEntryId flowEntryId; // The Flow Entry ID
+ private int idleTimeout; // The Flow idle timeout
+ private int hardTimeout; // The Flow hard timeout
+ private int priority; // The Flow priority
+ private FlowEntryMatch flowEntryMatch; // The Flow Entry Match
+ private FlowEntryActions flowEntryActions; // The Flow Entry Actions
+ private Dpid dpid; // The Switch DPID
+ private Port inPort; // The Switch incoming port. Used only
+ // when the entry is used to return
+ // Shortest Path computation.
+ private Port outPort; // The Switch outgoing port. Used only
+ // when the entry is used to return
+ // Shortest Path computation.
private FlowEntryUserState flowEntryUserState; // The Flow Entry User state
private FlowEntrySwitchState flowEntrySwitchState; // The Flow Entry Switch state
// The Flow Entry Error state (if FlowEntrySwitchState is FE_SWITCH_FAILED)
@@ -34,88 +34,88 @@
* Default constructor.
*/
public FlowEntry() {
- // TODO: Test code
- /*
- MACAddress mac = MACAddress.valueOf("01:02:03:04:05:06");
- IPv4 ipv4 = new IPv4("1.2.3.4");
- IPv4Net ipv4net = new IPv4Net("5.6.7.0/24");
+ // TODO: Test code
+ /*
+ MACAddress mac = MACAddress.valueOf("01:02:03:04:05:06");
+ IPv4 ipv4 = new IPv4("1.2.3.4");
+ IPv4Net ipv4net = new IPv4Net("5.6.7.0/24");
- flowEntryMatch = new FlowEntryMatch();
- flowEntryMatch.enableInPort(new Port((short)10));
- flowEntryMatch.enableSrcMac(mac);
- flowEntryMatch.enableDstMac(mac);
- flowEntryMatch.enableVlanId((short)20);
- flowEntryMatch.enableVlanPriority((byte)30);
- flowEntryMatch.enableEthernetFrameType((short)40);
- flowEntryMatch.enableIpToS((byte)50);
- flowEntryMatch.enableIpProto((byte)60);
- flowEntryMatch.enableSrcIPv4Net(ipv4net);
- flowEntryMatch.enableDstIPv4Net(ipv4net);
- flowEntryMatch.enableSrcTcpUdpPort((short)70);
- flowEntryMatch.enableDstTcpUdpPort((short)80);
+ flowEntryMatch = new FlowEntryMatch();
+ flowEntryMatch.enableInPort(new Port((short)10));
+ flowEntryMatch.enableSrcMac(mac);
+ flowEntryMatch.enableDstMac(mac);
+ flowEntryMatch.enableVlanId((short)20);
+ flowEntryMatch.enableVlanPriority((byte)30);
+ flowEntryMatch.enableEthernetFrameType((short)40);
+ flowEntryMatch.enableIpToS((byte)50);
+ flowEntryMatch.enableIpProto((byte)60);
+ flowEntryMatch.enableSrcIPv4Net(ipv4net);
+ flowEntryMatch.enableDstIPv4Net(ipv4net);
+ flowEntryMatch.enableSrcTcpUdpPort((short)70);
+ flowEntryMatch.enableDstTcpUdpPort((short)80);
- FlowEntryAction action = null;
- FlowEntryActions actions = new FlowEntryActions();
+ FlowEntryAction action = null;
+ FlowEntryActions actions = new FlowEntryActions();
- action = new FlowEntryAction();
- action.setActionOutput(new Port((short)12));
- actions.addAction(action);
+ action = new FlowEntryAction();
+ action.setActionOutput(new Port((short)12));
+ actions.addAction(action);
- action = new FlowEntryAction();
- action.setActionOutputToController((short)13);
- actions.addAction(action);
+ action = new FlowEntryAction();
+ action.setActionOutputToController((short)13);
+ actions.addAction(action);
- action = new FlowEntryAction();
- action.setActionSetVlanId((short)14);
- actions.addAction(action);
+ action = new FlowEntryAction();
+ action.setActionSetVlanId((short)14);
+ actions.addAction(action);
- action = new FlowEntryAction();
- action.setActionSetVlanPriority((byte)15);
- actions.addAction(action);
+ action = new FlowEntryAction();
+ action.setActionSetVlanPriority((byte)15);
+ actions.addAction(action);
- action = new FlowEntryAction();
- action.setActionStripVlan(true);
- actions.addAction(action);
+ action = new FlowEntryAction();
+ action.setActionStripVlan(true);
+ actions.addAction(action);
- action = new FlowEntryAction();
- action.setActionSetEthernetSrcAddr(mac);
- actions.addAction(action);
+ action = new FlowEntryAction();
+ action.setActionSetEthernetSrcAddr(mac);
+ actions.addAction(action);
- action = new FlowEntryAction();
- action.setActionSetEthernetDstAddr(mac);
- actions.addAction(action);
+ action = new FlowEntryAction();
+ action.setActionSetEthernetDstAddr(mac);
+ actions.addAction(action);
- action = new FlowEntryAction();
- action.setActionSetIPv4SrcAddr(ipv4);
- actions.addAction(action);
+ action = new FlowEntryAction();
+ action.setActionSetIPv4SrcAddr(ipv4);
+ actions.addAction(action);
- action = new FlowEntryAction();
- action.setActionSetIPv4DstAddr(ipv4);
- actions.addAction(action);
+ action = new FlowEntryAction();
+ action.setActionSetIPv4DstAddr(ipv4);
+ actions.addAction(action);
- action = new FlowEntryAction();
- action.setActionSetIpToS((byte)16);
- actions.addAction(action);
+ action = new FlowEntryAction();
+ action.setActionSetIpToS((byte)16);
+ actions.addAction(action);
- action = new FlowEntryAction();
- action.setActionSetTcpUdpSrcPort((short)17);
- actions.addAction(action);
+ action = new FlowEntryAction();
+ action.setActionSetTcpUdpSrcPort((short)17);
+ actions.addAction(action);
- action = new FlowEntryAction();
- action.setActionSetTcpUdpDstPort((short)18);
- actions.addAction(action);
+ action = new FlowEntryAction();
+ action.setActionSetTcpUdpDstPort((short)18);
+ actions.addAction(action);
- action = new FlowEntryAction();
- action.setActionEnqueue(new Port((short)19), 20);
- actions.addAction(action);
+ action = new FlowEntryAction();
+ action.setActionEnqueue(new Port((short)19), 20);
+ actions.addAction(action);
- setFlowEntryActions(actions);
- */
+ setFlowEntryActions(actions);
+ */
- priority = FlowPath.PRIORITY_DEFAULT;
- flowEntryActions = new FlowEntryActions();
- flowEntryUserState = FlowEntryUserState.FE_USER_UNKNOWN;
- flowEntrySwitchState = FlowEntrySwitchState.FE_SWITCH_UNKNOWN;
+ priority = FlowPath.PRIORITY_DEFAULT;
+ flowEntryActions = new FlowEntryActions();
+ flowEntryUserState = FlowEntryUserState.FE_USER_UNKNOWN;
+ flowEntrySwitchState = FlowEntrySwitchState.FE_SWITCH_UNKNOWN;
}
/**
@@ -124,7 +124,9 @@
* @return the Flow ID.
*/
@JsonIgnore
- public FlowId flowId() { return flowId; }
+ public FlowId flowId() {
+ return flowId;
+ }
/**
* Set the Flow ID.
@@ -132,7 +134,7 @@
* @param flowId the Flow ID to set.
*/
public void setFlowId(FlowId flowId) {
- this.flowId = flowId;
+ this.flowId = flowId;
}
/**
@@ -142,9 +144,9 @@
*/
@JsonIgnore
public boolean isValidFlowId() {
- if (this.flowId == null)
- return false;
- return (this.flowId.isValid());
+ if (this.flowId == null)
+ return false;
+ return (this.flowId.isValid());
}
/**
@@ -153,7 +155,9 @@
* @return the Flow Entry ID.
*/
@JsonProperty("flowEntryId")
- public FlowEntryId flowEntryId() { return flowEntryId; }
+ public FlowEntryId flowEntryId() {
+ return flowEntryId;
+ }
/**
* Set the Flow Entry ID.
@@ -162,7 +166,7 @@
*/
@JsonProperty("flowEntryId")
public void setFlowEntryId(FlowEntryId flowEntryId) {
- this.flowEntryId = flowEntryId;
+ this.flowEntryId = flowEntryId;
}
/**
@@ -172,25 +176,27 @@
*/
@JsonIgnore
public boolean isValidFlowEntryId() {
- if (this.flowEntryId == null)
- return false;
- return (this.flowEntryId.isValid());
+ if (this.flowEntryId == null)
+ return false;
+ return (this.flowEntryId.isValid());
}
/**
* Get the flow idle timeout in seconds.
- *
+ * <p/>
* It should be an unsigned integer in the interval [0, 65535].
* If zero, the timeout is not set.
*
* @return the flow idle timeout.
*/
@JsonProperty("idleTimeout")
- public int idleTimeout() { return idleTimeout; }
+ public int idleTimeout() {
+ return idleTimeout;
+ }
/**
* Set the flow idle timeout in seconds.
- *
+ * <p/>
* It should be an unsigned integer in the interval [0, 65535].
* If zero, the timeout is not set.
*
@@ -198,23 +204,25 @@
*/
@JsonProperty("idleTimeout")
public void setIdleTimeout(int idleTimeout) {
- this.idleTimeout = 0xffff & idleTimeout;
+ this.idleTimeout = 0xffff & idleTimeout;
}
/**
* Get the flow hard timeout in seconds.
- *
+ * <p/>
* It should be an unsigned integer in the interval [0, 65535].
* If zero, the timeout is not set.
*
* @return the flow hard timeout.
*/
@JsonProperty("hardTimeout")
- public int hardTimeout() { return hardTimeout; }
+ public int hardTimeout() {
+ return hardTimeout;
+ }
/**
* Set the flow hard timeout in seconds.
- *
+ * <p/>
* It should be an unsigned integer in the interval [0, 65535].
* If zero, the timeout is not set.
*
@@ -222,29 +230,31 @@
*/
@JsonProperty("hardTimeout")
public void setHardTimeout(int hardTimeout) {
- this.hardTimeout = 0xffff & hardTimeout;
+ this.hardTimeout = 0xffff & hardTimeout;
}
/**
* Get the flow priority.
- *
+ * <p/>
* It should be an unsigned integer in the interval [0, 65535].
*
* @return the flow priority.
*/
@JsonProperty("priority")
- public int priority() { return priority; }
+ public int priority() {
+ return priority;
+ }
/**
* Set the flow priority.
- *
+ * <p/>
* It should be an unsigned integer in the interval [0, 65535].
*
* @param priority the flow priority to set.
*/
@JsonProperty("priority")
public void setPriority(int priority) {
- this.priority = 0xffff & priority;
+ this.priority = 0xffff & priority;
}
/**
@@ -253,7 +263,9 @@
* @return the Flow Entry Match.
*/
@JsonProperty("flowEntryMatch")
- public FlowEntryMatch flowEntryMatch() { return flowEntryMatch; }
+ public FlowEntryMatch flowEntryMatch() {
+ return flowEntryMatch;
+ }
/**
* Set the Flow Entry Match.
@@ -262,7 +274,7 @@
*/
@JsonProperty("flowEntryMatch")
public void setFlowEntryMatch(FlowEntryMatch flowEntryMatch) {
- this.flowEntryMatch = flowEntryMatch;
+ this.flowEntryMatch = flowEntryMatch;
}
/**
@@ -272,7 +284,7 @@
*/
@JsonProperty("flowEntryActions")
public FlowEntryActions flowEntryActions() {
- return flowEntryActions;
+ return flowEntryActions;
}
/**
@@ -282,7 +294,7 @@
*/
@JsonProperty("flowEntryActions")
public void setFlowEntryActions(FlowEntryActions flowEntryActions) {
- this.flowEntryActions = flowEntryActions;
+ this.flowEntryActions = flowEntryActions;
}
/**
@@ -291,7 +303,9 @@
* @return the Switch DPID.
*/
@JsonProperty("dpid")
- public Dpid dpid() { return dpid; }
+ public Dpid dpid() {
+ return dpid;
+ }
/**
* Set the Switch DPID.
@@ -300,51 +314,55 @@
*/
@JsonProperty("dpid")
public void setDpid(Dpid dpid) {
- this.dpid = dpid;
+ this.dpid = dpid;
}
/**
* Get the Switch incoming port.
- *
+ * <p/>
* Used only when the entry is used to return Shortest Path computation.
*
* @return the Switch incoming port.
*/
@JsonProperty("inPort")
- public Port inPort() { return inPort; }
+ public Port inPort() {
+ return inPort;
+ }
/**
* Set the Switch incoming port.
- *
+ * <p/>
* Used only when the entry is used to return Shortest Path computation.
*
* @param inPort the Switch incoming port to set.
*/
@JsonProperty("inPort")
public void setInPort(Port inPort) {
- this.inPort = inPort;
+ this.inPort = inPort;
}
/**
* Get the Switch outgoing port.
- *
+ * <p/>
* Used only when the entry is used to return Shortest Path computation.
*
* @return the Switch outgoing port.
*/
@JsonProperty("outPort")
- public Port outPort() { return outPort; }
+ public Port outPort() {
+ return outPort;
+ }
/**
* Set the Switch outgoing port.
- *
+ * <p/>
* Used only when the entry is used to return Shortest Path computation.
*
* @param outPort the Switch outgoing port to set.
*/
@JsonProperty("outPort")
public void setOutPort(Port outPort) {
- this.outPort = outPort;
+ this.outPort = outPort;
}
/**
@@ -354,7 +372,7 @@
*/
@JsonProperty("flowEntryUserState")
public FlowEntryUserState flowEntryUserState() {
- return flowEntryUserState;
+ return flowEntryUserState;
}
/**
@@ -364,12 +382,12 @@
*/
@JsonProperty("flowEntryUserState")
public void setFlowEntryUserState(FlowEntryUserState flowEntryUserState) {
- this.flowEntryUserState = flowEntryUserState;
+ this.flowEntryUserState = flowEntryUserState;
}
/**
* Get the Flow Entry Switch state.
- *
+ * <p/>
* The Flow Entry Error state is used if FlowEntrySwitchState is
* FE_SWITCH_FAILED.
*
@@ -377,12 +395,12 @@
*/
@JsonProperty("flowEntrySwitchState")
public FlowEntrySwitchState flowEntrySwitchState() {
- return flowEntrySwitchState;
+ return flowEntrySwitchState;
}
/**
* Set the Flow Entry Switch state.
- *
+ * <p/>
* The Flow Entry Error state is used if FlowEntrySwitchState is
* FE_SWITCH_FAILED.
*
@@ -390,7 +408,7 @@
*/
@JsonProperty("flowEntrySwitchState")
public void setFlowEntrySwitchState(FlowEntrySwitchState flowEntrySwitchState) {
- this.flowEntrySwitchState = flowEntrySwitchState;
+ this.flowEntrySwitchState = flowEntrySwitchState;
}
/**
@@ -400,7 +418,7 @@
*/
@JsonProperty("flowEntryErrorState")
public FlowEntryErrorState flowEntryErrorState() {
- return flowEntryErrorState;
+ return flowEntryErrorState;
}
/**
@@ -410,53 +428,54 @@
*/
@JsonProperty("flowEntryErrorState")
public void setFlowEntryErrorState(FlowEntryErrorState flowEntryErrorState) {
- this.flowEntryErrorState = flowEntryErrorState;
+ this.flowEntryErrorState = flowEntryErrorState;
}
/**
* Convert the flow entry to a string.
- *
+ * <p/>
* The string has the following form:
- * [flowEntryId=XXX idleTimeout=XXX hardTimeout=XXX priority=XXX
- * flowEntryMatch=XXX flowEntryActions=XXX dpid=XXX
- * inPort=XXX outPort=XXX flowEntryUserState=XXX flowEntrySwitchState=XXX
- * flowEntryErrorState=XXX]
+ * [flowEntryId=XXX idleTimeout=XXX hardTimeout=XXX priority=XXX
+ * flowEntryMatch=XXX flowEntryActions=XXX dpid=XXX
+ * inPort=XXX outPort=XXX flowEntryUserState=XXX flowEntrySwitchState=XXX
+ * flowEntryErrorState=XXX]
+ *
* @return the flow entry as a string.
*/
@Override
public String toString() {
- StringBuilder ret = new StringBuilder();
- if ( flowEntryId != null ) {
- ret.append("[flowEntryId=" + this.flowEntryId.toString());
- } else {
- ret.append("[");
- }
- if ( flowId != null ) {
- ret.append(" flowId=" + this.flowId.toString());
- }
- ret.append(" idleTimeout=" + this.idleTimeout);
- ret.append(" hardTimeout=" + this.hardTimeout);
- ret.append(" priority=" + this.priority);
- if ( flowEntryMatch != null ) {
- ret.append(" flowEntryMatch=" + this.flowEntryMatch.toString());
- }
- ret.append(" flowEntryActions=" + this.flowEntryActions.toString() );
- if ( dpid != null ) {
- ret.append(" dpid=" + this.dpid.toString());
- }
- if ( inPort != null ) {
- ret.append(" inPort=" + this.inPort.toString());
- }
- if ( outPort != null ) {
- ret.append(" outPort=" + this.outPort.toString());
- }
- ret.append(" flowEntryUserState=" + this.flowEntryUserState);
- ret.append(" flowEntrySwitchState=" + this.flowEntrySwitchState);
- if ( flowEntryErrorState != null ) {
- ret.append(" flowEntryErrorState=" + this.flowEntryErrorState.toString());
- }
- ret.append("]");
+ StringBuilder ret = new StringBuilder();
+ if (flowEntryId != null) {
+ ret.append("[flowEntryId=" + this.flowEntryId.toString());
+ } else {
+ ret.append("[");
+ }
+ if (flowId != null) {
+ ret.append(" flowId=" + this.flowId.toString());
+ }
+ ret.append(" idleTimeout=" + this.idleTimeout);
+ ret.append(" hardTimeout=" + this.hardTimeout);
+ ret.append(" priority=" + this.priority);
+ if (flowEntryMatch != null) {
+ ret.append(" flowEntryMatch=" + this.flowEntryMatch.toString());
+ }
+ ret.append(" flowEntryActions=" + this.flowEntryActions.toString());
+ if (dpid != null) {
+ ret.append(" dpid=" + this.dpid.toString());
+ }
+ if (inPort != null) {
+ ret.append(" inPort=" + this.inPort.toString());
+ }
+ if (outPort != null) {
+ ret.append(" outPort=" + this.outPort.toString());
+ }
+ ret.append(" flowEntryUserState=" + this.flowEntryUserState);
+ ret.append(" flowEntrySwitchState=" + this.flowEntrySwitchState);
+ if (flowEntryErrorState != null) {
+ ret.append(" flowEntryErrorState=" + this.flowEntryErrorState.toString());
+ }
+ ret.append("]");
- return ret.toString();
+ return ret.toString();
}
}