You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2012/12/14 10:04:16 UTC
svn commit: r1421750 - in /mina/mina/branches/2.0:
mina-core/src/main/java/org/apache/mina/core/filterchain/
mina-core/src/main/java/org/apache/mina/filter/codec/demux/
mina-core/src/main/java/org/apache/mina/filter/executor/
mina-core/src/main/java/or...
Author: elecharny
Date: Fri Dec 14 09:04:12 2012
New Revision: 1421750
URL: http://svn.apache.org/viewvc?rev=1421750&view=rev
Log:
Fixed some Sonar warnings
Modified:
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderResult.java
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/HttpProxyRequest.java
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/HttpProxyResponse.java
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/ntlm/NTLMResponses.java
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java
mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/util/byteaccess/ByteArrayPool.java
mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageResponseDecoder.java
mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java
mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java
mina/mina/branches/2.0/mina-statemachine/src/main/java/org/apache/mina/statemachine/State.java
Modified: mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java?rev=1421750&r1=1421749&r2=1421750&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java (original)
+++ mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java Fri Dec 14 09:04:12 2012
@@ -37,10 +37,10 @@ import org.slf4j.LoggerFactory;
*/
public class IoFilterEvent extends IoEvent {
/** A logger for this class */
- static Logger LOGGER = LoggerFactory.getLogger(IoFilterEvent.class);
+ private static Logger LOGGER = LoggerFactory.getLogger(IoFilterEvent.class);
/** A speedup for logs */
- static boolean DEBUG = LOGGER.isDebugEnabled();
+ private static boolean DEBUG = LOGGER.isDebugEnabled();
private final NextFilter nextFilter;
Modified: mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderResult.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderResult.java?rev=1421750&r1=1421749&r2=1421750&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderResult.java (original)
+++ mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/codec/demux/MessageDecoderResult.java Fri Dec 14 09:04:12 2012
@@ -32,21 +32,21 @@ public class MessageDecoderResult {
* and {@link MessageDecoder#decode(IoSession, IoBuffer, ProtocolDecoderOutput)}.
* Please refer to each method's documentation for detailed explanation.
*/
- public static MessageDecoderResult OK = new MessageDecoderResult("OK");
+ public static final MessageDecoderResult OK = new MessageDecoderResult("OK");
/**
* Represents a result from {@link MessageDecoder#decodable(IoSession, IoBuffer)}
* and {@link MessageDecoder#decode(IoSession, IoBuffer, ProtocolDecoderOutput)}.
* Please refer to each method's documentation for detailed explanation.
*/
- public static MessageDecoderResult NEED_DATA = new MessageDecoderResult("NEED_DATA");
+ public static final MessageDecoderResult NEED_DATA = new MessageDecoderResult("NEED_DATA");
/**
* Represents a result from {@link MessageDecoder#decodable(IoSession, IoBuffer)}
* and {@link MessageDecoder#decode(IoSession, IoBuffer, ProtocolDecoderOutput)}.
* Please refer to each method's documentation for detailed explanation.
*/
- public static MessageDecoderResult NOT_OK = new MessageDecoderResult("NOT_OK");
+ public static final MessageDecoderResult NOT_OK = new MessageDecoderResult("NOT_OK");
private final String name;
Modified: mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java?rev=1421750&r1=1421749&r2=1421750&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java (original)
+++ mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java Fri Dec 14 09:04:12 2012
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
*/
public class OrderedThreadPoolExecutor extends ThreadPoolExecutor {
/** A logger for this class (commented as it breaks MDCFlter tests) */
- static Logger LOGGER = LoggerFactory.getLogger(OrderedThreadPoolExecutor.class);
+ private static Logger LOGGER = LoggerFactory.getLogger(OrderedThreadPoolExecutor.class);
/** A default value for the initial pool size */
private static final int DEFAULT_INITIAL_THREAD_POOL_SIZE = 0;
Modified: mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/HttpProxyRequest.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/HttpProxyRequest.java?rev=1421750&r1=1421749&r2=1421750&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/HttpProxyRequest.java (original)
+++ mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/HttpProxyRequest.java Fri Dec 14 09:04:12 2012
@@ -42,12 +42,12 @@ public class HttpProxyRequest extends Pr
/**
* The HTTP verb.
*/
- public final String httpVerb;
+ private final String httpVerb;
/**
* The HTTP URI.
*/
- public final String httpURI;
+ private final String httpURI;
/**
* The HTTP protocol version.
Modified: mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/HttpProxyResponse.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/HttpProxyResponse.java?rev=1421750&r1=1421749&r2=1421750&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/HttpProxyResponse.java (original)
+++ mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/HttpProxyResponse.java Fri Dec 14 09:04:12 2012
@@ -32,27 +32,27 @@ public class HttpProxyResponse {
/**
* The HTTP response protocol version.
*/
- public final String httpVersion;
+ private final String httpVersion;
/**
* The HTTP response status line.
*/
- public final String statusLine;
+ private final String statusLine;
/**
* The HTTP response status code;
*/
- public final int statusCode;
+ private final int statusCode;
/**
* The HTTP response headers.
*/
- public final Map<String, List<String>> headers;
+ private final Map<String, List<String>> headers;
/**
* The HTTP response body.
*/
- public String body;
+ private String body;
/**
* Constructor of an HTTP proxy response.
Modified: mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/ntlm/NTLMResponses.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/ntlm/NTLMResponses.java?rev=1421750&r1=1421749&r2=1421750&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/ntlm/NTLMResponses.java (original)
+++ mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/proxy/handlers/http/ntlm/NTLMResponses.java Fri Dec 14 09:04:12 2012
@@ -43,15 +43,8 @@ import javax.crypto.spec.SecretKeySpec;
public class NTLMResponses {
// LAN Manager magic constant used in LM Response calculation
- public static byte[] LM_HASH_MAGIC_CONSTANT = null;
-
- static {
- try {
- LM_HASH_MAGIC_CONSTANT = "KGS!@#$%".getBytes("US-ASCII");
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- }
+ public static final byte[] LM_HASH_MAGIC_CONSTANT =
+ new byte[]{ 'K', 'G', 'S', '!', '@', '#', '$', '%' };
/**
* Calculates the LM Response for the given challenge, using the specified
Modified: mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java?rev=1421750&r1=1421749&r2=1421750&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java (original)
+++ mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/transport/vmpipe/VmPipeSession.java Fri Dec 14 09:04:12 2012
@@ -59,7 +59,7 @@ class VmPipeSession extends AbstractIoSe
private final Lock lock;
- final BlockingQueue<Object> receivedMessageQueue;
+ /** Package protected*/ final BlockingQueue<Object> receivedMessageQueue;
/*
* Constructor for client-side session.
Modified: mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/util/byteaccess/ByteArrayPool.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/util/byteaccess/ByteArrayPool.java?rev=1421750&r1=1421749&r2=1421750&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/util/byteaccess/ByteArrayPool.java (original)
+++ mina/mina/branches/2.0/mina-core/src/main/java/org/apache/mina/util/byteaccess/ByteArrayPool.java Fri Dec 14 09:04:12 2012
@@ -124,7 +124,7 @@ public class ByteArrayPool implements By
private class DirectBufferByteArray extends BufferByteArray {
- public boolean freed;
+ private boolean freed;
public DirectBufferByteArray(IoBuffer bb) {
super(bb);
Modified: mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageResponseDecoder.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageResponseDecoder.java?rev=1421750&r1=1421749&r2=1421750&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageResponseDecoder.java (original)
+++ mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/imagine/step1/codec/ImageResponseDecoder.java Fri Dec 14 09:04:12 2012
@@ -43,7 +43,7 @@ public class ImageResponseDecoder extend
public static final int MAX_IMAGE_SIZE = 5 * 1024 * 1024;
private static class DecoderState {
- BufferedImage image1;
+ private BufferedImage image1;
}
protected boolean doDecode(IoSession session, IoBuffer in, ProtocolDecoderOutput out) throws Exception {
Modified: mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java?rev=1421750&r1=1421749&r2=1421750&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java (original)
+++ mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/tapedeck/AuthenticationHandler.java Fri Dec 14 09:04:12 2012
@@ -45,9 +45,9 @@ public class AuthenticationHandler {
@State(ROOT) public static final String FAILED = "Failed";
static class AuthenticationContext extends AbstractStateContext {
- public String user;
- public String password;
- public int tries = 0;
+ private String user;
+ private String password;
+ private int tries = 0;
}
@IoFilterTransition(on = SESSION_OPENED, in = START, next = WAIT_USER)
Modified: mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java?rev=1421750&r1=1421749&r2=1421750&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java (original)
+++ mina/mina/branches/2.0/mina-example/src/main/java/org/apache/mina/example/tapedeck/TapeDeckServer.java Fri Dec 14 09:04:12 2012
@@ -49,7 +49,7 @@ public class TapeDeckServer {
};
static class TapeDeckContext extends AbstractStateContext {
- public String tapeName;
+ private String tapeName;
}
@IoHandlerTransition(on = SESSION_OPENED, in = EMPTY)
Modified: mina/mina/branches/2.0/mina-statemachine/src/main/java/org/apache/mina/statemachine/State.java
URL: http://svn.apache.org/viewvc/mina/mina/branches/2.0/mina-statemachine/src/main/java/org/apache/mina/statemachine/State.java?rev=1421750&r1=1421749&r2=1421750&view=diff
==============================================================================
--- mina/mina/branches/2.0/mina-statemachine/src/main/java/org/apache/mina/statemachine/State.java (original)
+++ mina/mina/branches/2.0/mina-statemachine/src/main/java/org/apache/mina/statemachine/State.java Fri Dec 14 09:04:12 2012
@@ -217,9 +217,9 @@ public class State {
}
private static class TransitionHolder implements Comparable<TransitionHolder> {
- Transition transition;
+ private Transition transition;
- int weight;
+ private int weight;
TransitionHolder(Transition transition, int weight) {
this.transition = transition;