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

3 files changed, 14 insertions, 14 deletions

diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
index d814401b8d..7e402e3320 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgrade.java
@@ -80,21 +80,21 @@ public class BDBStoreUpgrade
 {
     private static final Logger _logger = LoggerFactory.getLogger(BDBStoreUpgrade.class);
     /** The Store Directory that needs upgrading */
-    File _fromDir;
+    private File _fromDir;
     /** The Directory that will be made to contain the upgraded store */
-    File _toDir;
+    private File _toDir;
     /** The Directory that will be made to backup the original store if required */
-    File _backupDir;
+    private File _backupDir;
 
     /** The Old Store */
-    BDBMessageStore _oldMessageStore;
+    private BDBMessageStore _oldMessageStore;
     /** The New Store */
-    BDBMessageStore _newMessageStore;
+    private BDBMessageStore _newMessageStore;
     /** The file ending that is used by BDB Store Files */
     private static final String BDB_FILE_ENDING = ".jdb";
 
     static final Options _options = new Options();
-    static CommandLine _commandLine;
+    private static CommandLine _commandLine;
     private boolean _interactive;
     private boolean _force;
 
@@ -615,8 +615,8 @@ public class BDBStoreUpgrade
         
         DatabaseVisitor contentVisitor = new DatabaseVisitor()
         {
-            long _prevMsgId = -1; //Initialise to invalid value
-            int _bytesSeenSoFar = 0;
+            private long _prevMsgId = -1; //Initialise to invalid value
+            private int _bytesSeenSoFar = 0;
             
             public void visit(DatabaseEntry key, DatabaseEntry value) throws DatabaseException
             {
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
index 277e1188a6..3d30f02b42 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java
@@ -140,17 +140,17 @@ public class BDBMessageStoreTest extends org.apache.qpid.server.store.MessageSto
         assertEquals("Routing key has changed", pubInfoBody_0_8.getRoutingKey(), returnedPubBody_0_8.getRoutingKey());
 
         ContentHeaderBody returnedHeaderBody_0_8 = returnedMMD_0_8.getContentHeaderBody();
-        assertEquals("ContentHeader ClassID has changed", chb_0_8.classId, returnedHeaderBody_0_8.classId);
-        assertEquals("ContentHeader weight has changed", chb_0_8.weight, returnedHeaderBody_0_8.weight);
-        assertEquals("ContentHeader bodySize has changed", chb_0_8.bodySize, returnedHeaderBody_0_8.bodySize);
+        assertEquals("ContentHeader ClassID has changed", chb_0_8.getClassId(), returnedHeaderBody_0_8.getClassId());
+        assertEquals("ContentHeader weight has changed", chb_0_8.getWeight(), returnedHeaderBody_0_8.getWeight());
+        assertEquals("ContentHeader bodySize has changed", chb_0_8.getBodySize(), returnedHeaderBody_0_8.getBodySize());
 
         BasicContentHeaderProperties returnedProperties_0_8 = (BasicContentHeaderProperties) returnedHeaderBody_0_8.getProperties();
         assertEquals("Property ContentType has changed", props_0_8.getContentTypeAsString(), returnedProperties_0_8.getContentTypeAsString());
         assertEquals("Property MessageID has changed", props_0_8.getMessageIdAsString(), returnedProperties_0_8.getMessageIdAsString());
 
-        ByteBuffer recoveredContent_0_8 = ByteBuffer.allocate((int) chb_0_8.bodySize) ;
+        ByteBuffer recoveredContent_0_8 = ByteBuffer.allocate((int) chb_0_8.getBodySize()) ;
         long recoveredCount_0_8 = bdbStore.getContent(messageid_0_8, 0, recoveredContent_0_8);
-        assertEquals("Incorrect amount of payload data recovered", chb_0_8.bodySize, recoveredCount_0_8);
+        assertEquals("Incorrect amount of payload data recovered", chb_0_8.getBodySize(), recoveredCount_0_8);
         String returnedPayloadString_0_8 = new String(recoveredContent_0_8.array());
         assertEquals("Message Payload has changed", bodyText, returnedPayloadString_0_8);
 
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
index 8481b29e46..227a34e888 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
@@ -359,7 +359,7 @@ public class BDBUpgradeTest extends QpidBrokerTestCase
         System.setIn(new InputStream()
         {
 
-            int counter = 0;
+            private int counter = 0;
 
             public synchronized int read(byte b[], int off, int len)
             {