NO-JIRA: Encapsulate fields, use private members and accesors (keep checkstyle happy)

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1236867 13f79535-47bb-0310-9956-ffa450edef68

26 files changed, 158 insertions, 98 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java b/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
index 92eca6bfbe..c7a0816f91 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQConnectionException.java
@@ -47,7 +47,7 @@ public class AMQConnectionException extends AMQException
     /** AMQP version for which exception ocurred, minor code. */
     private final byte minor;
 
-    boolean _closeConnetion;
+    private boolean _closeConnetion;
 
     public AMQConnectionException(AMQConstant errorCode, String msg, int classId, int methodId, byte major, byte minor,
         Throwable cause)
diff --git a/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java b/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
index 3b1b04220f..d9a9ee0782 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
@@ -36,7 +36,7 @@ import java.util.Collection;
  */
 public class AMQConnectionFailureException extends AMQException
 {
-    Collection<Exception> _exceptions;
+    private Collection<Exception> _exceptions;
     
 	public AMQConnectionFailureException(String message, Throwable cause)
 	{
diff --git a/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java b/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
index eee3e6afcf..82ffe583c3 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
@@ -35,7 +35,7 @@ package org.apache.qpid;
  */
 public class AMQUnresolvedAddressException extends AMQException
 {
-    String _broker;
+    private String _broker;
 
     public AMQUnresolvedAddressException(String message, String broker, Throwable cause)
     {
diff --git a/java/common/src/main/java/org/apache/qpid/QpidConfig.java b/java/common/src/main/java/org/apache/qpid/QpidConfig.java
index b4cad44130..67cac48613 100644
--- a/java/common/src/main/java/org/apache/qpid/QpidConfig.java
+++ b/java/common/src/main/java/org/apache/qpid/QpidConfig.java
@@ -67,8 +67,8 @@ public class QpidConfig
    
    public static class SecurityMechanism
    {
-        String type;
-        String handler;
+        private String type;
+        private String handler;
         
         SecurityMechanism(String type,String handler)
         {
@@ -89,8 +89,8 @@ public class QpidConfig
    
    public static class SaslClientFactory
    {
-        String type;
-        String factoryClass;
+        private String type;
+        private String factoryClass;
         
         SaslClientFactory(String type,String factoryClass)
         {
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java b/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java
index 134bd9da72..63a78f7971 100644
--- a/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java
+++ b/java/common/src/main/java/org/apache/qpid/configuration/Accessor.java
@@ -61,13 +61,18 @@ public interface Accessor
     
     static class MapAccessor implements Accessor
     {
-        protected Map<Object,Object> source;
+        private Map<Object,Object> source;
         
         public MapAccessor(Map<Object,Object> map)
         {
             source = map;
         }
-        
+
+        protected void setSource(Map<Object, Object> source)
+        {
+            this.source = source;
+        }
+
         public Boolean getBoolean(String name)
         {
             if (source != null && source.containsKey(name))
@@ -160,8 +165,10 @@ public interface Accessor
             {
                 inStream.close();
             }
-            source = props;
+            setSource(props);
         }
+
+
     }
     
     static class CombinedAccessor implements Accessor
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java b/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
index 9867bbf4e2..9d5e654ad0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
@@ -39,7 +39,7 @@ public class AMQDataBlockDecoder
         _bodiesSupported[HeartbeatBody.TYPE] = new HeartbeatBodyFactory();
     }
 
-    Logger _logger = LoggerFactory.getLogger(AMQDataBlockDecoder.class);
+    private Logger _logger = LoggerFactory.getLogger(AMQDataBlockDecoder.class);
 
     public AMQDataBlockDecoder()
     { }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java b/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
index 26b3bcc34c..6d6ec708d0 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ContentBody.java
@@ -33,7 +33,7 @@ public class ContentBody implements AMQBody
 {
     public static final byte TYPE = 3;
 
-    public byte[] _payload;
+    private byte[] _payload;
 
     public ContentBody()
     {
@@ -42,7 +42,7 @@ public class ContentBody implements AMQBody
     public ContentBody(DataInput buffer, long size) throws AMQFrameDecodingException, IOException
     {
         _payload = new byte[(int)size];
-        buffer.readFully(_payload);
+        buffer.readFully(getPayload());
     }
 
 
@@ -58,12 +58,12 @@ public class ContentBody implements AMQBody
 
     public int getSize()
     {
-        return _payload == null ? 0 : _payload.length;
+        return getPayload() == null ? 0 : getPayload().length;
     }
 
     public void writePayload(DataOutput buffer) throws IOException
     {
-        buffer.write(_payload);
+        buffer.write(getPayload());
     }
 
     public void handle(final int channelId, final AMQVersionAwareProtocolSession session)
@@ -77,7 +77,7 @@ public class ContentBody implements AMQBody
         if (size > 0)
         {
             _payload = new byte[(int)size];
-            buffer.read(_payload);
+            buffer.read(getPayload());
         }
 
     }
@@ -86,6 +86,11 @@ public class ContentBody implements AMQBody
     {
     }
 
+    public byte[] getPayload()
+    {
+        return _payload;
+    }
+
     private static class BufferContentBody implements AMQBody
     {
         private final int _length;
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java b/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
index 46f4c294b4..a0ed90244d 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
@@ -32,12 +32,11 @@ public class ContentHeaderBody implements AMQBody
 {
     public static final byte TYPE = 2;
 
-    public int classId;
+    private int classId;
 
-    public int weight;
+    private int weight;
 
-    /** unsigned long but java can't handle that anyway when allocating byte array */
-    public long bodySize;
+    private long bodySize;
 
     /** must never be null */
     private ContentHeaderProperties properties;
@@ -153,4 +152,25 @@ public class ContentHeaderBody implements AMQBody
                 ", properties=" + properties +
                 '}';
     }
+
+    public int getClassId()
+    {
+        return classId;
+    }
+
+    public int getWeight()
+    {
+        return weight;
+    }
+
+    /** unsigned long but java can't handle that anyway when allocating byte array */
+    public long getBodySize()
+    {
+        return bodySize;
+    }
+
+    public void setBodySize(long bodySize)
+    {
+        this.bodySize = bodySize;
+    }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java b/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
index f2cac92c78..3c1e67f488 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
@@ -37,11 +37,11 @@ public class ProtocolInitiation extends AMQDataBlock implements EncodableAMQData
     private static final byte CURRENT_PROTOCOL_CLASS = 1;
     private static final byte TCP_PROTOCOL_INSTANCE = 1;
 
-    public final byte[] _protocolHeader;
-    public final byte _protocolClass;
-    public final byte _protocolInstance;
-    public final byte _protocolMajor;
-    public final byte _protocolMinor;
+    private final byte[] _protocolHeader;
+    private final byte _protocolClass;
+    private final byte _protocolInstance;
+    private final byte _protocolMajor;
+    private final byte _protocolMinor;
 
 
 //    public ProtocolInitiation() {}
@@ -207,6 +207,26 @@ public class ProtocolInitiation extends AMQDataBlock implements EncodableAMQData
         return pv;
     }
 
+    public byte getProtocolClass()
+    {
+        return _protocolClass;
+    }
+
+    public byte getProtocolInstance()
+    {
+        return _protocolInstance;
+    }
+
+    public byte getProtocolMajor()
+    {
+        return _protocolMajor;
+    }
+
+    public byte getProtocolMinor()
+    {
+        return _protocolMinor;
+    }
+
     public String toString()
     {
         StringBuffer buffer = new StringBuffer(new String(_protocolHeader));
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
index d2a639591a..b3eb1211a5 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_9/MethodConverter_0_9.java
@@ -119,7 +119,7 @@ public class MethodConverter_0_9 extends AbstractMethodConverter implements Prot
 
         public byte[] getData()
         {
-            return _contentBodyChunk._payload;
+            return _contentBodyChunk.getPayload();
         }
 
         public void reduceToFit()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
index 6067a6ca6b..d33749d795 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_0_91/MethodConverter_0_91.java
@@ -118,7 +118,7 @@ public class MethodConverter_0_91 extends AbstractMethodConverter implements Pro
 
         public byte[] getData()
         {
-            return _contentBodyChunk._payload;
+            return _contentBodyChunk.getPayload();
         }
 
         public void reduceToFit()
diff --git a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
index 80e47bb84c..4c7772a3a9 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/amqp_8_0/MethodConverter_8_0.java
@@ -63,7 +63,7 @@ public class MethodConverter_8_0 extends AbstractMethodConverter implements Prot
 
             public byte[] getData()
             {
-                return contentBodyChunk._payload;
+                return contentBodyChunk.getPayload();
             }
 
             public void reduceToFit()
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java b/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
index 9bf37f07ec..34ebdb441b 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/ClientDelegate.java
@@ -45,11 +45,11 @@ public class ClientDelegate extends ConnectionDelegate
 
 
 
-    protected final ConnectionSettings _conSettings;
+    private final ConnectionSettings _connectionSettings;
 
     public ClientDelegate(ConnectionSettings settings)
     {
-        this._conSettings = settings;
+        _connectionSettings = settings;
     }
 
     public void init(Connection conn, ProtocolHeader hdr)
@@ -65,9 +65,9 @@ public class ClientDelegate extends ConnectionDelegate
     {
         Map<String,Object> clientProperties = new HashMap<String,Object>();
 
-        if(this._conSettings.getClientProperties() != null)
+        if(this._connectionSettings.getClientProperties() != null)
         {
-            clientProperties.putAll(_conSettings.getClientProperties());
+            clientProperties.putAll(_connectionSettings.getClientProperties());
         }
 
         clientProperties.put("qpid.session_flow", 1);
@@ -130,7 +130,7 @@ public class ClientDelegate extends ConnectionDelegate
     @Override
     public void connectionTune(Connection conn, ConnectionTune tune)
     {
-        int hb_interval = calculateHeartbeatInterval(_conSettings.getHeartbeatInterval(),
+        int hb_interval = calculateHeartbeatInterval(_connectionSettings.getHeartbeatInterval(),
                                                      tune.getHeartbeatMin(),
                                                      tune.getHeartbeatMax()
                                                      );
@@ -145,7 +145,7 @@ public class ClientDelegate extends ConnectionDelegate
         //(or that forced by protocol limitations [0xFFFF])
         conn.setChannelMax(channelMax == 0 ? Connection.MAX_CHANNEL_MAX : channelMax);
 
-        conn.connectionOpen(_conSettings.getVhost(), null, Option.INSIST);
+        conn.connectionOpen(_connectionSettings.getVhost(), null, Option.INSIST);
     }
 
     @Override
@@ -220,7 +220,8 @@ public class ClientDelegate extends ConnectionDelegate
 
     }
 
-
-
-
+    public ConnectionSettings getConnectionSettings()
+    {
+        return _connectionSettings;
+    }
 }
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java b/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
index f2216184aa..e04511497a 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
@@ -34,37 +34,37 @@ public class ConnectionSettings
 {
     public static final String WILDCARD_ADDRESS = "*";
 
-    String protocol = "tcp";
-    String host = "localhost";
-    String vhost;
-    String username = "guest";
-    String password = "guest";
-    int port = 5672;
-    boolean tcpNodelay = Boolean.valueOf(System.getProperty(ClientProperties.QPID_TCP_NODELAY_PROP_NAME,
+    private String protocol = "tcp";
+    private String host = "localhost";
+    private String vhost;
+    private String username = "guest";
+    private String password = "guest";
+    private int port = 5672;
+    private boolean tcpNodelay = Boolean.valueOf(System.getProperty(ClientProperties.QPID_TCP_NODELAY_PROP_NAME,
                                          System.getProperty(ClientProperties.AMQJ_TCP_NODELAY_PROP_NAME, "true")));
-    int maxChannelCount = 32767;
-    int maxFrameSize = 65535;
-    int heartbeatInterval;
-    int readBufferSize = 65535;
-    int writeBufferSize = 65535;
-    long transportTimeout = 60000;
+    private int maxChannelCount = 32767;
+    private int maxFrameSize = 65535;
+    private int heartbeatInterval;
+    private int readBufferSize = 65535;
+    private int writeBufferSize = 65535;
+    private long transportTimeout = 60000;
     
     // SSL props
-    boolean useSSL;
-    String keyStorePath = System.getProperty("javax.net.ssl.keyStore");
-    String keyStorePassword = System.getProperty("javax.net.ssl.keyStorePassword");
-    String keyStoreCertType = System.getProperty("qpid.ssl.keyStoreCertType","SunX509");;
-    String trustStoreCertType = System.getProperty("qpid.ssl.trustStoreCertType","SunX509");;
-    String trustStorePath = System.getProperty("javax.net.ssl.trustStore");;
-    String trustStorePassword = System.getProperty("javax.net.ssl.trustStorePassword");;
-    String certAlias;
-    boolean verifyHostname;
+    private boolean useSSL;
+    private String keyStorePath = System.getProperty("javax.net.ssl.keyStore");
+    private String keyStorePassword = System.getProperty("javax.net.ssl.keyStorePassword");
+    private String keyStoreCertType = System.getProperty("qpid.ssl.keyStoreCertType","SunX509");;
+    private String trustStoreCertType = System.getProperty("qpid.ssl.trustStoreCertType","SunX509");;
+    private String trustStorePath = System.getProperty("javax.net.ssl.trustStore");;
+    private String trustStorePassword = System.getProperty("javax.net.ssl.trustStorePassword");;
+    private String certAlias;
+    private boolean verifyHostname;
     
     // SASL props
-    String saslMechs = System.getProperty("qpid.sasl_mechs", null);
-    String saslProtocol = System.getProperty("qpid.sasl_protocol", "AMQP");
-    String saslServerName = System.getProperty("qpid.sasl_server_name", "localhost");
-    boolean useSASLEncryption;
+    private String saslMechs = System.getProperty("qpid.sasl_mechs", null);
+    private String saslProtocol = System.getProperty("qpid.sasl_protocol", "AMQP");
+    private String saslServerName = System.getProperty("qpid.sasl_server_name", "localhost");
+    private boolean useSASLEncryption;
    
     private Map<String, Object> _clientProperties;
     
diff --git a/java/common/src/main/java/org/apache/qpid/transport/Struct.java b/java/common/src/main/java/org/apache/qpid/transport/Struct.java
index d3ff33ee3b..9b703a3117 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/Struct.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/Struct.java
@@ -41,7 +41,7 @@ public abstract class Struct implements Encodable
         return StructFactory.create(type);
     }
 
-    boolean dirty = true;
+    private boolean dirty = true;
 
     public boolean isDirty()
     {
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java b/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java
index 5e8acc22a8..a9321fbec1 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLReceiver.java
@@ -30,7 +30,7 @@ import java.nio.ByteBuffer;
 
 public class SASLReceiver extends SASLEncryptor implements Receiver<ByteBuffer> {
 
-    Receiver<ByteBuffer> delegate;
+    private Receiver<ByteBuffer> delegate;
     private byte[] netData;
     private static final Logger log = Logger.get(SASLReceiver.class);
     
diff --git a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java b/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java
index da31c271e1..7879f2c849 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/network/security/ssl/QpidClientX509KeyManager.java
@@ -37,8 +37,8 @@ public class QpidClientX509KeyManager extends X509ExtendedKeyManager
 {
     private static final Logger log = Logger.get(QpidClientX509KeyManager.class);
     
-    X509ExtendedKeyManager delegate;
-    String alias;
+    private X509ExtendedKeyManager delegate;
+    private String alias;
     
     public QpidClientX509KeyManager(String alias, String keyStorePath,
                            String keyStorePassword,String keyStoreCertType) throws GeneralSecurityException, IOException
diff --git a/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java b/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
index 857d1decc4..3b9a0baab2 100644
--- a/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
+++ b/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
@@ -33,12 +33,12 @@ public class AMQBindingURL implements BindingURL
 {
     private static final Logger _logger = LoggerFactory.getLogger(AMQBindingURL.class);
 
-    String _url;
-    AMQShortString _exchangeClass = ExchangeDefaults.DIRECT_EXCHANGE_CLASS;
-    AMQShortString _exchangeName = new AMQShortString("");
-    AMQShortString _destinationName = new AMQShortString("");;
-    AMQShortString _queueName = new AMQShortString("");
-    AMQShortString[] _bindingKeys = new AMQShortString[0];
+    private String _url;
+    private AMQShortString _exchangeClass = ExchangeDefaults.DIRECT_EXCHANGE_CLASS;
+    private AMQShortString _exchangeName = new AMQShortString("");
+    private AMQShortString _destinationName = new AMQShortString("");;
+    private AMQShortString _queueName = new AMQShortString("");
+    private AMQShortString[] _bindingKeys = new AMQShortString[0];
     private HashMap<String, String> _options;
 
     public AMQBindingURL(String url) throws URISyntaxException
diff --git a/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java b/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
index cb276a70e5..e4cebb6926 100644
--- a/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
+++ b/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
@@ -655,22 +655,22 @@ public class CommandLineParser
     protected static class CommandLineOption
     {
         /** Holds the text for the flag to match this argument with. */
-        public String option = null;
+        private String option = null;
 
         /** Holds a string describing how to use this command line argument. */
-        public String argument = null;
+        private String argument = null;
 
         /** Flag that determines whether or not this command line argument can take arguments. */
-        public boolean expectsArgs = false;
+        private boolean expectsArgs = false;
 
         /** Holds a short comment describing what this command line argument is for. */
-        public String comment = null;
+        private String comment = null;
 
         /** Flag that determines whether or not this is an mandatory command line argument. */
-        public boolean mandatory = false;
+        private boolean mandatory = false;
 
         /** A regular expression describing what format the argument to this option muist have. */
-        public String argumentFormatRegexp = null;
+        private String argumentFormatRegexp = null;
 
         /**
          * Create a command line option object that holds specific information about a command line option.
diff --git a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java b/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
index 633cf4fe3a..0f9bd64233 100644
--- a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
+++ b/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedMessageQueueAtomicSize.java
@@ -186,10 +186,10 @@ public class ConcurrentLinkedMessageQueueAtomicSize<E> extends ConcurrentLinkedQ
 
         return new Iterator<E>()
             {
-                final Iterator<E> _headIterator = _messageHead.iterator();
-                final Iterator<E> _mainIterator = mainMessageIterator;
+                private final Iterator<E> _headIterator = _messageHead.iterator();
+                private final Iterator<E> _mainIterator = mainMessageIterator;
 
-                Iterator<E> last;
+                private Iterator<E> last;
 
                 public boolean hasNext()
                 {
@@ -217,7 +217,7 @@ public class ConcurrentLinkedMessageQueueAtomicSize<E> extends ConcurrentLinkedQ
                     last.remove();
                     if(last == _mainIterator)
                     {
-                        _size.decrementAndGet();
+                        decrementSize();
                     }
                     else
                     {
diff --git a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java b/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
index c4d7683a02..dd91a067b5 100644
--- a/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
+++ b/java/common/src/main/java/org/apache/qpid/util/ConcurrentLinkedQueueAtomicSize.java
@@ -25,13 +25,20 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 public class ConcurrentLinkedQueueAtomicSize<E> extends ConcurrentLinkedQueue<E>
 {
-    AtomicInteger _size = new AtomicInteger(0);
+    private AtomicInteger _size = new AtomicInteger(0);
 
     public int size()
     {
         return _size.get();
     }
 
+    protected final void decrementSize()
+    {
+        _size.decrementAndGet();
+    }
+
+
+
     public boolean offer(E o)
     {
 
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java b/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
index de48925076..1d5f3b5e46 100644
--- a/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
+++ b/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
@@ -70,7 +70,7 @@ public abstract class BatchSynchQueueBase<E> extends AbstractQueue<E> implements
     private static final Logger log = LoggerFactory.getLogger(BatchSynchQueueBase.class);
 
     /** Holds a reference to the queue implementation that holds the buffer. */
-    Queue<SynchRecordImpl<E>> buffer;
+    private Queue<SynchRecordImpl<E>> buffer;
 
     /** Holds the number of items in the queue */
     private int count;
@@ -705,10 +705,10 @@ public abstract class BatchSynchQueueBase<E> extends AbstractQueue<E> implements
     public class SynchRefImpl implements SynchRef
     {
         /** Holds the number of synch records associated with this reference. */
-        int numRecords;
+        private int numRecords;
 
         /** Holds a reference to the collection of synch records managed by this. */
-        Collection<SynchRecord<E>> records;
+        private Collection<SynchRecord<E>> records;
 
         public SynchRefImpl(int n, Collection<SynchRecord<E>> records)
         {
@@ -753,10 +753,10 @@ public abstract class BatchSynchQueueBase<E> extends AbstractQueue<E> implements
     public class SynchRecordImpl<E> implements SynchRecord<E>
     {
         /** A boolean latch that determines when the producer for this data item will be allowed to continue. */
-        BooleanLatch latch = new BooleanLatch();
+        private BooleanLatch latch = new BooleanLatch();
 
         /** The data element associated with this item. */
-        E element;
+        private E element;
 
         /**
          * Create a new synch record.
diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchException.java b/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchException.java
index 99a83f96cd..23ee695079 100644
--- a/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchException.java
+++ b/java/common/src/main/java/org/apache/qpid/util/concurrent/SynchException.java
@@ -34,7 +34,7 @@ package org.apache.qpid.util.concurrent;
 public class SynchException extends Exception
 {
     /** Holds the data element that is in error. */
-    Object element;
+    private Object element;
 
     /**
      * Creates a new BaseApplicationException object.
diff --git a/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java b/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
index 4818ecc3d3..1a2c5283b0 100644
--- a/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
+++ b/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
@@ -32,10 +32,10 @@ import java.io.IOException;
 public class BasicContentHeaderPropertiesTest extends TestCase
 {
 
-    BasicContentHeaderProperties _testProperties;
-    FieldTable _testTable;
-    String _testString = "This is a test string";
-    int _testint = 666;
+    private BasicContentHeaderProperties _testProperties;
+    private FieldTable _testTable;
+    private String _testString = "This is a test string";
+    private int _testint = 666;
 
     /**
      * Currently only test setting/getting String, int and boolean props
diff --git a/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java b/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
index ad075ff0c2..5a57db1650 100644
--- a/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
+++ b/java/common/src/test/java/org/apache/qpid/framing/abstraction/MessagePublishInfoImplTest.java
@@ -26,9 +26,9 @@ import org.apache.qpid.framing.AMQShortString;
 
 public class MessagePublishInfoImplTest extends TestCase
 {
-    MessagePublishInfoImpl _mpi;
-    final AMQShortString _exchange = new AMQShortString("exchange");
-    final AMQShortString _routingKey = new AMQShortString("routingKey");
+    private MessagePublishInfoImpl _mpi;
+    private final AMQShortString _exchange = new AMQShortString("exchange");
+    private final AMQShortString _routingKey = new AMQShortString("routingKey");
 
     public void setUp()
     {
diff --git a/java/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java b/java/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java
index 57c0549193..7d28f079ec 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java
+++ b/java/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java
@@ -25,7 +25,7 @@ import org.apache.qpid.test.utils.QpidTestCase;
 
 public class ConnectionSettingsTest extends QpidTestCase
 {
-    ConnectionSettings _conConnectionSettings;
+    private ConnectionSettings _conConnectionSettings;
 
     protected void setUp() throws Exception
     {