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

10 files changed, 138 insertions, 74 deletions

diff --git a/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java b/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
index 9548eab4c5..6cc6db1974 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
@@ -147,8 +147,8 @@ public class OptionParser
                 for (Option option: optDefs)
                 {
                     
-                    if ((op.startsWith("-") && option.shortForm != null && option.shortForm.equals(key)) ||
-                        (op.startsWith("--") && option.longForm != null && option.longForm.equals(key)) )
+                    if ((op.startsWith("-") && option.getShortForm() != null && option.getShortForm().equals(key)) ||
+                        (op.startsWith("--") && option.getLongForm() != null && option.getLongForm().equals(key)) )
                     {
                         match = true;
                         break;
@@ -219,18 +219,18 @@ public class OptionParser
     
     protected boolean containsOp(Option op)
     {
-        return optMap.containsKey(op.shortForm) || optMap.containsKey(op.longForm);
+        return optMap.containsKey(op.getShortForm()) || optMap.containsKey(op.getLongForm());
     }
     
     protected String getOp(Option op)
     {
-        if (optMap.containsKey(op.shortForm))
+        if (optMap.containsKey(op.getShortForm()))
         {
-            return (String)optMap.get(op.shortForm);
+            return (String)optMap.get(op.getShortForm());
         }
-        else if (optMap.containsKey(op.longForm))
+        else if (optMap.containsKey(op.getLongForm()))
         {
-            return (String)optMap.get(op.longForm);
+            return (String)optMap.get(op.getLongForm());
         }
         else
         {
@@ -286,12 +286,12 @@ public class OptionParser
     
     static class Option
     {
-        private String shortForm;
-        private String longForm;
-        private String desc;
-        private String valueLabel;
-        private String defaultValue;
-        private Class type;
+        private final String shortForm;
+        private final String longForm;
+        private final String desc;
+        private final String valueLabel;
+        private final String defaultValue;
+        private final Class type;
         
         public Option(String shortForm, String longForm, String desc,
                       String valueLabel, String defaultValue, Class type)
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java b/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
index 3d16e01af4..2b1e641689 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorMessageDispatcher.java
@@ -103,7 +103,7 @@ public class MonitorMessageDispatcher
 //          (FileMessageFactory.createSimpleEventMessage(getMonitorPublisher().getSession(),"monitor:" +System.currentTimeMillis()));
 
         getMonitorPublisher().sendMessage
-                (getMonitorPublisher()._session,
+                (getMonitorPublisher().getSession(),
                  FileMessageFactory.createSimpleEventMessage(getMonitorPublisher().getSession(), "monitor:" + System.currentTimeMillis()),
                  DeliveryMode.PERSISTENT, false, true);
 
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java b/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
index 750f57d9dc..b2bb0893d8 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/publisher/MonitorPublisher.java
@@ -36,7 +36,7 @@ public class MonitorPublisher extends Publisher
 
     private static final Logger _log = LoggerFactory.getLogger(Publisher.class);
 
-    BasicMessageProducer _producer;
+    private BasicMessageProducer _producer;
 
     public MonitorPublisher()
     {
@@ -51,14 +51,14 @@ public class MonitorPublisher extends Publisher
     {
         try
         {
-            _producer = (BasicMessageProducer) session.createProducer(_destination);
+            _producer = (BasicMessageProducer) session.createProducer(getDestination());
 
             _producer.send(message, deliveryMode, immediate);
 
             if (commit)
             {
                 //commit the message send and close the transaction
-                _session.commit();
+                getSession().commit();
             }
 
         }
@@ -70,7 +70,7 @@ public class MonitorPublisher extends Publisher
             throw new UndeliveredMessageException("Cannot deliver immediate message", e);
         }
 
-        _log.info(_name + " finished sending message: " + message);
+        _log.info(getName() + " finished sending message: " + message);
         return true;
     }
 
@@ -81,14 +81,14 @@ public class MonitorPublisher extends Publisher
     {
         try
         {
-            _producer = (BasicMessageProducer) _session.createProducer(_destination);
+            _producer = (BasicMessageProducer) getSession().createProducer(getDestination());
 
             //Send message via our producer which is not persistent and is immediate
             //NB: not available via jms interface MessageProducer
             _producer.send(message, DeliveryMode.NON_PERSISTENT, true);
 
             //commit the message send and close the transaction
-            _session.commit();
+            getSession().commit();
 
         }
         catch (JMSException e)
@@ -99,7 +99,7 @@ public class MonitorPublisher extends Publisher
             throw new UndeliveredMessageException("Cannot deliver immediate message", e);
         }
 
-        _log.info(_name + " finished sending message: " + message);
+        _log.info(getName() + " finished sending message: " + message);
         return true;
     }
 }
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java b/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
index b5f44557a4..76531523b9 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/publisher/Publisher.java
@@ -34,19 +34,19 @@ public class Publisher
 
     protected InitialContextHelper _contextHelper;
 
-    protected Connection _connection;
+    private Connection _connection;
 
-    protected Session _session;
+    private Session _session;
 
-    protected MessageProducer _producer;
+    private MessageProducer _producer;
 
-    protected String _destinationDir;
+    private String _destinationDir;
 
-    protected String _name = "Publisher";
+    private String _name = "Publisher";
 
-    protected Destination _destination;
+    private Destination _destination;
 
-    protected static final String _defaultDestinationDir = "/tmp";
+    private static final String _defaultDestinationDir = "/tmp";
 
     /**
      * Creates a Publisher instance using properties from example.properties
@@ -62,9 +62,9 @@ public class Publisher
 
             //then create a connection using the AMQConnectionFactory
             AMQConnectionFactory cf = (AMQConnectionFactory) ctx.lookup("local");
-            _connection = cf.createConnection();
+            setConnection(cf.createConnection());
 
-            _connection.setExceptionListener(new ExceptionListener()
+            getConnection().setExceptionListener(new ExceptionListener()
             {
                 public void onException(JMSException jmse)
                 {
@@ -76,19 +76,19 @@ public class Publisher
             });
 
             //create a transactional session
-            _session = _connection.createSession(true, Session.AUTO_ACKNOWLEDGE);
+            setSession(getConnection().createSession(true, Session.AUTO_ACKNOWLEDGE));
 
             //lookup the example queue and use it
             //Queue is non-exclusive and not deleted when last consumer detaches
-            _destination = (Queue) ctx.lookup("MyQueue");
+            setDestination((Queue) ctx.lookup("MyQueue"));
 
             //create a message producer
-            _producer = _session.createProducer(_destination);
+            setProducer(getSession().createProducer(getDestination()));
 
             //set destination dir for files that have been processed
-            _destinationDir = _defaultDestinationDir;
+            setDestinationDir(get_defaultDestinationDir());
 
-            _connection.start();
+            getConnection().start();
         }
         catch (Exception e)
         {
@@ -97,6 +97,11 @@ public class Publisher
         }
     }
 
+    public static String get_defaultDestinationDir()
+    {
+        return _defaultDestinationDir;
+    }
+
     /**
      * Creates and sends the number of messages specified in the param
      */
@@ -104,7 +109,7 @@ public class Publisher
     {
         try
         {
-            TextMessage txtMessage = _session.createTextMessage("msg");
+            TextMessage txtMessage = getSession().createTextMessage("msg");
             for (int i=0;i<numMessages;i++)
             {
                 sendMessage(txtMessage);
@@ -128,10 +133,10 @@ public class Publisher
         try
         {
             //Send message via our producer which is not persistent
-            _producer.send(message, DeliveryMode.PERSISTENT, _producer.getPriority(), _producer.getTimeToLive());
+            getProducer().send(message, DeliveryMode.PERSISTENT, getProducer().getPriority(), getProducer().getTimeToLive());
 
             //commit the message send and close the transaction
-            _session.commit();
+            getSession().commit();
 
         }
         catch (JMSException e)
@@ -139,7 +144,7 @@ public class Publisher
             //Have to assume our commit failed and rollback here
             try
             {
-                _session.rollback();
+                getSession().rollback();
                 _log.error("JMSException", e);
                 e.printStackTrace();
                 return false;
@@ -162,13 +167,13 @@ public class Publisher
     {
         try
         {
-            if (_connection != null)
+            if (getConnection() != null)
             {
-                _connection.stop();
-                _connection.close();
+                getConnection().stop();
+                getConnection().close();
             }
-            _connection = null;
-            _producer = null;
+            setConnection(null);
+            setProducer(null);
         }
         catch(Exception e)
         {
@@ -204,5 +209,41 @@ public class Publisher
     public void setName(String _name) {
         this._name = _name;
     }
+
+
+    public Connection getConnection()
+    {
+        return _connection;
+    }
+
+    public void setConnection(Connection connection)
+    {
+        _connection = connection;
+    }
+
+    public void setSession(Session session)
+    {
+        _session = session;
+    }
+
+    public MessageProducer getProducer()
+    {
+        return _producer;
+    }
+
+    public void setProducer(MessageProducer producer)
+    {
+        _producer = producer;
+    }
+
+    public Destination getDestination()
+    {
+        return _destination;
+    }
+
+    public void setDestination(Destination destination)
+    {
+        _destination = destination;
+    }
 }
 
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/publisher/TopicPublisher.java b/java/client/example/src/main/java/org/apache/qpid/example/publisher/TopicPublisher.java
index 8645e41101..953a875912 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/publisher/TopicPublisher.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/publisher/TopicPublisher.java
@@ -18,7 +18,6 @@
  */
 package org.apache.qpid.example.publisher;
 
-import org.apache.qpid.client.BasicMessageProducer;
 import org.apache.qpid.example.shared.InitialContextHelper;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
@@ -44,10 +43,10 @@ public class TopicPublisher extends Publisher
             InitialContext ctx = _contextHelper.getInitialContext();
 
            //lookup the example topic and use it
-           _destination = (Topic) ctx.lookup("MyTopic");
+           setDestination((Topic) ctx.lookup("MyTopic"));
 
            //create a message producer
-           _producer = _session.createProducer(_destination);
+           setProducer(getSession().createProducer(getDestination()));
         }
         catch (Exception e)
         {
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java b/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java
index e32ee0ba73..5b0f4757ca 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Client.java
@@ -31,11 +31,11 @@ import javax.naming.NamingException;
  */
 public abstract class Client
 {
-    protected ConnectionSetup _setup;
+    private ConnectionSetup _setup;
 
-    protected Connection _connection;
-    protected Destination _destination;
-    protected Session _session;
+    private Connection _connection;
+    private Destination _destination;
+    private Session _session;
 
     public Client(String destination)
     {
@@ -69,4 +69,28 @@ public abstract class Client
 
     public abstract void start();
 
+    public ConnectionSetup getSetup()
+    {
+        return _setup;
+    }
+
+    public Connection getConnection()
+    {
+        return _connection;
+    }
+
+    public Destination getDestination()
+    {
+        return _destination;
+    }
+
+    public Session getSession()
+    {
+        return _session;
+    }
+
+    public void setSession(Session session)
+    {
+        _session = session;
+    }
 }
\ No newline at end of file
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java b/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java
index ac3829d49e..f35d56c702 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Publisher.java
@@ -36,7 +36,7 @@ import javax.jms.Session;
  */
 public class Publisher extends Client
 {
-    int _msgCount;
+    private int _msgCount;
 
     public Publisher(String destination, int msgCount)
     {
@@ -48,18 +48,18 @@ public class Publisher extends Client
     {
         try
         {
-            _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            setSession(getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE));
 
-            MessageProducer _producer = _session.createProducer(_destination);
+            MessageProducer _producer = getSession().createProducer(getDestination());
 
             for (int msgCount = 0; msgCount < _msgCount; msgCount++)
             {
-                _producer.send(_session.createTextMessage("msg:" + msgCount));
+                _producer.send(getSession().createTextMessage("msg:" + msgCount));
                 System.out.println("Sent:" + msgCount);
             }
 
             System.out.println("Done.");
-            _connection.close();
+            getConnection().close();
         }
         catch (JMSException e)
         {
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java b/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java
index f2d736701f..1d7fc43b9c 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/pubsub/Subscriber.java
@@ -41,7 +41,7 @@ import java.util.concurrent.CountDownLatch;
 public class Subscriber extends Client implements MessageListener
 {
 
-    CountDownLatch _count;
+    private CountDownLatch _count;
 
     public Subscriber(String destination, int msgCount)
     {
@@ -54,16 +54,16 @@ public class Subscriber extends Client implements MessageListener
     {
         try
         {
-            _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            setSession(getConnection().createSession(false, Session.AUTO_ACKNOWLEDGE));
 
-            _session.createDurableSubscriber((Topic) _setup.getDestination(ConnectionSetup.TOPIC_JNDI_NAME),
-                                             "exampleClient").setMessageListener(this);
-            _connection.start();
+            getSession().createDurableSubscriber((Topic) getSetup().getDestination(ConnectionSetup.TOPIC_JNDI_NAME),
+                    "exampleClient").setMessageListener(this);
+            getConnection().start();
             _count.await();
 
             System.out.println("Done");
 
-            _connection.close();
+            getConnection().close();
         }
         catch (JMSException e)
         {
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Client.java b/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Client.java
index 8a0ff88448..ee52e8b9ea 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Client.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Client.java
@@ -40,15 +40,15 @@ import java.util.concurrent.CountDownLatch;
 
 public class Client implements MessageListener
 {
-    final String BROKER = "localhost";
+    private final String BROKER = "localhost";
 
-    final String INITIAL_CONTEXT_FACTORY = "org.apache.qpid.jndi.PropertiesFileInitialContextFactory";
+    private final String INITIAL_CONTEXT_FACTORY = "org.apache.qpid.jndi.PropertiesFileInitialContextFactory";
 
-    final String CONNECTION_JNDI_NAME = "local";
-    final String CONNECTION_NAME = "amqp://guest:guest@clientid/test?brokerlist='" + BROKER + "'";
+    private final String CONNECTION_JNDI_NAME = "local";
+    private final String CONNECTION_NAME = "amqp://guest:guest@clientid/test?brokerlist='" + BROKER + "'";
 
-    final String QUEUE_JNDI_NAME = "queue";
-    final String QUEUE_NAME = "example.RequestQueue";
+    private final String QUEUE_JNDI_NAME = "queue";
+    private final String QUEUE_NAME = "example.RequestQueue";
 
 
     private InitialContext _ctx;
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Server.java b/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Server.java
index 9c284eee97..88e8ca1f45 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Server.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/simple/reqresp/Server.java
@@ -45,15 +45,15 @@ import java.io.IOException;
 
 public class Server implements MessageListener
 {
-    final String BROKER = "localhost";
+    private final String BROKER = "localhost";
 
-    final String INITIAL_CONTEXT_FACTORY = "org.apache.qpid.jndi.PropertiesFileInitialContextFactory";
+    private final String INITIAL_CONTEXT_FACTORY = "org.apache.qpid.jndi.PropertiesFileInitialContextFactory";
 
-    final String CONNECTION_JNDI_NAME = "local";
-    final String CONNECTION_NAME = "amqp://guest:guest@clientid/test?brokerlist='" + BROKER + "'";
+    private final String CONNECTION_JNDI_NAME = "local";
+    private final String CONNECTION_NAME = "amqp://guest:guest@clientid/test?brokerlist='" + BROKER + "'";
 
-    final String QUEUE_JNDI_NAME = "queue";
-    final String QUEUE_NAME = "example.RequestQueue";
+    private final String QUEUE_JNDI_NAME = "queue";
+    private final String QUEUE_NAME = "example.RequestQueue";
 
 
     private InitialContext _ctx;