From: David Suarez Date: Fri, 2 Jun 2017 18:51:46 +0000 (+0200) Subject: Replace LOGGER/logger/log by LOG X-Git-Tag: release/nitrogen~99 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=092ba2d257a43e0f0b44ba2947ff15ddd3cf7d1f;p=yangtools.git 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 --- 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 451a9d203b..da857e69da 100644 --- 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 { - 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 @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 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 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 b8548bf287..d982072606 100644 --- 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 819734b64c..9e1489998a 100644 --- 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 f5771f9131..65eea4fa4d 100644 --- 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 { - 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 // 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 @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 7467d06324..62b1bce8c8 100644 --- 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 extends AbstractImmutableNormalizedNode { - 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