Author: elecharny Date: Mon Apr 27 10:17:35 2009 New Revision: 768915 URL: http://svn.apache.org/viewvc?rev=768915&view=rev Log: Lot of warning removals, accordingly to the PMC report produced by Ashish
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/server/ImageServerIoHandler.java mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step3/server/ImageServerIoHandler.java mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java Modified: mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java?rev=768915&r1=768914&r2=768915&view=diff ============================================================================== --- mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java (original) +++ mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java Mon Apr 27 10:17:35 2009 @@ -37,7 +37,7 @@ * @version $Rev$, $Date$ */ public class ChatProtocolHandler extends IoHandlerAdapter { - private final Logger logger = LoggerFactory.getLogger(getClass()); + private final static Logger LOGGER = LoggerFactory.getLogger(ChatProtocolHandler.class); private final Set<IoSession> sessions = Collections .synchronizedSet(new HashSet<IoSession>()); @@ -47,7 +47,7 @@ @Override public void exceptionCaught(IoSession session, Throwable cause) { - logger.warn("Unexpected exception.", cause); + LOGGER.warn("Unexpected exception.", cause); // Close connection when unexpected exception is caught. session.close(true); } @@ -110,12 +110,12 @@ } break; default: - logger.info("Unhandled command: " + command); + LOGGER.info("Unhandled command: " + command); break; } } catch (IllegalArgumentException e) { - logger.debug("Illegal argument", e); + LOGGER.debug("Illegal argument", e); } } Modified: mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java?rev=768915&r1=768914&r2=768915&view=diff ============================================================================== --- mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java (original) +++ mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java Mon Apr 27 10:17:35 2009 @@ -35,7 +35,7 @@ * @version $Rev$, $Date$, */ public class EchoProtocolHandler extends IoHandlerAdapter { - private final Logger logger = LoggerFactory.getLogger(getClass()); + private final static Logger LOGGER = LoggerFactory.getLogger(EchoProtocolHandler.class); @Override public void sessionCreated(IoSession session) { @@ -47,17 +47,17 @@ @Override public void sessionClosed(IoSession session) throws Exception { - logger.info("CLOSED"); + LOGGER.info("CLOSED"); } @Override public void sessionOpened(IoSession session) throws Exception { - logger.info("OPENED"); + LOGGER.info("OPENED"); } @Override public void sessionIdle(IoSession session, IdleStatus status) { - logger.info("*** IDLE #" + session.getIdleCount(IdleStatus.BOTH_IDLE) + " ***"); + LOGGER.info("*** IDLE #" + session.getIdleCount(IdleStatus.BOTH_IDLE) + " ***"); } @Override @@ -68,7 +68,7 @@ @Override public void messageReceived(IoSession session, Object message) throws Exception { - logger.info( "Received : " + message ); + LOGGER.info( "Received : " + message ); // Write the received data back to remote peer session.write(((IoBuffer) message).duplicate()); } Modified: mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/server/ImageServerIoHandler.java URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/server/ImageServerIoHandler.java?rev=768915&r1=768914&r2=768915&view=diff ============================================================================== --- mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/server/ImageServerIoHandler.java (original) +++ mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/server/ImageServerIoHandler.java Mon Apr 27 10:17:35 2009 @@ -44,7 +44,7 @@ public static final String INDEX_KEY = ImageServerIoHandler.class.getName() + ".INDEX"; - private Logger logger = LoggerFactory.getLogger(this.getClass()); + private static Logger LOGGER = LoggerFactory.getLogger(ImageServerIoHandler.class); /** * Called when the session is opened, which will come after the session created. @@ -62,7 +62,7 @@ * @see org.apache.mina.core.service.IoHandlerAdapter#exceptionCaught(org.apache.mina.core.session.IoSession, java.lang.Throwable) */ public void exceptionCaught(IoSession session, Throwable cause) throws Exception { - logger.warn(cause.getMessage(), cause); + LOGGER.warn(cause.getMessage(), cause); } /** Modified: mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step3/server/ImageServerIoHandler.java URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step3/server/ImageServerIoHandler.java?rev=768915&r1=768914&r2=768915&view=diff ============================================================================== --- mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step3/server/ImageServerIoHandler.java (original) +++ mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step3/server/ImageServerIoHandler.java Mon Apr 27 10:17:35 2009 @@ -48,7 +48,7 @@ public static final String INDEX_KEY = ImageServerIoHandler.class.getName() + ".INDEX"; - private Logger logger = LoggerFactory.getLogger(this.getClass()); + private static Logger LOGGER = LoggerFactory.getLogger(ImageServerIoHandler.class); private MBeanServer mBeanServer; @@ -104,7 +104,7 @@ * @see org.apache.mina.core.service.IoHandlerAdapter#exceptionCaught(org.apache.mina.core.session.IoSession, java.lang.Throwable) */ public void exceptionCaught(IoSession session, Throwable cause) throws Exception { - logger.warn(cause.getMessage(), cause); + LOGGER.warn(cause.getMessage(), cause); } /** Modified: mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java?rev=768915&r1=768914&r2=768915&view=diff ============================================================================== --- mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java (original) +++ mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java Mon Apr 27 10:17:35 2009 @@ -39,7 +39,7 @@ private static final Charset CHARSET = Charset.forName("iso8859-1"); public static final String OTHER_IO_SESSION = AbstractProxyIoHandler.class.getName()+".OtherIoSession"; - private final Logger logger = LoggerFactory.getLogger(getClass()); + private final static Logger LOGGER = LoggerFactory.getLogger(AbstractProxyIoHandler.class); @Override public void sessionCreated(IoSession session) throws Exception { @@ -67,6 +67,6 @@ wb.flip(); ((IoSession) session.getAttribute(OTHER_IO_SESSION)).write(wb); rb.reset(); - logger.info(rb.getString(CHARSET.newDecoder())); + LOGGER.info(rb.getString(CHARSET.newDecoder())); } } Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java?rev=768915&r1=768914&r2=768915&view=diff ============================================================================== --- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java (original) +++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java Mon Apr 27 10:17:35 2009 @@ -35,7 +35,7 @@ */ public class ClientSessionHandler extends IoHandlerAdapter { - private final Logger logger = LoggerFactory.getLogger(getClass()); + private final static Logger LOGGER = LoggerFactory.getLogger(ClientSessionHandler.class); private final int[] values; @@ -72,13 +72,13 @@ // it is time to disconnect. if (rm.getSequence() == values.length - 1) { // print the sum and disconnect. - logger.info("The sum: " + rm.getValue()); + LOGGER.info("The sum: " + rm.getValue()); session.close(true); finished = true; } } else { // seever returned error code because of overflow, etc. - logger.warn("Server error, disconnecting..."); + LOGGER.warn("Server error, disconnecting..."); session.close(true); finished = true; } Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java?rev=768915&r1=768914&r2=768915&view=diff ============================================================================== --- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java (original) +++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java Mon Apr 27 10:17:35 2009 @@ -38,7 +38,7 @@ private static final String SUM_KEY = "sum"; - private final Logger logger = LoggerFactory.getLogger(getClass()); + private final static Logger LOGGER = LoggerFactory.getLogger(ServerSessionHandler.class); @Override public void sessionOpened(IoSession session) { @@ -81,7 +81,7 @@ @Override public void sessionIdle(IoSession session, IdleStatus status) { - logger.info("Disconnecting the idle."); + LOGGER.info("Disconnecting the idle."); // disconnect an idle client session.close(true); } Modified: mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java?rev=768915&r1=768914&r2=768915&view=diff ============================================================================== --- mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java (original) +++ mina/trunk/example/src/main/java/org/apache/mina/example/udp/client/MemMonClient.java Mon Apr 27 10:17:35 2009 @@ -41,7 +41,7 @@ */ public class MemMonClient extends IoHandlerAdapter { - private Logger log = LoggerFactory.getLogger(MemMonClient.class); + private final static Logger LOGGER = LoggerFactory.getLogger(MemMonClient.class); private IoSession session; @@ -52,25 +52,25 @@ */ public MemMonClient() { - log.debug("UDPClient::UDPClient"); - log.debug("Created a datagram connector"); + LOGGER.debug("UDPClient::UDPClient"); + LOGGER.debug("Created a datagram connector"); connector = new NioDatagramConnector(); - log.debug("Setting the handler"); + LOGGER.debug("Setting the handler"); connector.setHandler(this); - log.debug("About to connect to the server..."); + LOGGER.debug("About to connect to the server..."); ConnectFuture connFuture = connector.connect(new InetSocketAddress( "localhost", MemoryMonitor.PORT)); - log.debug("About to wait."); + LOGGER.debug("About to wait."); connFuture.awaitUninterruptibly(); - log.debug("Adding a future listener."); + LOGGER.debug("Adding a future listener."); connFuture.addListener(new IoFutureListener<ConnectFuture>() { public void operationComplete(ConnectFuture future) { if (future.isConnected()) { - log.debug("...connected"); + LOGGER.debug("...connected"); session = future.getSession(); try { sendData(); @@ -78,7 +78,7 @@ e.printStackTrace(); } } else { - log.error("Not connected...exiting"); + LOGGER.error("Not connected...exiting"); } } }); @@ -110,33 +110,33 @@ @Override public void messageReceived(IoSession session, Object message) throws Exception { - log.debug("Session recv..."); + LOGGER.debug("Session recv..."); } @Override public void messageSent(IoSession session, Object message) throws Exception { - log.debug("Message sent..."); + LOGGER.debug("Message sent..."); } @Override public void sessionClosed(IoSession session) throws Exception { - log.debug("Session closed..."); + LOGGER.debug("Session closed..."); } @Override public void sessionCreated(IoSession session) throws Exception { - log.debug("Session created..."); + LOGGER.debug("Session created..."); } @Override public void sessionIdle(IoSession session, IdleStatus status) throws Exception { - log.debug("Session idle..."); + LOGGER.debug("Session idle..."); } @Override public void sessionOpened(IoSession session) throws Exception { - log.debug("Session opened..."); + LOGGER.debug("Session opened..."); } public static void main(String[] args) { Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java?rev=768915&r1=768914&r2=768915&view=diff ============================================================================== --- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java (original) +++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java Mon Apr 27 10:17:35 2009 @@ -45,7 +45,7 @@ * @version $Rev:448075 $, $Date:2006-09-20 05:26:53Z $ */ public abstract class AbstractTest extends TestCase { - private final Logger logger = LoggerFactory.getLogger(getClass()); + private final static Logger LOGGER = LoggerFactory.getLogger(AbstractTest.class); protected boolean useSSL; @@ -58,6 +58,7 @@ protected IoAcceptor socketAcceptor; protected AbstractTest() { + // Do nothing } protected static void assertEquals(byte[] expected, byte[] actual) { @@ -123,7 +124,7 @@ new SslFilter(BogusSslContextFactory .getInstance(true))); } catch (GeneralSecurityException e) { - logger.error("", e); + LOGGER.error("", e); throw new RuntimeException(e); } } @@ -140,7 +141,7 @@ IoBuffer buf = (IoBuffer) message; if (session.getFilterChain().contains("SSL") && buf.remaining() == 1 && buf.get() == (byte) '.') { - logger.info("TLS Reentrance"); + LOGGER.info("TLS Reentrance"); ((SslFilter) session.getFilterChain().get("SSL")) .startSsl(session); @@ -179,7 +180,7 @@ } boundAddress = address; - logger.info("Using port " + port + " for testing."); + LOGGER.info("Using port " + port + " for testing."); } @Override Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java?rev=768915&r1=768914&r2=768915&view=diff ============================================================================== --- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java (original) +++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java Mon Apr 27 10:17:35 2009 @@ -46,7 +46,7 @@ * @version $Rev:448075 $, $Date:2006-09-20 05:26:53Z $ */ public class ConnectorTest extends AbstractTest { - private final static Logger logger = LoggerFactory.getLogger(ConnectorTest.class); + private final static Logger LOGGER = LoggerFactory.getLogger(ConnectorTest.class); private static final int TIMEOUT = 10000; // 10 seconds @@ -58,6 +58,7 @@ private SslFilter connectorSSLFilter; public ConnectorTest() { + // Do nothing } @Override @@ -196,7 +197,7 @@ //// in SocketIoProcessor if there was a read timeout because //// we share readBuf. readBuf.flip(); - logger.info("readBuf: " + readBuf); + LOGGER.info("readBuf: " + readBuf); Assert.assertEquals(DATA_SIZE * COUNT, readBuf.remaining()); IoBuffer expectedBuf = IoBuffer.allocate(DATA_SIZE * COUNT); for (int i = 0; i < COUNT; i++) { @@ -248,10 +249,10 @@ @Override public void exceptionCaught(IoSession session, Throwable cause) { - logger.warn("Unexpected exception.", cause); + LOGGER.warn("Unexpected exception.", cause); if (cause instanceof WriteException) { WriteException e = (WriteException) cause; - logger.warn("Failed write requests: {}", e.getRequests()); + LOGGER.warn("Failed write requests: {}", e.getRequests()); } } }