Remove "public" to follow our convention
Change-Id: Ic5fa8744cbcb4c704780c8467ae0f31fce3327ce
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowAgent.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowAgent.java
index 23924a7..ad6dede 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowAgent.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowAgent.java
@@ -34,14 +34,14 @@
* @param sw the actual switch object.
* @return true if added, false otherwise.
*/
- public boolean addConnectedSwitch(Dpid dpid, OpenFlowSwitch sw);
+ boolean addConnectedSwitch(Dpid dpid, OpenFlowSwitch sw);
/**
* Checks if the activation for this switch is valid.
* @param dpid the dpid to check
* @return true if valid, false otherwise
*/
- public boolean validActivation(Dpid dpid);
+ boolean validActivation(Dpid dpid);
/**
* Called when a switch is activated, with this controller's role as MASTER.
@@ -49,7 +49,7 @@
* @param sw the actual switch
* @return true if added, false otherwise.
*/
- public boolean addActivatedMasterSwitch(Dpid dpid, OpenFlowSwitch sw);
+ boolean addActivatedMasterSwitch(Dpid dpid, OpenFlowSwitch sw);
/**
* Called when a switch is activated, with this controller's role as EQUAL.
@@ -57,7 +57,7 @@
* @param sw the actual switch
* @return true if added, false otherwise.
*/
- public boolean addActivatedEqualSwitch(Dpid dpid, OpenFlowSwitch sw);
+ boolean addActivatedEqualSwitch(Dpid dpid, OpenFlowSwitch sw);
/**
* Called when this controller's role for a switch transitions from equal
@@ -65,7 +65,7 @@
* 'equal' - so this transition is equivalent to 'addActivatedMasterSwitch'.
* @param dpid the dpid to transistion.
*/
- public void transitionToMasterSwitch(Dpid dpid);
+ void transitionToMasterSwitch(Dpid dpid);
/**
* Called when this controller's role for a switch transitions to equal.
@@ -73,7 +73,7 @@
* 'equal'.
* @param dpid the dpid to transistion.
*/
- public void transitionToEqualSwitch(Dpid dpid);
+ void transitionToEqualSwitch(Dpid dpid);
/**
* Clear all state in controller switch maps for a switch that has
@@ -81,7 +81,7 @@
* that switch from the global repository. Notify switch listeners.
* @param dpid the dpid to remove.
*/
- public void removeConnectedSwitch(Dpid dpid);
+ void removeConnectedSwitch(Dpid dpid);
/**
* Process a message coming from a switch.
@@ -89,7 +89,7 @@
* @param dpid the dpid the message came on.
* @param m the message to process
*/
- public void processMessage(Dpid dpid, OFMessage m);
+ void processMessage(Dpid dpid, OFMessage m);
/**
* Notifies the controller that role assertion has failed.
@@ -98,5 +98,5 @@
* @param requested the role controller requested
* @param response role reply from the switch
*/
- public void returnRoleReply(Dpid dpid, RoleState requested, RoleState response);
+ void returnRoleReply(Dpid dpid, RoleState requested, RoleState response);
}
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriver.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriver.java
index ae3f8db..b259388 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriver.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriver.java
@@ -40,28 +40,28 @@
* can only be called once.
* @param agent the agent to set.
*/
- public void setAgent(OpenFlowAgent agent);
+ void setAgent(OpenFlowAgent agent);
/**
* Sets the Role handler object.
* This method can only be called once.
* @param roleHandler the roleHandler class
*/
- public void setRoleHandler(RoleHandler roleHandler);
+ void setRoleHandler(RoleHandler roleHandler);
/**
* Reasserts this controllers role to the switch.
* Useful in cases where the switch no longer agrees
* that this controller has the role it claims.
*/
- public void reassertRole();
+ void reassertRole();
/**
* Handle the situation where the role request triggers an error.
* @param error the error to handle.
* @return true if handled, false if not.
*/
- public boolean handleRoleError(OFErrorMsg error);
+ boolean handleRoleError(OFErrorMsg error);
/**
* If this driver know of Nicira style role messages, these should
@@ -70,7 +70,7 @@
* @throws SwitchStateException if the message received was
* not a nicira role or was malformed.
*/
- public void handleNiciraRole(OFMessage m) throws SwitchStateException;
+ void handleNiciraRole(OFMessage m) throws SwitchStateException;
/**
* Handle OF 1.x (where x > 0) role messages.
@@ -78,98 +78,98 @@
* @throws SwitchStateException if the message received was
* not a nicira role or was malformed.
*/
- public void handleRole(OFMessage m) throws SwitchStateException;
+ void handleRole(OFMessage m) throws SwitchStateException;
/**
* Announce to the OpenFlow agent that this switch has connected.
* @return true if successful, false if duplicate switch.
*/
- public boolean connectSwitch();
+ boolean connectSwitch();
/**
* Activate this MASTER switch-controller relationship in the OF agent.
* @return true is successful, false is switch has not
* connected or is unknown to the system.
*/
- public boolean activateMasterSwitch();
+ boolean activateMasterSwitch();
/**
* Activate this EQUAL switch-controller relationship in the OF agent.
* @return true is successful, false is switch has not
* connected or is unknown to the system.
*/
- public boolean activateEqualSwitch();
+ boolean activateEqualSwitch();
/**
* Transition this switch-controller relationship to an EQUAL state.
*/
- public void transitionToEqualSwitch();
+ void transitionToEqualSwitch();
/**
* Transition this switch-controller relationship to an Master state.
*/
- public void transitionToMasterSwitch();
+ void transitionToMasterSwitch();
/**
* Remove this switch from the openflow agent.
*/
- public void removeConnectedSwitch();
+ void removeConnectedSwitch();
/**
* Sets the ports on this switch.
* @param portDescReply the port set and descriptions
*/
- public void setPortDescReply(OFPortDescStatsReply portDescReply);
+ void setPortDescReply(OFPortDescStatsReply portDescReply);
/**
* Sets the ports on this switch.
* @param portDescReplies list of port set and descriptions
*/
- public void setPortDescReplies(List<OFPortDescStatsReply> portDescReplies);
+ void setPortDescReplies(List<OFPortDescStatsReply> portDescReplies);
/**
* Sets the features reply for this switch.
* @param featuresReply the features to set.
*/
- public void setFeaturesReply(OFFeaturesReply featuresReply);
+ void setFeaturesReply(OFFeaturesReply featuresReply);
/**
* Sets the switch description.
* @param desc the descriptions
*/
- public void setSwitchDescription(OFDescStatsReply desc);
+ void setSwitchDescription(OFDescStatsReply desc);
/**
* Gets the next transaction id to use.
* @return the xid
*/
- public int getNextTransactionId();
+ int getNextTransactionId();
/**
* Sets the OF version for this switch.
* @param ofV the version to set.
*/
- public void setOFVersion(OFVersion ofV);
+ void setOFVersion(OFVersion ofV);
/**
* Sets this switch has having a full flowtable.
* @param full true if full, false otherswise.
*/
- public void setTableFull(boolean full);
+ void setTableFull(boolean full);
/**
* Sets the associated Netty channel for this switch.
* @param channel the Netty channel
*/
- public void setChannel(Channel channel);
+ void setChannel(Channel channel);
/**
* Sets whether the switch is connected.
*
* @param connected whether the switch is connected
*/
- public void setConnected(boolean connected);
+ void setConnected(boolean connected);
/**
* Initialises the behaviour.
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriverFactory.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
index 98030fe..a0d8f18 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
@@ -34,6 +34,6 @@
* @param ofv the OF version in use
* @return the openflow switch representation.
*/
- public OpenFlowSwitchDriver getOFSwitchImpl(Dpid dpid,
+ OpenFlowSwitchDriver getOFSwitchImpl(Dpid dpid,
OFDescStatsReply desc, OFVersion ofv);
}
diff --git a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleHandler.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleHandler.java
index d930aaa..b406888 100644
--- a/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleHandler.java
+++ b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleHandler.java
@@ -40,7 +40,7 @@
* @throws SwitchStateException If the message is a Nicira role reply
* but the numeric role value is unknown.
*/
- public RoleState extractNiciraRoleReply(OFExperimenter experimenterMsg)
+ RoleState extractNiciraRoleReply(OFExperimenter experimenterMsg)
throws SwitchStateException;
/**
@@ -64,7 +64,7 @@
* @return false if and only if the switch does not support role-request
* messages, according to the switch driver; true otherwise.
*/
- public boolean sendRoleRequest(RoleState role, RoleRecvStatus exp)
+ boolean sendRoleRequest(RoleState role, RoleRecvStatus exp)
throws IOException;
/**
@@ -73,7 +73,7 @@
* @return RoleReplyInfo object
* @throws SwitchStateException If unknown role encountered
*/
- public RoleReplyInfo extractOFRoleReply(OFRoleReply rrmsg)
+ RoleReplyInfo extractOFRoleReply(OFRoleReply rrmsg)
throws SwitchStateException;
/**
@@ -93,7 +93,7 @@
* @return result comparing expected and received reply
* @throws SwitchStateException if no request is pending
*/
- public RoleRecvStatus deliverRoleReply(RoleReplyInfo rri)
+ RoleRecvStatus deliverRoleReply(RoleReplyInfo rri)
throws SwitchStateException;
@@ -108,7 +108,7 @@
* @return result comparing expected and received reply
* @throws SwitchStateException if switch did not support requested role
*/
- public RoleRecvStatus deliverError(OFErrorMsg error)
+ RoleRecvStatus deliverError(OFErrorMsg error)
throws SwitchStateException;
}