ONOS-3200 unify code formation and fix grammar problem

Change-Id: I9c67199ce9eef352c52ae178870a813b7dec0f65

@@ -60,9 +60,9 @@ import org.slf4j.LoggerFactory;
  * The main controller class. Handles all setup and network listeners -
  * The main controller class. Handles all setup and network listeners -
  * distributed OVSDBClient.
  * distributed OVSDBClient.
  */
  */
-public class OVSDBController {
+public class Controller {
     protected static final Logger log = LoggerFactory
     protected static final Logger log = LoggerFactory
-            .getLogger(OVSDBController.class);
+            .getLogger(Controller.class);
 
 
     private int ovsdbPort = OvsdbConstant.OVSDBPORT;
     private int ovsdbPort = OvsdbConstant.OVSDBPORT;
 
 
@@ -251,12 +251,12 @@ public class OVSDBController {
     }
     }
 
 
     private class ConnectionListener implements ChannelFutureListener {
     private class ConnectionListener implements ChannelFutureListener {
-        private OVSDBController controller;
+        private Controller controller;
         private IpAddress ip;
         private IpAddress ip;
         private TpPort port;
         private TpPort port;
         private AtomicInteger count = new AtomicInteger();
         private AtomicInteger count = new AtomicInteger();
 
 
-        public ConnectionListener(OVSDBController controller,
+        public ConnectionListener(Controller controller,
                                   IpAddress ip,
                                   IpAddress ip,
                                   TpPort port) {
                                   TpPort port) {
             this.controller = controller;
             this.controller = controller;

@@ -94,7 +94,7 @@ public class OvsdbControllerImpl implements OvsdbController {
 
 
     protected ConcurrentHashMap<String, String> requestDbName = new ConcurrentHashMap<String, String>();
     protected ConcurrentHashMap<String, String> requestDbName = new ConcurrentHashMap<String, String>();
 
 
-    private final OVSDBController controller = new OVSDBController();
+    private final Controller controller = new Controller();
 
 
     @Activate
     @Activate
     public void activate(ComponentContext context) {
     public void activate(ComponentContext context) {