ONOS-3200 unify code formation and fix grammar problem
Change-Id: I3feef132051e4476b2b8f2f59fb69f2776f7a7cf
diff --git a/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/Controller.java b/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OVSDBController.java
similarity index 95%
rename from ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/Controller.java
rename to ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OVSDBController.java
index 2e84a16..16064f3 100644
--- a/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/Controller.java
+++ b/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OVSDBController.java
@@ -58,11 +58,11 @@
/**
* The main controller class. Handles all setup and network listeners -
- * Distributed ovsdbClient.
+ * distributed OVSDBClient.
*/
-public class Controller {
+public class OVSDBController {
protected static final Logger log = LoggerFactory
- .getLogger(Controller.class);
+ .getLogger(OVSDBController.class);
private int ovsdbPort = OvsdbConstant.OVSDBPORT;
@@ -105,7 +105,7 @@
}
/**
- * Tells controller that we're ready to accept ovsdb node loop.
+ * Tells controller that we're ready to accept OVSDB node loop.
* @throws InterruptedException if thread is interrupted
*/
public void run() throws InterruptedException {
@@ -114,7 +114,7 @@
}
/**
- * Adds channel pipiline to handle a new connected node.
+ * Adds channel pipeline to handle a new connected node.
*/
private class OnosCommunicationChannelInitializer
extends ChannelInitializer<SocketChannel> {
@@ -128,7 +128,7 @@
}
/**
- * Handles the new connection of a node.
+ * Handles the new connection of node.
*
* @param channel the channel to use.
*/
@@ -169,9 +169,9 @@
}
/**
- * Gets an ovsdb client instance.
+ * Gets an OVSDB client instance.
*
- * @param nodeId data ovsdb node id
+ * @param nodeId data OVSDB node id
* @param agent OvsdbAgent
* @param monitorCallback Callback
* @param channel Channel
@@ -251,12 +251,12 @@
}
private class ConnectionListener implements ChannelFutureListener {
- private Controller controller;
+ private OVSDBController controller;
private IpAddress ip;
private TpPort port;
private AtomicInteger count = new AtomicInteger();
- public ConnectionListener(Controller controller,
+ public ConnectionListener(OVSDBController controller,
IpAddress ip,
TpPort port) {
this.controller = controller;
diff --git a/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OvsdbControllerImpl.java b/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OvsdbControllerImpl.java
index c2cbbf8..b991a62 100644
--- a/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OvsdbControllerImpl.java
+++ b/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OvsdbControllerImpl.java
@@ -94,7 +94,7 @@
protected ConcurrentHashMap<String, String> requestDbName = new ConcurrentHashMap<String, String>();
- private final Controller controller = new Controller();
+ private final OVSDBController controller = new OVSDBController();
@Activate
public void activate(ComponentContext context) {