Committed by
Gerrit Code Review
ONOS-3200 unify code formation and fix grammar problem
Change-Id: I3feef132051e4476b2b8f2f59fb69f2776f7a7cf
Showing
2 changed files
with
11 additions
and
11 deletions
... | @@ -58,11 +58,11 @@ import org.slf4j.LoggerFactory; | ... | @@ -58,11 +58,11 @@ import org.slf4j.LoggerFactory; |
58 | 58 | ||
59 | /** | 59 | /** |
60 | * The main controller class. Handles all setup and network listeners - | 60 | * The main controller class. Handles all setup and network listeners - |
61 | - * Distributed ovsdbClient. | 61 | + * distributed OVSDBClient. |
62 | */ | 62 | */ |
63 | -public class Controller { | 63 | +public class OVSDBController { |
64 | protected static final Logger log = LoggerFactory | 64 | protected static final Logger log = LoggerFactory |
65 | - .getLogger(Controller.class); | 65 | + .getLogger(OVSDBController.class); |
66 | 66 | ||
67 | private int ovsdbPort = OvsdbConstant.OVSDBPORT; | 67 | private int ovsdbPort = OvsdbConstant.OVSDBPORT; |
68 | 68 | ||
... | @@ -105,7 +105,7 @@ public class Controller { | ... | @@ -105,7 +105,7 @@ public class Controller { |
105 | } | 105 | } |
106 | 106 | ||
107 | /** | 107 | /** |
108 | - * Tells controller that we're ready to accept ovsdb node loop. | 108 | + * Tells controller that we're ready to accept OVSDB node loop. |
109 | * @throws InterruptedException if thread is interrupted | 109 | * @throws InterruptedException if thread is interrupted |
110 | */ | 110 | */ |
111 | public void run() throws InterruptedException { | 111 | public void run() throws InterruptedException { |
... | @@ -114,7 +114,7 @@ public class Controller { | ... | @@ -114,7 +114,7 @@ public class Controller { |
114 | } | 114 | } |
115 | 115 | ||
116 | /** | 116 | /** |
117 | - * Adds channel pipiline to handle a new connected node. | 117 | + * Adds channel pipeline to handle a new connected node. |
118 | */ | 118 | */ |
119 | private class OnosCommunicationChannelInitializer | 119 | private class OnosCommunicationChannelInitializer |
120 | extends ChannelInitializer<SocketChannel> { | 120 | extends ChannelInitializer<SocketChannel> { |
... | @@ -128,7 +128,7 @@ public class Controller { | ... | @@ -128,7 +128,7 @@ public class Controller { |
128 | } | 128 | } |
129 | 129 | ||
130 | /** | 130 | /** |
131 | - * Handles the new connection of a node. | 131 | + * Handles the new connection of node. |
132 | * | 132 | * |
133 | * @param channel the channel to use. | 133 | * @param channel the channel to use. |
134 | */ | 134 | */ |
... | @@ -169,9 +169,9 @@ public class Controller { | ... | @@ -169,9 +169,9 @@ public class Controller { |
169 | } | 169 | } |
170 | 170 | ||
171 | /** | 171 | /** |
172 | - * Gets an ovsdb client instance. | 172 | + * Gets an OVSDB client instance. |
173 | * | 173 | * |
174 | - * @param nodeId data ovsdb node id | 174 | + * @param nodeId data OVSDB node id |
175 | * @param agent OvsdbAgent | 175 | * @param agent OvsdbAgent |
176 | * @param monitorCallback Callback | 176 | * @param monitorCallback Callback |
177 | * @param channel Channel | 177 | * @param channel Channel |
... | @@ -251,12 +251,12 @@ public class Controller { | ... | @@ -251,12 +251,12 @@ public class Controller { |
251 | } | 251 | } |
252 | 252 | ||
253 | private class ConnectionListener implements ChannelFutureListener { | 253 | private class ConnectionListener implements ChannelFutureListener { |
254 | - private Controller controller; | 254 | + private OVSDBController controller; |
255 | private IpAddress ip; | 255 | private IpAddress ip; |
256 | private TpPort port; | 256 | private TpPort port; |
257 | private AtomicInteger count = new AtomicInteger(); | 257 | private AtomicInteger count = new AtomicInteger(); |
258 | 258 | ||
259 | - public ConnectionListener(Controller controller, | 259 | + public ConnectionListener(OVSDBController controller, |
260 | IpAddress ip, | 260 | IpAddress ip, |
261 | TpPort port) { | 261 | TpPort port) { |
262 | this.controller = controller; | 262 | this.controller = controller; | ... | ... |
... | @@ -94,7 +94,7 @@ public class OvsdbControllerImpl implements OvsdbController { | ... | @@ -94,7 +94,7 @@ public class OvsdbControllerImpl implements OvsdbController { |
94 | 94 | ||
95 | protected ConcurrentHashMap<String, String> requestDbName = new ConcurrentHashMap<String, String>(); | 95 | protected ConcurrentHashMap<String, String> requestDbName = new ConcurrentHashMap<String, String>(); |
96 | 96 | ||
97 | - private final Controller controller = new Controller(); | 97 | + private final OVSDBController controller = new OVSDBController(); |
98 | 98 | ||
99 | @Activate | 99 | @Activate |
100 | public void activate(ComponentContext context) { | 100 | public void activate(ComponentContext context) { | ... | ... |
-
Please register or login to post a comment