Replace LOGGER/logger/log by LOG

Replace LOGGER/logger/log by LOG to follow the OpenDaylight
recommendations [1].

[1]
https://wiki.opendaylight.org/view/BestPractices/Logging_Best_Practices
Change-Id: Ia00a0401a433c445c1fcd17ab4bc436a04abe209
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>

diff --git a/websocket/websocket-client/src/main/java/org/opendaylight/yangtools/websocket/client/WebSocketClientHandler.java b/websocket/websocket-client/src/main/java/org/opendaylight/yangtools/websocket/client/WebSocketClientHandler.java
index 451a9d203b7a6544872e71ece37e33f17f06dd05..da857e69dac6245e01d7201f0315c66a92262fe6 100644 (file)
--- a/websocket/websocket-client/src/main/java/org/opendaylight/yangtools/websocket/client/WebSocketClientHandler.java
+++ b/websocket/websocket-client/src/main/java/org/opendaylight/yangtools/websocket/client/WebSocketClientHandler.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
 @Deprecated
 public class WebSocketClientHandler extends SimpleChannelInboundHandler<Object> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(WebSocketClientHandler.class.toString());
+    private static final Logger LOG = LoggerFactory.getLogger(WebSocketClientHandler.class);
     private final WebSocketClientHandshaker handshaker;
     private final ClientMessageCallback messageListener;
 
@@ -74,7 +74,7 @@ public class WebSocketClientHandler extends SimpleChannelInboundHandler<Object>
 
     @Override
     public void channelInactive(final ChannelHandlerContext ctx) throws Exception {
-        LOGGER.info("WebSocket Client disconnected!");
+        LOG.info("WebSocket Client disconnected!");
     }
 
     @Override
@@ -83,7 +83,7 @@ public class WebSocketClientHandler extends SimpleChannelInboundHandler<Object>
         Channel ch = ctx.channel();
         if (!handshaker.isHandshakeComplete()) {
             handshaker.finishHandshake(ch, (FullHttpResponse) msg);
-            LOGGER.info("WebSocket Client connected!");
+            LOG.info("WebSocket Client connected!");
             handshakeFuture.setSuccess();
             return;
         }
@@ -102,12 +102,12 @@ public class WebSocketClientHandler extends SimpleChannelInboundHandler<Object>
 
         if (frame instanceof TextWebSocketFrame) {
             TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
-            LOGGER.info("WebSocket Client received message: "
+            LOG.info("WebSocket Client received message: "
                     + textFrame.text());
         } else if (frame instanceof PongWebSocketFrame) {
-            LOGGER.info("WebSocket Client received pong");
+            LOG.info("WebSocket Client received pong");
         } else if (frame instanceof CloseWebSocketFrame) {
-            LOGGER.info("WebSocket Client received closing");
+            LOG.info("WebSocket Client received closing");
             ch.close();
         }
     }

diff --git a/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/WebSocketClientTest.java b/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/WebSocketClientTest.java
index b8548bf287dc1c3087fc16949a4a00795c44947c..d9820726063a11554dccb27ea791a9eb90effda7 100644 (file)
--- a/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/WebSocketClientTest.java
+++ b/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/WebSocketClientTest.java
@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
 
 @Deprecated
 public class WebSocketClientTest {
-    private static final Logger logger = LoggerFactory.getLogger(WebSocketClientTest.class.toString());
+    private static final Logger LOG = LoggerFactory.getLogger(WebSocketClientTest.class);
     private static final String MESSAGE = "Take me to your leader!";
     private Thread webSocketServerThread;
 
@@ -47,7 +47,7 @@ public class WebSocketClientTest {
             webSocketServerThread.start();
             port = webSocketServer.getPort().get();
         } catch (Exception e) {
-            logger.trace("Error starting websocket server");
+            LOG.trace("Error starting websocket server");
         }
     }
 
