Fix checkstyle whitespace issues - WHITESPACE ONLY
Change-Id: Ic205c1afd639c6008d61d9de95cb764eeb6238ca
diff --git a/src/main/java/net/onrc/onos/core/util/FlowEntryActions.java b/src/main/java/net/onrc/onos/core/util/FlowEntryActions.java
index 8839ceb..fc55932 100644
--- a/src/main/java/net/onrc/onos/core/util/FlowEntryActions.java
+++ b/src/main/java/net/onrc/onos/core/util/FlowEntryActions.java
@@ -7,29 +7,29 @@
/**
* The class representing multiple Flow Entry actions.
- *
+ * <p/>
* A set of Flow Entry actions need to be applied to each packet.
*/
public class FlowEntryActions {
- private ArrayList<FlowEntryAction> actions; // The Flow Entry Actions
+ private ArrayList<FlowEntryAction> actions; // The Flow Entry Actions
/**
* Default constructor.
*/
public FlowEntryActions() {
- actions = new ArrayList<FlowEntryAction>();
+ actions = new ArrayList<FlowEntryAction>();
}
/**
* Constructor from a string.
- *
+ * <p/>
* The string has the following form:
- * [[type=XXX action=XXX];[type=XXX action=XXX];...;]
+ * [[type=XXX action=XXX];[type=XXX action=XXX];...;]
*
* @param actionsStr the set of actions as a string.
*/
public FlowEntryActions(String actionsStr) {
- this.fromString(actionsStr);
+ this.fromString(actionsStr);
}
/**
@@ -38,12 +38,12 @@
* @param other the object to copy from.
*/
public FlowEntryActions(FlowEntryActions other) {
- actions = new ArrayList<FlowEntryAction>();
+ actions = new ArrayList<FlowEntryAction>();
- for (FlowEntryAction action : other.actions) {
- FlowEntryAction newAction = new FlowEntryAction(action);
- actions.add(newAction);
- }
+ for (FlowEntryAction action : other.actions) {
+ FlowEntryAction newAction = new FlowEntryAction(action);
+ actions.add(newAction);
+ }
}
/**
@@ -53,7 +53,7 @@
*/
@JsonProperty("actions")
public ArrayList<FlowEntryAction> actions() {
- return actions;
+ return actions;
}
/**
@@ -63,7 +63,7 @@
*/
@JsonProperty("actions")
public void setActions(ArrayList<FlowEntryAction> actions) {
- this.actions = actions;
+ this.actions = actions;
}
/**
@@ -72,7 +72,7 @@
* @param flowEntryAction the Flow Entry Action to add.
*/
public void addAction(FlowEntryAction flowEntryAction) {
- actions.add(flowEntryAction);
+ actions.add(flowEntryAction);
}
/**
@@ -82,67 +82,67 @@
*/
@JsonIgnore
public Boolean isEmpty() {
- return actions.isEmpty();
+ return actions.isEmpty();
}
/**
* Convert the set of actions to a string.
- *
+ * <p/>
* The string has the following form:
- * [[type=XXX action=XXX];[type=XXX action=XXX];...;]
+ * [[type=XXX action=XXX];[type=XXX action=XXX];...;]
*
* @return the set of actions as a string.
*/
@Override
public String toString() {
- String ret = "[";
- for (FlowEntryAction action : actions) {
- ret += action.toString() + ";";
- }
- ret += "]";
+ String ret = "[";
+ for (FlowEntryAction action : actions) {
+ ret += action.toString() + ";";
+ }
+ ret += "]";
- return ret;
+ return ret;
}
/**
* Convert a string to a set of actions.
- *
+ * <p/>
* The string has the following form:
- * [[type=XXX action=XXX];[type=XXX action=XXX];...;]
+ * [[type=XXX action=XXX];[type=XXX action=XXX];...;]
*
* @param actionsStr the set of actions as a string.
*/
public void fromString(String actionsStr) {
- String decode = actionsStr;
+ String decode = actionsStr;
- actions = new ArrayList<FlowEntryAction>();
+ actions = new ArrayList<FlowEntryAction>();
- if (decode.isEmpty())
- return; // Nothing to do
+ if (decode.isEmpty())
+ return; // Nothing to do
- // Remove the '[' and ']' in the beginning and the end of the string
- if ((decode.length() > 1) && (decode.charAt(0) == '[') &&
- (decode.charAt(decode.length() - 1) == ']')) {
- decode = decode.substring(1, decode.length() - 1);
- } else {
- throw new IllegalArgumentException("Invalid action string");
- }
+ // Remove the '[' and ']' in the beginning and the end of the string
+ if ((decode.length() > 1) && (decode.charAt(0) == '[') &&
+ (decode.charAt(decode.length() - 1) == ']')) {
+ decode = decode.substring(1, decode.length() - 1);
+ } else {
+ throw new IllegalArgumentException("Invalid action string");
+ }
- // Split the string, and decode each action
- String[] parts = decode.split(";");
- for (int i = 0; i < parts.length; i++) {
- decode = parts[i];
- if ((decode == null) || decode.isEmpty())
- continue;
- FlowEntryAction flowEntryAction = null;
- try {
- flowEntryAction = new FlowEntryAction(decode);
- } catch (IllegalArgumentException e) {
- // TODO: Ignore invalid actions for now
- continue;
- }
- if (flowEntryAction != null)
- actions.add(flowEntryAction);
- }
+ // Split the string, and decode each action
+ String[] parts = decode.split(";");
+ for (int i = 0; i < parts.length; i++) {
+ decode = parts[i];
+ if ((decode == null) || decode.isEmpty())
+ continue;
+ FlowEntryAction flowEntryAction = null;
+ try {
+ flowEntryAction = new FlowEntryAction(decode);
+ } catch (IllegalArgumentException e) {
+ // TODO: Ignore invalid actions for now
+ continue;
+ }
+ if (flowEntryAction != null)
+ actions.add(flowEntryAction);
+ }
}
}