QPID-268 : (Patch supplied by Rob Godfrey) Improvements to performance of generated code

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

6 files changed, 43 insertions, 12 deletions

diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/ack/TxAckTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/ack/TxAckTest.java
index 0eb43bdf5f..9d3c588fc8 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/ack/TxAckTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/ack/TxAckTest.java
@@ -105,7 +105,12 @@ public class TxAckTest extends TestCase
                 long deliveryTag = i + 1;
                 // TODO: fix hardcoded protocol version data
                 TestMessage message = new TestMessage(deliveryTag, i, new BasicPublishBody((byte)8,
-                                                                                           (byte)0), txnContext);
+                                                                                           (byte)0,
+                                                                                           null,
+                                                                                           false,
+                                                                                           false,
+                                                                                           null,
+                                                                                           0), txnContext);
                 _map.add(deliveryTag, new UnacknowledgedMessage(null, message, null, deliveryTag));
             }
             _acked = acked;
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
index 52afecdb6a..ea576a5661 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
@@ -153,8 +153,8 @@ public class AbstractHeadersExchangeTestBase extends TestCase
     {
         // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
         // TODO: Establish some way to determine the version for the test.
-        BasicPublishBody request = new BasicPublishBody((byte)8, (byte)0);
-        request.routingKey = new AMQShortString(id);
+        BasicPublishBody request = new BasicPublishBody((byte)8, (byte)0,null,false,false,new AMQShortString(id),0);
+        
         return request;
     }
 
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
index d4a8f6c7f9..91a26632a1 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
@@ -163,8 +163,14 @@ public class AMQQueueMBeanTest extends TestCase
     {
         // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
         // TODO: Establish some way to determine the version for the test.
-        BasicPublishBody publish = new BasicPublishBody((byte)8, (byte)0);
-        publish.immediate = immediate;
+        BasicPublishBody publish = new BasicPublishBody((byte)8,
+                                                        (byte)0,
+                                                        null,
+                                                        immediate,
+                                                        false,
+                                                        null,
+                                                        0);
+        
         ContentHeaderBody contentHeaderBody = new ContentHeaderBody();
         contentHeaderBody.bodySize = 1000;   // in bytes
         return new AMQMessage(_messageStore.getNewMessageId(), publish, _transactionalContext, contentHeaderBody);
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java
index 222b2c696a..d10d5acdd0 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java
@@ -96,9 +96,13 @@ public class AckTest extends TestCase
         {
             // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
             // TODO: Establish some way to determine the version for the test.
-            BasicPublishBody publishBody = new BasicPublishBody((byte)8, (byte)0);
-            publishBody.routingKey = new AMQShortString("rk");
-            publishBody.exchange = new AMQShortString("someExchange");
+            BasicPublishBody publishBody = new BasicPublishBody((byte)8,
+                                                                (byte)0,
+                                                                new AMQShortString("someExchange"),
+                                                                false,
+                                                                false,
+                                                                new AMQShortString("rk"),
+                                                                0);
             AMQMessage msg = new AMQMessage(_messageStore.getNewMessageId(), publishBody, txnContext);
             if (persistent)
             {
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
index da4627411d..6c48bb2bf4 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
@@ -61,8 +61,14 @@ class MessageTestHelper extends TestCase
     {
         // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0)
         // TODO: Establish some way to determine the version for the test.
-        BasicPublishBody publish = new BasicPublishBody((byte)8, (byte)0);
-        publish.immediate = immediate;
+        BasicPublishBody publish = new BasicPublishBody((byte)8,
+                                                        (byte)0,
+                                                        null,
+                                                        immediate,
+                                                        false,
+                                                        null,
+                                                        0);
+        
         return new AMQMessage(_messageStore.getNewMessageId(), publish, _txnContext,
                               new ContentHeaderBody());
     }
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
index b874ca9594..e2500d9865 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/store/TestReferenceCounting.java
@@ -52,7 +52,12 @@ public class TestReferenceCounting extends TestCase
         createPersistentContentHeader();
         // TODO: fix hardcoded protocol version data
         AMQMessage message = new AMQMessage(_store.getNewMessageId(), new BasicPublishBody((byte)8,
-                                                                                           (byte)0),
+                                                                                           (byte)0,
+                                                                                           null,
+                                                                                           false,
+                                                                                           false,
+                                                                                           null,
+                                                                                           0),
                                             new NonTransactionalContext(_store, _storeContext, null, null, null),
                                             createPersistentContentHeader());
         message.incrementReference();
@@ -76,7 +81,12 @@ public class TestReferenceCounting extends TestCase
     {
         // TODO: fix hardcoded protocol version data
         AMQMessage message = new AMQMessage(_store.getNewMessageId(), new BasicPublishBody((byte)8,
-                                                                                           (byte)0),
+                                                                                           (byte)0,
+                                                                                           null,
+                                                                                           false,
+                                                                                           false,
+                                                                                           null,
+                                                                                           0),
                                             new NonTransactionalContext(_store, _storeContext, null, null, null),
                                             createPersistentContentHeader());
         message.incrementReference();