@@ -57,7 +57,7 @@ public class WebSocketClientTest {
         URI uri = null;
         try {
             uri = new URI(String.format("ws://localhost:%d/websocket", port));
-            logger.info("CLIENT: " + uri);
+            LOG.info("CLIENT: " + uri);
             ClientMessageCallback messageCallback = new ClientMessageCallback();
             WebSocketIClient wsClient = new WebSocketIClient(uri,messageCallback);
             try {
@@ -74,14 +74,14 @@ public class WebSocketClientTest {
 
                 webSocketServerThread.interrupt();
             } catch (InterruptedException e) {
-                logger.info("WebSocket client couldn't connect to : " + uri);
+                LOG.info("WebSocket client couldn't connect to : " + uri);
                 Assert.fail("WebSocker client could not connect to : " + uri);
             } catch (ExecutionException | TimeoutException toe) {
-                logger.info("Message not received");
+                LOG.info("Message not received");
                 Assert.fail(toe.toString());
             }
         } catch (URISyntaxException e) {
-            logger.info("There is an error in URL sytnax {}",e);
+            LOG.info("There is an error in URL sytnax {}",e);
             Assert.fail("There is an error in URL sytnax");
         }
     }
@@ -89,7 +89,7 @@ public class WebSocketClientTest {
     private class ClientMessageCallback implements org.opendaylight.yangtools.websocket.client.callback.ClientMessageCallback {
         @Override
         public void onMessageReceived(final Object message) {
-            logger.info("received message {}",message);
+            LOG.info("received message {}",message);
             messageReceived.set(true);
         }
     }

diff --git a/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServer.java b/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServer.java
index 819734b64c9d6f4bd87897f33ae5ee1f56230cad..9e1489998a5b382a2a94bb987b3e25b028578580 100644 (file)
--- a/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServer.java
+++ b/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServer.java
@@ -64,7 +64,7 @@ public class WebSocketServer implements Runnable {
     private final ServerBootstrap bootstrap = new ServerBootstrap();
     private final EventLoopGroup bossGroup = new NioEventLoopGroup();
     private final EventLoopGroup workerGroup = new NioEventLoopGroup();
-    private static final Logger logger = LoggerFactory.getLogger(WebSocketServer.class.toString());
+    private static final Logger LOG = LoggerFactory.getLogger(WebSocketServer.class);
 
 
     public WebSocketServer(final int inPort) {
@@ -77,7 +77,7 @@ public class WebSocketServer implements Runnable {
         try {
             startServer();
         } catch (Exception e) {
-            logger.info("Exception occured while starting webSocket server {}",e);
+            LOG.info("Exception occured while starting webSocket server {}",e);
         }
     }
 
@@ -98,8 +98,8 @@ public class WebSocketServer implements Runnable {
             } catch (ClassCastException cce) {
                 throw new ExecutionException("Unknown socket address type", cce);
             }
-            logger.info("Web socket server started at port " + port.get() + '.');
-            logger.info("Open your browser and navigate to http://localhost:" + port.get() + '/');
+            LOG.info("Web socket server started at port " + port.get() + '.');
+            LOG.info("Open your browser and navigate to http://localhost:" + port.get() + '/');
 
             try {
                 ch.closeFuture().sync();

diff --git a/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServerHandler.java b/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServerHandler.java
index f5771f9131638b19464373fcbd7e7429b47accad..65eea4fa4d08f8fcc381b34570f425d40a60d758 100644 (file)
--- a/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServerHandler.java
+++ b/websocket/websocket-client/src/test/java/org/opendaylight/yangtools/websocket/server/WebSocketServerHandler.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
  */
 @Deprecated
 public class WebSocketServerHandler extends SimpleChannelInboundHandler<Object> {
-    private static final Logger logger = LoggerFactory.getLogger(WebSocketServerHandler.class.getName());
+    private static final Logger LOG = LoggerFactory.getLogger(WebSocketServerHandler.class);
 
     private static final String WEBSOCKET_PATH = "/websocket";
 
@@ -111,7 +111,7 @@ public class WebSocketServerHandler extends SimpleChannelInboundHandler<Object>
 
         // Send the uppercase string back.
         String request = ((TextWebSocketFrame) frame).text();
-        logger.debug(String.format("%s received %s", ctx.channel(), request));
+        LOG.debug(String.format("%s received %s", ctx.channel(), request));
         ctx.channel().write(new TextWebSocketFrame(request.toUpperCase()));
     }
 
@@ -134,7 +134,7 @@ public class WebSocketServerHandler extends SimpleChannelInboundHandler<Object>
 
     @Override
     public void exceptionCaught(final ChannelHandlerContext ctx, final Throwable cause) throws Exception {
-        logger.info("Exception caught {}",cause);
+        LOG.info("Exception caught {}",cause);
         ctx.close();
     }
 

diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java
index 7467d0632458f5eaaaafa121e7c16ff08550dbc8..62b1bce8c87e9e6726101f32323ac02d64bee875 100644 (file)
--- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java
+++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java
@@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory;
 public abstract class AbstractImmutableNormalizedValueNode<K extends PathArgument, V> extends
         AbstractImmutableNormalizedNode<K, V> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractImmutableNormalizedValueNode.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractImmutableNormalizedValueNode.class);
     @Nullable
     private final V value;
 
@@ -26,7 +26,7 @@ public abstract class AbstractImmutableNormalizedValueNode<K extends PathArgumen
              * Null value is allowed for empty type definition so it should be debug,
              * but still we are logging it in case we need to debug missing values.
              */
-            LOGGER.debug("The value of node {} is null",nodeIdentifier.getNodeType());
+            LOG.debug("The value of node {} is null",nodeIdentifier.getNodeType());
         }
         this.value = value;
     }

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java
index e570a5481b479f1bd72eb821609c38049322a429..0ff7aeda256293527c7570b8aaa10a9afeaf4446 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/transform/dom/serializer/NormalizedNodeXmlTranslationTest.java
@@ -84,7 +84,7 @@ import org.xml.sax.SAXException;
 
 @RunWith(Parameterized.class)
 public class NormalizedNodeXmlTranslationTest {
-    private static final Logger logger = LoggerFactory.getLogger(NormalizedNodeXmlTranslationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NormalizedNodeXmlTranslationTest.class);
     private final SchemaContext schema;
 
     @Parameterized.Parameters()
@@ -288,7 +288,7 @@ public class NormalizedNodeXmlTranslationTest {
         }
 
         System.err.println(built);
-        logger.info("{}", built);
+        LOG.info("{}", built);
 
         final Element elementNS = XmlDocumentUtils.getDocument().createElementNS(
                 containerNode.getQName().getNamespace().toString(), containerNode.getQName().getLocalName());