Repository: mina Updated Branches: refs/heads/2.0 7f2edfb98 -> 101a32e7e
Fixed some SonarQube warnings Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/90542865 Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/90542865 Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/90542865 Branch: refs/heads/2.0 Commit: 9054286522cbd6b1102dc5fd37d4f13d6d011e73 Parents: 7f2edfb Author: Emmanuel Lécharny <elecha...@symas.com> Authored: Fri Dec 25 22:46:56 2015 +0100 Committer: Emmanuel Lécharny <elecha...@symas.com> Committed: Fri Dec 25 22:46:56 2015 +0100 ---------------------------------------------------------------------- .../org/apache/mina/core/filterchain/IoFilterEvent.java | 4 ++-- .../org/apache/mina/core/session/AbstractIoSession.java | 2 +- .../org/apache/mina/filter/executor/ExecutorFilter.java | 2 +- .../mina/filter/executor/OrderedThreadPoolExecutor.java | 2 +- .../transport/socket/DefaultDatagramSessionConfig.java | 10 +++++----- .../transport/socket/DefaultSocketSessionConfig.java | 12 ++++++------ .../mina/transport/socket/nio/NioDatagramAcceptor.java | 4 +--- .../java/org/apache/mina/http/HttpClientDecoder.java | 2 +- .../mina/integration/beans/InetSocketAddressEditor.java | 2 +- 9 files changed, 19 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/90542865/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java index 076343d..035fe9a 100644 --- a/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java +++ b/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java @@ -37,10 +37,10 @@ import org.slf4j.LoggerFactory; */ public class IoFilterEvent extends IoEvent { /** A logger for this class */ - private static Logger LOGGER = LoggerFactory.getLogger(IoFilterEvent.class); + private static final Logger LOGGER = LoggerFactory.getLogger(IoFilterEvent.class); /** A speedup for logs */ - private static boolean DEBUG = LOGGER.isDebugEnabled(); + private static final boolean DEBUG = LOGGER.isDebugEnabled(); private final NextFilter nextFilter; http://git-wip-us.apache.org/repos/asf/mina/blob/90542865/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java b/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java index 25c712c..9897697 100644 --- a/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java +++ b/mina-core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java @@ -332,7 +332,7 @@ public abstract class AbstractIoSession implements IoSession { return closeFuture; } - private final CloseFuture closeOnFlush() { + private CloseFuture closeOnFlush() { getWriteRequestQueue().offer(this, CLOSE_REQUEST); getProcessor().flush(this); return closeFuture; http://git-wip-us.apache.org/repos/asf/mina/blob/90542865/mina-core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java b/mina-core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java index 325f79a..47cd3a2 100644 --- a/mina-core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java +++ b/mina-core/src/main/java/org/apache/mina/filter/executor/ExecutorFilter.java @@ -138,7 +138,7 @@ public class ExecutorFilter extends IoFilterAdapter { private static final boolean NOT_MANAGEABLE_EXECUTOR = false; /** A list of default EventTypes to be handled by the executor */ - private static IoEventType[] DEFAULT_EVENT_SET = new IoEventType[] { IoEventType.EXCEPTION_CAUGHT, + private static final IoEventType[] DEFAULT_EVENT_SET = new IoEventType[] { IoEventType.EXCEPTION_CAUGHT, IoEventType.MESSAGE_RECEIVED, IoEventType.MESSAGE_SENT, IoEventType.SESSION_CLOSED, IoEventType.SESSION_IDLE, IoEventType.SESSION_OPENED }; http://git-wip-us.apache.org/repos/asf/mina/blob/90542865/mina-core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java b/mina-core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java index 14c400f..101aa2b 100644 --- a/mina-core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java +++ b/mina-core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java @@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory; */ public class OrderedThreadPoolExecutor extends ThreadPoolExecutor { /** A logger for this class (commented as it breaks MDCFlter tests) */ - private static Logger LOGGER = LoggerFactory.getLogger(OrderedThreadPoolExecutor.class); + private static final Logger LOGGER = LoggerFactory.getLogger(OrderedThreadPoolExecutor.class); /** A default value for the initial pool size */ private static final int DEFAULT_INITIAL_THREAD_POOL_SIZE = 0; http://git-wip-us.apache.org/repos/asf/mina/blob/90542865/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java b/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java index 50ae037..843e893 100644 --- a/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java +++ b/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultDatagramSessionConfig.java @@ -27,17 +27,17 @@ import java.net.DatagramSocket; * @author <a href="http://mina.apache.org";>Apache MINA Project</a> */ public class DefaultDatagramSessionConfig extends AbstractDatagramSessionConfig { - private static boolean DEFAULT_BROADCAST = false; + private static final boolean DEFAULT_BROADCAST = false; - private static boolean DEFAULT_REUSE_ADDRESS = false; + private static final boolean DEFAULT_REUSE_ADDRESS = false; /* The SO_RCVBUF parameter. Set to -1 (ie, will default to OS default) */ - private static int DEFAULT_RECEIVE_BUFFER_SIZE = -1; + private static final int DEFAULT_RECEIVE_BUFFER_SIZE = -1; /* The SO_SNDBUF parameter. Set to -1 (ie, will default to OS default) */ - private static int DEFAULT_SEND_BUFFER_SIZE = -1; + private static final int DEFAULT_SEND_BUFFER_SIZE = -1; - private static int DEFAULT_TRAFFIC_CLASS = 0; + private static final int DEFAULT_TRAFFIC_CLASS = 0; private boolean broadcast = DEFAULT_BROADCAST; http://git-wip-us.apache.org/repos/asf/mina/blob/90542865/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java b/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java index 7ddd9bf..f88bd4c 100644 --- a/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java +++ b/mina-core/src/main/java/org/apache/mina/transport/socket/DefaultSocketSessionConfig.java @@ -27,17 +27,17 @@ import org.apache.mina.core.service.IoService; * @author <a href="http://mina.apache.org";>Apache MINA Project</a> */ public class DefaultSocketSessionConfig extends AbstractSocketSessionConfig { - private static boolean DEFAULT_REUSE_ADDRESS = false; + private static final boolean DEFAULT_REUSE_ADDRESS = false; - private static int DEFAULT_TRAFFIC_CLASS = 0; + private static final int DEFAULT_TRAFFIC_CLASS = 0; - private static boolean DEFAULT_KEEP_ALIVE = false; + private static final boolean DEFAULT_KEEP_ALIVE = false; - private static boolean DEFAULT_OOB_INLINE = false; + private static final boolean DEFAULT_OOB_INLINE = false; - private static int DEFAULT_SO_LINGER = -1; + private static final int DEFAULT_SO_LINGER = -1; - private static boolean DEFAULT_TCP_NO_DELAY = false; + private static final boolean DEFAULT_TCP_NO_DELAY = false; protected IoService parent; http://git-wip-us.apache.org/repos/asf/mina/blob/90542865/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java ---------------------------------------------------------------------- diff --git a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java index 64bdee2..c353de3 100644 --- a/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java +++ b/mina-core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramAcceptor.java @@ -637,9 +637,7 @@ public final class NioDatagramAcceptor extends AbstractIoAcceptor implements Dat byte[] ipV6Address = ((Inet6Address) inetAddress).getAddress(); byte[] ipV4Address = new byte[4]; - for (int i = 0; i < 4; i++) { - ipV4Address[i] = ipV6Address[12 + i]; - } + System.arraycopy(ipV6Address, 12, ipV4Address, 0, 4); InetAddress inet4Adress = Inet4Address.getByAddress(ipV4Address); return new InetSocketAddress(inet4Adress, inetSocketAddress.getPort()); http://git-wip-us.apache.org/repos/asf/mina/blob/90542865/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java ---------------------------------------------------------------------- diff --git a/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java b/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java index 9f92edd..bd3e9a0 100644 --- a/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java +++ b/mina-http/src/main/java/org/apache/mina/http/HttpClientDecoder.java @@ -117,7 +117,7 @@ public class HttpClientDecoder implements ProtocolDecoder { session.setAttribute(BODY_REMAINING_BYTES, Integer.valueOf(contentLen)); } else if ("chunked".equalsIgnoreCase(rp.getHeader("transfer-encoding"))) { LOG.debug("no content len but chunked"); - session.setAttribute(BODY_CHUNKED, Boolean.valueOf("true")); + session.setAttribute(BODY_CHUNKED, Boolean.TRUE); } else if ("close".equalsIgnoreCase(rp.getHeader("connection"))) { session.close(true); } else { http://git-wip-us.apache.org/repos/asf/mina/blob/90542865/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/InetSocketAddressEditor.java ---------------------------------------------------------------------- diff --git a/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/InetSocketAddressEditor.java b/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/InetSocketAddressEditor.java index c8c79eb..7b7259b 100644 --- a/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/InetSocketAddressEditor.java +++ b/mina-integration-beans/src/main/java/org/apache/mina/integration/beans/InetSocketAddressEditor.java @@ -59,7 +59,7 @@ public class InetSocketAddressEditor extends AbstractPropertyEditor { return defaultValue(); } - int colonIndex = text.lastIndexOf(":"); + int colonIndex = text.lastIndexOf(':'); if (colonIndex > 0) { String host = text.substring(0, colonIndex); if (!"*".equals(host)) {
