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

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

31 files changed, 73 insertions, 64 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java
index 09a03a17a0..c5dd523214 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/AMQTestConnection_0_10.java
@@ -29,6 +29,6 @@ public class AMQTestConnection_0_10 extends AMQConnection
     
     public Connection getConnection()
     {
-        return((AMQConnectionDelegate_0_10)_delegate).getQpidConnection();
+        return((AMQConnectionDelegate_0_10)getDelegate()).getQpidConnection();
     }    
 }
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java
index b42293066c..3537dd0533 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/DispatcherTest.java
@@ -53,15 +53,15 @@ public class DispatcherTest extends QpidBrokerTestCase
 {
     private static final Logger _logger = LoggerFactory.getLogger(DispatcherTest.class);
 
-    Context _context;
+    private Context _context;
 
     private static final int MSG_COUNT = 6;
     private int _receivedCount = 0;
     private int _receivedCountWhileStopped = 0;
     private Connection _clientConnection, _producerConnection;
     private MessageConsumer _consumer;
-    MessageProducer _producer;
-    Session _clientSession, _producerSession;
+    private MessageProducer _producer;
+    private Session _clientSession, _producerSession;
 
     private final CountDownLatch _allFirstMessagesSent = new CountDownLatch(1); // all messages Sent Lock
     private final CountDownLatch _allSecondMessagesSent = new CountDownLatch(1); // all messages Sent Lock
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
index 615d765ed5..4fd10a0134 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
@@ -50,7 +50,7 @@ public class MessageListenerMultiConsumerTest extends QpidBrokerTestCase
 {
     private static final Logger _logger = LoggerFactory.getLogger(MessageListenerMultiConsumerTest.class);
 
-    Context _context;
+    private Context _context;
 
     private static final int MSG_COUNT = 6;
     private int receivedCount1 = 0;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java
index 1fdd7ce681..142f301bd0 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java
@@ -52,7 +52,7 @@ public class MessageListenerTest extends QpidBrokerTestCase implements MessageLi
 {
     private static final Logger _logger = LoggerFactory.getLogger(MessageListenerTest.class);
 
-    Context _context;
+    private Context _context;
 
     private static final int MSG_COUNT = 5;
     private int _receivedCount = 0;
@@ -245,7 +245,6 @@ public class MessageListenerTest extends QpidBrokerTestCase implements MessageLi
         _awaitMessages.countDown();
     }
 
-    @Override
     public void onException(JMSException e)
     {
         _logger.info("Exception received", e);
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java
index 53f02bb234..6ff6681c47 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java
@@ -51,13 +51,13 @@ public class ResetMessageListenerTest extends QpidBrokerTestCase
 {
     private static final Logger _logger = LoggerFactory.getLogger(ResetMessageListenerTest.class);
 
-    Context _context;
+    private Context _context;
 
     private static final int MSG_COUNT = 6;
     private Connection _clientConnection, _producerConnection;
     private MessageConsumer _consumer1;
-    MessageProducer _producer;
-    Session _clientSession, _producerSession;
+    private MessageProducer _producer;
+    private Session _clientSession, _producerSession;
 
     private final CountDownLatch _allFirstMessagesSent = new CountDownLatch(MSG_COUNT); // all messages Sent Lock
     private final CountDownLatch _allSecondMessagesSent = new CountDownLatch(MSG_COUNT); // all messages Sent Lock
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java
index 9bf96abe91..d7295b298e 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/SessionCreateTest.java
@@ -37,7 +37,7 @@ public class SessionCreateTest extends QpidBrokerTestCase
 {
     private static final Logger _logger = LoggerFactory.getLogger(MessageListenerTest.class);
 
-    Context _context;
+    private Context _context;
 
     private Connection _clientConnection;
     protected int maxSessions = 65555;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
index 4a26f93cfd..c4b1b08eea 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
@@ -42,9 +42,9 @@ public class AMQPEncodedMapMessageTest extends QpidBrokerTestCase
 {
     private Connection _connection;
     private Session _session;
-    MessageConsumer _consumer;
-    MessageProducer _producer;
-    UUID myUUID = UUID.randomUUID();
+    private MessageConsumer _consumer;
+    private MessageProducer _producer;
+    private UUID myUUID = UUID.randomUUID();
     
     public void setUp() throws Exception
     {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
index 60bb7ed46a..6f54a56e93 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/configuration/ServerConfigurationFileTest.java
@@ -33,7 +33,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
  */
 public class ServerConfigurationFileTest extends QpidBrokerTestCase
 {
-    ServerConfiguration _serverConfig;
+    private ServerConfiguration _serverConfig;
 
     public void setUp() throws ConfigurationException
     {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
index 379f6c89d3..b666b1f424 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
@@ -47,7 +47,7 @@ public class AbstractTestLogging extends QpidBrokerTestCase
     public static final String TEST_LOG_PREFIX = "MESSAGE";
     protected LogMonitor _monitor;
 
-    InternalBrokerBaseCase _configLoader;
+    private InternalBrokerBaseCase _configLoader;
 
     @Override
     public void setUp() throws Exception
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
index be2da128bc..2c7288de14 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BindingLoggingTest.java
@@ -45,10 +45,10 @@ public class BindingLoggingTest extends AbstractTestLogging
 
     static final String BND_PREFIX = "BND-";
 
-    Connection _connection;
-    Session _session;
-    Queue _queue;
-    Topic _topic;
+    private Connection _connection;
+    private Session _session;
+    private Queue _queue;
+    private Topic _topic;
 
     @Override
     public void setUp() throws Exception
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
index 10aa4011bb..edffa7c0c0 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
@@ -53,11 +53,11 @@ public class ExchangeLoggingTest extends AbstractTestLogging
 
     static final String EXH_PREFIX = "EXH-";
 
-    Connection _connection;
-    Session _session;
-    Queue _queue;
-    String _name;
-    String _type;
+    private Connection _connection;
+    private Session _session;
+    private Queue _queue;
+    private String _name;
+    private String _type;
 
     @Override
     public void setUp() throws Exception
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
index 9190a4c203..ddcb96b4db 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/SubscriptionLoggingTest.java
@@ -49,10 +49,10 @@ public class SubscriptionLoggingTest extends AbstractTestLogging
 {
     static final String SUB_PREFIX = "SUB-";
 
-    Connection _connection;
-    Session _session;
-    Queue _queue;
-    Topic _topic;
+    private Connection _connection;
+    private Session _session;
+    private Queue _queue;
+    private Topic _topic;
 
     @Override
     public void setUp() throws Exception
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java
index dd0ee7e5e1..86c9462fc9 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/TestingBaseCase.java
@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;
 public class TestingBaseCase extends QpidBrokerTestCase implements ExceptionListener, ConnectionListener
 {
 
-    Topic _destination;
+    private Topic _destination;
     protected CountDownLatch _disconnectionLatch = new CountDownLatch(1);
     protected int MAX_QUEUE_MESSAGE_COUNT;
     protected int MESSAGE_SIZE = DEFAULT_MESSAGE_SIZE;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
index e7c1452a7f..e06ed6e171 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
@@ -96,7 +96,7 @@ public class DupsOkTest extends QpidBrokerTestCase
 
         consumer.setMessageListener(new MessageListener()
         {
-            int _msgCount = 0;
+            private int _msgCount = 0;
 
             public void onMessage(Message message)
             {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java
index 106d3a3a16..dc1f690b1e 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/MessageToStringTest.java
@@ -47,7 +47,7 @@ public class MessageToStringTest extends QpidBrokerTestCase
     private Connection _connection;
     private Session _session;
     private Queue _queue;
-    MessageConsumer _consumer;
+    private MessageConsumer _consumer;
     private static final String BYTE_TEST = "MapByteTest";
 
     public void setUp() throws Exception
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
index b0bf1421b4..3bd2c4a44e 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
@@ -37,8 +37,8 @@ public class ObjectMessageTest extends QpidBrokerTestCase
 {
     private Connection _connection;
     private Session _session;
-    MessageConsumer _consumer;
-    MessageProducer _producer;
+    private MessageConsumer _consumer;
+    private MessageProducer _producer;
 
     public void setUp() throws Exception
     {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
index 71725140cd..afb7b5bc5b 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/ExceptionMonitor.java
@@ -58,7 +58,7 @@ public class ExceptionMonitor implements ExceptionListener
     private final Logger log = Logger.getLogger(ExceptionMonitor.class);
 
     /** Holds the received exceptions. */
-    List<Exception> exceptions = new ArrayList<Exception>();
+    private List<Exception> exceptions = new ArrayList<Exception>();
 
     /**
      * Receives incoming exceptions.
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
index 8df82d6922..809bb1dd2f 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/distributedtesting/FanOutTestDecorator.java
@@ -57,7 +57,7 @@ public class FanOutTestDecorator extends DistributedTestDecorator implements Mes
     private static final Logger log = Logger.getLogger(FanOutTestDecorator.class);
 
     /** Holds the currently running test case. */
-    FrameworkBaseCase currentTest = null;
+    private FrameworkBaseCase currentTest = null;
 
     /**
      * Creates a wrapped suite test decorator from another one.
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
index 4c4f5ecc2d..833f5fb674 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/FanOutCircuitFactory.java
@@ -65,7 +65,7 @@ import java.util.Properties;
 public class FanOutCircuitFactory extends BaseCircuitFactory
 {
     /** Used for debugging. */
-    Logger log = Logger.getLogger(FanOutCircuitFactory.class);
+    private Logger log = Logger.getLogger(FanOutCircuitFactory.class);
 
     /**
      * Creates a test circuit for the test, configered by the test parameters specified.
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
index e36b052e48..a4c6888d68 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/sequencers/InteropCircuitFactory.java
@@ -58,7 +58,7 @@ import java.util.Properties;
 public class InteropCircuitFactory extends BaseCircuitFactory
 {
     /** Used for debugging. */
-    Logger log = Logger.getLogger(InteropCircuitFactory.class);
+    private Logger log = Logger.getLogger(InteropCircuitFactory.class);
 
     /**
      * Creates a test circuit for the test, configered by the test parameters specified.
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
index 6cd67068ee..23ea4ac258 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
@@ -382,8 +382,8 @@ public class RecoverTest extends QpidBrokerTestCase
 
         cons.setMessageListener(new MessageListener()
         {               
-            int messageSeen = 0;
-            int expectedIndex = 0;
+            private int messageSeen = 0;
+            private int expectedIndex = 0;
 
             public void onMessage(Message message)
             {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
index 1d0beb155b..599c8061a7 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
@@ -55,7 +55,7 @@ public class FieldTableMessageTest extends QpidBrokerTestCase implements Message
     private final ArrayList<JMSBytesMessage> received = new ArrayList<JMSBytesMessage>();
     private FieldTable _expected;
     private int _count = 10;
-    public String _connectionString = "vm://:1";
+    private String _connectionString = "vm://:1";
     private CountDownLatch _waitForCompletion;
 
     protected void setUp() throws Exception
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
index 7774144a29..3c26cbb3c9 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
@@ -72,6 +72,11 @@ public class MultipleConnectionTest extends QpidBrokerTestCase
         {
             _connection.close();
         }
+
+        public MessageCounter[] getCounters()
+        {
+            return _counters;
+        }
     }
 
     private class Publisher
@@ -151,7 +156,7 @@ public class MultipleConnectionTest extends QpidBrokerTestCase
     {
         for (int i = 0; i < receivers.length; i++)
         {
-            waitForCompletion(expected, wait, receivers[i]._counters);
+            waitForCompletion(expected, wait, receivers[i].getCounters());
         }
     }
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
index fcf27ffe8a..c20eefd987 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseTest.java
@@ -52,7 +52,7 @@ public class ChannelCloseTest extends QpidBrokerTestCase implements ExceptionLis
 {
     private static final Logger _logger = LoggerFactory.getLogger(ChannelCloseTest.class);
 
-    Connection _connection;
+    private Connection _connection;
     private Session _session;
     private static final long SYNC_TIMEOUT = 500;
     private int TEST = 0;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
index aebcdffd20..0650531d2b 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
@@ -38,9 +38,9 @@ import java.util.concurrent.TimeUnit;
 public class ConnectionStartTest extends QpidBrokerTestCase
 {
 
-    String _broker = "vm://:1";
+    private String _broker = "vm://:1";
 
-    AMQConnection _connection;
+    private AMQConnection _connection;
     private Session _consumerSess;
     private MessageConsumer _consumer;
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
index 57f34277c4..375626a2fa 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
@@ -43,9 +43,9 @@ import javax.jms.TopicSession;
 public class ConnectionTest extends QpidBrokerTestCase
 {
 
-    String _broker_NotRunning = "tcp://localhost:" + findFreePort();
+    private String _broker_NotRunning = "tcp://localhost:" + findFreePort();
 
-    String _broker_BadDNS = "tcp://hg3sgaaw4lgihjs";
+    private String _broker_BadDNS = "tcp://hg3sgaaw4lgihjs";
 
     public void testSimpleConnection() throws Exception
     {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
index 477d9d835a..1a7e9dfc96 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
@@ -44,7 +44,7 @@ public class AMQProtocolSessionTest extends QpidBrokerTestCase
 
         public TestNetworkConnection getNetworkConnection()
         {
-            return (TestNetworkConnection) _protocolHandler.getNetworkConnection();
+            return (TestNetworkConnection) getProtocolHandler().getNetworkConnection();
         }
 
         public AMQShortString genQueueName()
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
index fde537e99e..4da9a1db29 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
@@ -45,8 +45,8 @@ public class CloseBeforeAckTest extends QpidBrokerTestCase
 {
     private static final Logger log = LoggerFactory.getLogger(CloseBeforeAckTest.class);
 
-    Connection connection;
-    Session session;
+    private Connection connection;
+    private Session session;
     public static final String TEST_QUEUE_NAME = "TestQueue";
     private int TEST_COUNT = 25;
 
@@ -68,9 +68,9 @@ public class CloseBeforeAckTest extends QpidBrokerTestCase
         }
     }
 
-    TestThread1 testThread1 = new TestThread1();
+    private TestThread1 testThread1 = new TestThread1();
 
-    TestRunnable testThread2 =
+    private TestRunnable testThread2 =
         new TestRunnable()
         {
             public void runWithExceptions() throws Exception
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
index 90c96d84e2..a4e9a992b4 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
@@ -54,7 +54,7 @@ public class MessageRequeueTest extends QpidBrokerTestCase
 
     private long[] receieved = new long[numTestMessages + 1];
     private boolean passed = false;
-    QpidClientConnection conn;
+    private QpidClientConnection conn;
 
 
     protected void setUp() throws Exception
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java
index 08b45bbe1a..3a9354d822 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/ConversationFactory.java
@@ -121,19 +121,19 @@ public class ConversationFactory
     private Session session;
 
     /** The message consumer for incoming messages. */
-    MessageConsumer consumer;
+    private MessageConsumer consumer;
 
     /** The message producer for outgoing messages. */
-    MessageProducer producer;
+    private MessageProducer producer;
 
     /** The well-known or temporary destination to receive replies on. */
-    Destination receiveDestination;
+    private Destination receiveDestination;
 
     /** Holds the queue implementation class for the reply queue. */
-    Class<? extends BlockingQueue> queueClass;
+    private Class<? extends BlockingQueue> queueClass;
 
     /** Used to hold any replies that are received outside of the context of a conversation. */
-    BlockingQueue<Message> deadLetterBox = new LinkedBlockingQueue<Message>();
+    private BlockingQueue<Message> deadLetterBox = new LinkedBlockingQueue<Message>();
 
     /* Used to hold conversation state on a per thread basis. */
     /*
@@ -151,7 +151,7 @@ public class ConversationFactory
      */
 
     /** Generates new coversation id's as needed. */
-    AtomicLong conversationIdGenerator = new AtomicLong();
+    private AtomicLong conversationIdGenerator = new AtomicLong();
 
     /**
      * Creates a conversation helper on the specified connection with the default sending destination, and listening
@@ -246,13 +246,13 @@ public class ConversationFactory
     public class Conversation
     {
         /** Holds the correlation id for the context. */
-        long conversationId;
+        private long conversationId;
 
         /**
          * Holds the send destination for the context. This will automatically be updated to the most recently received
          * reply-to destination.
          */
-        Destination sendDestination;
+        private Destination sendDestination;
 
         /**
          * Sends a message to the default sending location. The correlation id of the message will be assigned by this
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 71f9c9de1b..6311322522 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -331,7 +331,7 @@ public class QpidBrokerTestCase extends QpidTestCase
             this.stopped = stopped;
             this.seenReady = false;
 
-            if (this.ready != null && !this.ready.equals(""))
+            if (this.getReady() != null && !this.getReady().equals(""))
             {
                 this.latch = new CountDownLatch(1);
             }
@@ -372,7 +372,7 @@ public class QpidBrokerTestCase extends QpidTestCase
                 	}
                 	out.println(line);
 
-                    if (latch != null && line.contains(ready))
+                    if (latch != null && line.contains(getReady()))
                     {
                         seenReady = true;
                         latch.countDown();
@@ -402,6 +402,11 @@ public class QpidBrokerTestCase extends QpidTestCase
         {
             return stopLine;
         }
+
+        public String getReady()
+        {
+            return ready;
+        }
     }
 
     /**
@@ -574,7 +579,7 @@ public class QpidBrokerTestCase extends QpidTestCase
 
             if (!p.await(30, TimeUnit.SECONDS))
             {
-                _logger.info("broker failed to become ready (" + p.ready + "):" + p.getStopLine());
+                _logger.info("broker failed to become ready (" + p.getReady() + "):" + p.getStopLine());
                 //Ensure broker has stopped
                 process.destroy();
                 cleanBrokerWork(qpidWork);