ONOS-3200 unify code formation and fix grammar problem
Change-Id: I9c67199ce9eef352c52ae178870a813b7dec0f65
diff --git a/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OVSDBController.java b/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/Controller.java
similarity index 98%
rename from ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OVSDBController.java
rename to ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/Controller.java
index 16064f3..fcbbff8 100644
--- a/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/OVSDBController.java
+++ b/ovsdb/ctl/src/main/java/org/onosproject/ovsdb/controller/impl/Controller.java
@@ -60,9 +60,9 @@
* The main controller class. Handles all setup and network listeners -
* distributed OVSDBClient.
*/
-public class OVSDBController {
+public class Controller {
protected static final Logger log = LoggerFactory
- .getLogger(OVSDBController.class);
+ .getLogger(Controller.class);
private int ovsdbPort = OvsdbConstant.OVSDBPORT;
@@ -251,12 +251,12 @@
}
private class ConnectionListener implements ChannelFutureListener {
- private OVSDBController controller;
+ private Controller controller;
private IpAddress ip;
private TpPort port;
private AtomicInteger count = new AtomicInteger();
- public ConnectionListener(OVSDBController controller,
+ public ConnectionListener(Controller 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 b991a62..c2cbbf8 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 OVSDBController controller = new OVSDBController();
+ private final Controller controller = new Controller();
@Activate
public void activate(ComponentContext context) {