Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java?view=diff&rev=494121&r1=494120&r2=494121 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java Mon Jan 8 09:02:26 2007 @@ -23,6 +23,7 @@ import org.apache.qpid.url.BindingURL; import org.apache.qpid.url.URLHelper; import org.apache.qpid.exchange.ExchangeDefaults; +import org.apache.qpid.framing.AMQShortString; import java.util.HashMap; import java.net.URI; @@ -31,10 +32,10 @@ public class AMQBindingURL implements BindingURL { String _url; - String _exchangeClass; - String _exchangeName; - String _destinationName; - String _queueName; + AMQShortString _exchangeClass; + AMQShortString _exchangeName; + AMQShortString _destinationName; + AMQShortString _queueName; private HashMap<String, String> _options; @@ -84,7 +85,7 @@ if (connection.getPath() == null || connection.getPath().equals("")) { - URLHelper.parseError(_url.indexOf(_exchangeName) + _exchangeName.length(), + URLHelper.parseError(_url.indexOf(_exchangeName.toString()) + _exchangeName.length(), "Destination or Queue requried", _url); } else @@ -92,7 +93,7 @@ int slash = connection.getPath().indexOf("/", 1); if (slash == -1) { - URLHelper.parseError(_url.indexOf(_exchangeName) + _exchangeName.length(), + URLHelper.parseError(_url.indexOf(_exchangeName.toString()) + _exchangeName.length(), "Destination requried", _url); } else @@ -121,6 +122,26 @@ } } + private void setExchangeClass(String exchangeClass) + { + setExchangeClass(new AMQShortString(exchangeClass)); + } + + private void setQueueName(String name) + { + setQueueName(new AMQShortString(name)); + } + + private void setDestinationName(String name) + { + setDestinationName(new AMQShortString(name)); + } + + private void setExchangeName(String exchangeName) + { + setExchangeName(new AMQShortString(exchangeName)); + } + private void processOptions() { //this is where we would parse any options that needed more than just storage. @@ -131,22 +152,22 @@ return _url; } - public String getExchangeClass() + public AMQShortString getExchangeClass() { return _exchangeClass; } - public void setExchangeClass(String exchangeClass) + public void setExchangeClass(AMQShortString exchangeClass) { _exchangeClass = exchangeClass; } - public String getExchangeName() + public AMQShortString getExchangeName() { return _exchangeName; } - public void setExchangeName(String name) + public void setExchangeName(AMQShortString name) { _exchangeName = name; @@ -156,17 +177,17 @@ } } - public String getDestinationName() + public AMQShortString getDestinationName() { return _destinationName; } - public void setDestinationName(String name) + public void setDestinationName(AMQShortString name) { _destinationName = name; } - public String getQueueName() + public AMQShortString getQueueName() { if (_exchangeClass.equals(ExchangeDefaults.TOPIC_EXCHANGE_CLASS)) { @@ -174,7 +195,7 @@ { if (containsOption(BindingURL.OPTION_CLIENTID) && containsOption(BindingURL.OPTION_SUBSCRIPTION)) { - return getOption(BindingURL.OPTION_CLIENTID + ":" + BindingURL.OPTION_SUBSCRIPTION); + return new AMQShortString(getOption(BindingURL.OPTION_CLIENTID + ":" + BindingURL.OPTION_SUBSCRIPTION)); } else { @@ -192,7 +213,7 @@ } } - public void setQueueName(String name) + public void setQueueName(AMQShortString name) { _queueName = name; } @@ -212,7 +233,7 @@ return _options.containsKey(key); } - public String getRoutingKey() + public AMQShortString getRoutingKey() { if (_exchangeClass.equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS)) { @@ -221,15 +242,15 @@ if (containsOption(BindingURL.OPTION_ROUTING_KEY)) { - return getOption(OPTION_ROUTING_KEY); + return new AMQShortString(getOption(OPTION_ROUTING_KEY)); } return getDestinationName(); } - public void setRoutingKey(String key) + public void setRoutingKey(AMQShortString key) { - setOption(OPTION_ROUTING_KEY, key); + setOption(OPTION_ROUTING_KEY, key.toString()); }
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURL.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURL.java?view=diff&rev=494121&r1=494120&r2=494121 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURL.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURL.java Mon Jan 8 09:02:26 2007 @@ -20,6 +20,8 @@ */ package org.apache.qpid.url; +import org.apache.qpid.framing.AMQShortString; + /* Binding URL format: <exch_class>://<exch_name>/[<destination>]/[<queue>]?<option>='<value>'[,<option>='<value>']* @@ -36,21 +38,21 @@ String getURL(); - String getExchangeClass(); + AMQShortString getExchangeClass(); - void setExchangeClass(String exchangeClass); + void setExchangeClass(AMQShortString name); - String getExchangeName(); + AMQShortString getExchangeName(); - void setExchangeName(String name); + void setExchangeName(AMQShortString name); - String getDestinationName(); + AMQShortString getDestinationName(); - void setDestinationName(String name); + void setDestinationName(AMQShortString name); - String getQueueName(); + AMQShortString getQueueName(); - void setQueueName(String name); + void setQueueName(AMQShortString name); String getOption(String key); @@ -58,9 +60,9 @@ boolean containsOption(String key); - String getRoutingKey(); + AMQShortString getRoutingKey(); - void setRoutingKey(String key); + void setRoutingKey(AMQShortString key); String toString(); } Modified: incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java?view=diff&rev=494121&r1=494120&r2=494121 ============================================================================== --- incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java (original) +++ incubator/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java Mon Jan 8 09:02:26 2007 @@ -25,8 +25,6 @@ import java.util.Enumeration; import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; import org.apache.mina.common.ByteBuffer; import org.apache.log4j.Logger; @@ -227,7 +225,7 @@ //... and a the string value of it. Assert.assertEquals("" + Double.MAX_VALUE, table1.getString("value")); table1.remove("value"); - //but after a remove it doesn't + //but after a removeKey it doesn't Assert.assertFalse(table1.containsKey("value")); // Table should now have zero length for encoding @@ -265,7 +263,7 @@ table1.remove("value"); - //but after a remove it doesn't + //but after a removeKey it doesn't Assert.assertFalse(table1.containsKey("value")); // Table should now have zero length for encoding @@ -303,7 +301,7 @@ table1.remove("value"); - //but after a remove it doesn't + //but after a removeKey it doesn't Assert.assertFalse(table1.containsKey("value")); // Table should now have zero length for encoding @@ -341,7 +339,7 @@ table1.remove("value"); - //but after a remove it doesn't + //but after a removeKey it doesn't Assert.assertFalse(table1.containsKey("value")); // Table should now have zero length for encoding @@ -380,7 +378,7 @@ Assert.assertEquals(null, table1.getString("value")); table1.remove("value"); - //but after a remove it doesn't + //but after a removeKey it doesn't Assert.assertFalse(table1.containsKey("value")); // Table should now have zero length for encoding @@ -440,7 +438,7 @@ Assert.assertTrue(table1.containsKey("value")); table1.remove("value"); - //but after a remove it doesn't + //but after a removeKey it doesn't Assert.assertFalse(table1.containsKey("value")); checkEmpty(table1); @@ -457,23 +455,7 @@ - public void testKeyEnumeration() - { - FieldTable table = new FieldTable(); - table.setLong("one", 1L); - table.setLong("two", 2L); - table.setLong("three", 3L); - table.setLong("four", 4L); - table.setLong("five", 5L); - - Enumeration e = table.getPropertyNames(); - - Assert.assertTrue("one".equals(e.nextElement())); - Assert.assertTrue("two".equals(e.nextElement())); - Assert.assertTrue("three".equals(e.nextElement())); - Assert.assertTrue("four".equals(e.nextElement())); - Assert.assertTrue("five".equals(e.nextElement())); - } + public void testValues() { @@ -758,7 +740,7 @@ try { - table.setObject(null, "String"); + table.setObject((String)null, "String"); fail("Null property name is not allowed"); } catch (IllegalArgumentException iae) @@ -868,9 +850,9 @@ { FieldTable table = new FieldTable(); - table.put("StringProperty", "String"); + table.setObject("StringProperty", "String"); - Assert.assertEquals("String", table.get("StringProperty")); + Assert.assertEquals("String", table.getString("StringProperty")); //Test Clear @@ -887,15 +869,15 @@ FieldTable table = new FieldTable(); - table.put("n1", "1"); - table.put("n2", "2"); - table.put("n3", "3"); - - Iterator iterator = table.keySet().iterator(); - Assert.assertEquals("n1", iterator.next()); - Assert.assertEquals("n2", iterator.next()); - Assert.assertEquals("n3", iterator.next()); - Assert.assertFalse(iterator.hasNext()); + table.setObject("n1", "1"); + table.setObject("n2", "2"); + table.setObject("n3", "3"); + + + Assert.assertEquals("1", table.getObject("n1")); + Assert.assertEquals("2", table.getObject("n2")); + Assert.assertEquals("3", table.getObject("n3")); + Modified: incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java?view=diff&rev=494121&r1=494120&r2=494121 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java (original) +++ incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java Mon Jan 8 09:02:26 2007 @@ -23,6 +23,7 @@ import org.apache.qpid.server.queue.QueueRegistry; import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.server.registry.IApplicationRegistry; +import org.apache.qpid.framing.AMQShortString; public class AMQBrokerManagerMBeanTest extends TestCase { @@ -35,26 +36,26 @@ String exchange2 = "testExchange2_" + System.currentTimeMillis(); String exchange3 = "testExchange3_" + System.currentTimeMillis(); - assertTrue(_exchangeRegistry.getExchange(exchange1) == null); - assertTrue(_exchangeRegistry.getExchange(exchange2) == null); - assertTrue(_exchangeRegistry.getExchange(exchange3) == null); + assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange1)) == null); + assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange2)) == null); + assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange3)) == null); ManagedBroker mbean = new AMQBrokerManagerMBean(); mbean.createNewExchange(exchange1,"direct",false, false); mbean.createNewExchange(exchange2,"topic",false, false); mbean.createNewExchange(exchange3,"headers",false, false); - assertTrue(_exchangeRegistry.getExchange(exchange1) != null); - assertTrue(_exchangeRegistry.getExchange(exchange2) != null); - assertTrue(_exchangeRegistry.getExchange(exchange3) != null); + assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange1)) != null); + assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange2)) != null); + assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange3)) != null); mbean.unregisterExchange(exchange1); mbean.unregisterExchange(exchange2); mbean.unregisterExchange(exchange3); - assertTrue(_exchangeRegistry.getExchange(exchange1) == null); - assertTrue(_exchangeRegistry.getExchange(exchange2) == null); - assertTrue(_exchangeRegistry.getExchange(exchange3) == null); + assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange1)) == null); + assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange2)) == null); + assertTrue(_exchangeRegistry.getExchange(new AMQShortString(exchange3)) == null); } public void testQueueOperations() throws Exception @@ -62,13 +63,13 @@ String queueName = "testQueue_" + System.currentTimeMillis(); ManagedBroker mbean = new AMQBrokerManagerMBean(); - assertTrue(_queueRegistry.getQueue(queueName) == null); + assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) == null); mbean.createNewQueue(queueName, false, "test", true); - assertTrue(_queueRegistry.getQueue(queueName) != null); + assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) != null); mbean.deleteQueue(queueName); - assertTrue(_queueRegistry.getQueue(queueName) == null); + assertTrue(_queueRegistry.getQueue(new AMQShortString(queueName)) == null); } @Override Modified: incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java?view=diff&rev=494121&r1=494120&r2=494121 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java (original) +++ incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java Mon Jan 8 09:02:26 2007 @@ -73,7 +73,7 @@ protected TestQueue bind(String queue, FieldTable bindings) throws AMQException { - return bind(new TestQueue(queue), bindings); + return bind(new TestQueue(new AMQShortString(queue)), bindings); } protected TestQueue bind(TestQueue queue, String... bindings) throws AMQException @@ -144,7 +144,7 @@ for (String s : entries) { String[] parts = s.split("=", 2); - headers.put(parts[0], parts.length > 1 ? parts[1] : ""); + headers.setObject(parts[0], parts.length > 1 ? parts[1] : ""); } return headers; } @@ -154,7 +154,7 @@ // 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 = id; + request.routingKey = new AMQShortString(id); return request; } @@ -176,9 +176,9 @@ { final List<HeadersExchangeTest.Message> messages = new ArrayList<HeadersExchangeTest.Message>(); - public TestQueue(String name) throws AMQException + public TestQueue(AMQShortString name) throws AMQException { - super(name, false, "test", true, ApplicationRegistry.getInstance().getQueueRegistry()); + super(name, false, new AMQShortString("test"), true, ApplicationRegistry.getInstance().getQueueRegistry()); } /** Modified: incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java?view=diff&rev=494121&r1=494120&r2=494121 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java (original) +++ incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java Mon Jan 8 09:02:26 2007 @@ -22,6 +22,8 @@ import org.apache.qpid.server.queue.QueueRegistry; import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.server.management.ManagedObject; +import org.apache.qpid.exchange.ExchangeDefaults; +import org.apache.qpid.framing.AMQShortString; import javax.management.openmbean.CompositeData; import javax.management.openmbean.TabularData; @@ -43,12 +45,12 @@ public void testDirectExchangeMBean() throws Exception { DestNameExchange exchange = new DestNameExchange(); - exchange.initialise("amq.direct", false, 0, true); + exchange.initialise(ExchangeDefaults.DIRECT_EXCHANGE_NAME, false, 0, true); ManagedObject managedObj = exchange.getManagedObject(); ManagedExchange mbean = (ManagedExchange)managedObj; - mbean.createNewBinding(_queue.getName(), "binding1"); - mbean.createNewBinding(_queue.getName(), "binding2"); + mbean.createNewBinding(_queue.getName().toString(), "binding1"); + mbean.createNewBinding(_queue.getName().toString(), "binding2"); TabularData data = mbean.bindings(); ArrayList<CompositeData> list = new ArrayList<CompositeData>(data.values()); @@ -70,12 +72,12 @@ public void testTopicExchangeMBean() throws Exception { DestWildExchange exchange = new DestWildExchange(); - exchange.initialise("amq.topic", false, 0, true); + exchange.initialise(ExchangeDefaults.TOPIC_EXCHANGE_NAME, false, 0, true); ManagedObject managedObj = exchange.getManagedObject(); ManagedExchange mbean = (ManagedExchange)managedObj; - mbean.createNewBinding(_queue.getName(), "binding1"); - mbean.createNewBinding(_queue.getName(), "binding2"); + mbean.createNewBinding(_queue.getName().toString(), "binding1"); + mbean.createNewBinding(_queue.getName().toString(), "binding2"); TabularData data = mbean.bindings(); ArrayList<CompositeData> list = new ArrayList<CompositeData>(data.values()); @@ -97,19 +99,19 @@ public void testHeadersExchangeMBean() throws Exception { HeadersExchange exchange = new HeadersExchange(); - exchange.initialise("amq.headers", false, 0, true); + exchange.initialise(ExchangeDefaults.HEADERS_EXCHANGE_NAME, false, 0, true); ManagedObject managedObj = exchange.getManagedObject(); ManagedExchange mbean = (ManagedExchange)managedObj; - mbean.createNewBinding(_queue.getName(), "key1=binding1,key2=binding2"); - mbean.createNewBinding(_queue.getName(), "key3=binding3"); + mbean.createNewBinding(_queue.getName().toString(), "key1=binding1,key2=binding2"); + mbean.createNewBinding(_queue.getName().toString(), "key3=binding3"); TabularData data = mbean.bindings(); ArrayList<CompositeData> list = new ArrayList<CompositeData>(data.values()); assertTrue(list.size() == 2); // test general exchange properties - assertEquals(mbean.getName(), "amq.headers"); + assertEquals(mbean.getName(), "amq.match"); assertEquals(mbean.getExchangeType(), "headers"); assertTrue(mbean.getTicketNo() == 0); assertTrue(!mbean.isDurable()); @@ -121,7 +123,7 @@ { super.setUp(); _queueRegistry = ApplicationRegistry.getInstance().getQueueRegistry(); - _queue = new AMQQueue("testQueue", false, "ExchangeMBeanTest", false, _queueRegistry); + _queue = new AMQQueue(new AMQShortString("testQueue"), false, new AMQShortString("ExchangeMBeanTest"), false, _queueRegistry); _queueRegistry.registerQueue(_queue); } } Modified: incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java?view=diff&rev=494121&r1=494120&r2=494121 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java (original) +++ incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java Mon Jan 8 09:02:26 2007 @@ -21,6 +21,7 @@ import org.apache.qpid.AMQException; import org.apache.qpid.framing.BasicPublishBody; import org.apache.qpid.framing.ContentHeaderBody; +import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.server.AMQChannel; import org.apache.qpid.server.RequiredDeliveryException; import org.apache.qpid.server.txn.TransactionalContext; @@ -77,7 +78,7 @@ _protocolSession = new MockProtocolSession(_messageStore); _protocolSession.addChannel(_channel); - _queue.registerProtocolSession(_protocolSession, 1, "test", false, null); + _queue.registerProtocolSession(_protocolSession, 1, new AMQShortString("test"), false, null); assertTrue(_queueMBean.getActiveConsumerCount() == 1); SubscriptionSet _subscribers = (SubscriptionSet) mgr; @@ -174,7 +175,7 @@ { super.setUp(); _queueRegistry = new DefaultQueueRegistry(); - _queue = new AMQQueue("testQueue", false, "AMQueueMBeanTest", false, _queueRegistry); + _queue = new AMQQueue(new AMQShortString("testQueue"), false, new AMQShortString("AMQueueMBeanTest"), false, _queueRegistry); _queueMBean = new AMQQueueMBean(_queue); } Modified: incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java?view=diff&rev=494121&r1=494120&r2=494121 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java (original) +++ incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java Mon Jan 8 09:02:26 2007 @@ -26,6 +26,7 @@ import org.apache.qpid.framing.BasicContentHeaderProperties; import org.apache.qpid.framing.BasicPublishBody; import org.apache.qpid.framing.ContentHeaderBody; +import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.server.AMQChannel; import org.apache.qpid.server.RequiredDeliveryException; import org.apache.qpid.server.ack.UnacknowledgedMessage; @@ -62,6 +63,8 @@ private AMQQueue _queue; + private static final AMQShortString DEFAULT_CONSUMER_TAG = new AMQShortString("conTag"); + public AckTest() throws Exception { ApplicationRegistry.initialise(new TestApplicationRegistry()); @@ -75,7 +78,7 @@ _protocolSession = new MockProtocolSession(_messageStore); _protocolSession.addChannel(_channel); _subscriptionManager = new SubscriptionSet(); - _queue = new AMQQueue("myQ", false, "guest", true, new DefaultQueueRegistry(), _subscriptionManager); + _queue = new AMQQueue(new AMQShortString("myQ"), false, new AMQShortString("guest"), true, new DefaultQueueRegistry(), _subscriptionManager); } private void publishMessages(int count) throws AMQException @@ -94,8 +97,8 @@ // 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 = "rk"; - publishBody.exchange = "someExchange"; + publishBody.routingKey = new AMQShortString("rk"); + publishBody.exchange = new AMQShortString("someExchange"); AMQMessage msg = new AMQMessage(_messageStore.getNewMessageId(), publishBody, txnContext); if (persistent) { @@ -126,7 +129,7 @@ */ public void testAckChannelAssociationTest() throws AMQException { - _subscription = new SubscriptionImpl(5, _protocolSession, "conTag", true); + _subscription = new SubscriptionImpl(5, _protocolSession, DEFAULT_CONSUMER_TAG, true); final int msgCount = 10; publishMessages(msgCount, true); @@ -154,7 +157,7 @@ public void testNoAckMode() throws AMQException { // false arg means no acks expected - _subscription = new SubscriptionImpl(5, _protocolSession, "conTag", false); + _subscription = new SubscriptionImpl(5, _protocolSession, DEFAULT_CONSUMER_TAG, false); final int msgCount = 10; publishMessages(msgCount); @@ -169,7 +172,7 @@ */ public void testSingleAckReceivedTest() throws AMQException { - _subscription = new SubscriptionImpl(5, _protocolSession, "conTag", true); + _subscription = new SubscriptionImpl(5, _protocolSession, DEFAULT_CONSUMER_TAG, true); final int msgCount = 10; publishMessages(msgCount); @@ -198,7 +201,7 @@ */ public void testMultiAckReceivedTest() throws AMQException { - _subscription = new SubscriptionImpl(5, _protocolSession, "conTag", true); + _subscription = new SubscriptionImpl(5, _protocolSession, DEFAULT_CONSUMER_TAG, true); final int msgCount = 10; publishMessages(msgCount); @@ -222,7 +225,7 @@ */ public void testMultiAckAllReceivedTest() throws AMQException { - _subscription = new SubscriptionImpl(5, _protocolSession, "conTag", true); + _subscription = new SubscriptionImpl(5, _protocolSession, DEFAULT_CONSUMER_TAG, true); final int msgCount = 10; publishMessages(msgCount); @@ -246,7 +249,7 @@ int lowMark = 5; int highMark = 10; - _subscription = new SubscriptionImpl(5, _protocolSession, "conTag", true); + _subscription = new SubscriptionImpl(5, _protocolSession, DEFAULT_CONSUMER_TAG, true); _channel.setPrefetchLowMarkCount(lowMark); _channel.setPrefetchHighMarkCount(highMark); @@ -297,7 +300,7 @@ public void testPrefetch() throws AMQException { - _subscription = new SubscriptionImpl(5, _protocolSession, "conTag", true); + _subscription = new SubscriptionImpl(5, _protocolSession, DEFAULT_CONSUMER_TAG, true); _channel.setPrefetchCount(5); assertTrue(_channel.getPrefetchCount() == 5); Modified: incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java?view=diff&rev=494121&r1=494120&r2=494121 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java (original) +++ incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrencyTest.java Mon Jan 8 09:02:26 2007 @@ -21,6 +21,7 @@ package org.apache.qpid.server.queue; import org.apache.qpid.AMQException; +import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.server.handler.OnCurrentThreadExecutor; import java.util.*; @@ -52,7 +53,7 @@ public ConcurrencyTest() throws Exception { - _deliveryMgr = new ConcurrentDeliveryManager(_subscriptionMgr, new AMQQueue("myQ", false, "guest", false, + _deliveryMgr = new ConcurrentDeliveryManager(_subscriptionMgr, new AMQQueue(new AMQShortString("myQ"), false, new AMQShortString("guest"), false, new DefaultQueueRegistry())); } @@ -186,7 +187,7 @@ AMQMessage msg = nextMessage(); if (msg != null) { - _deliveryMgr.deliver(null, toString(), msg); + _deliveryMgr.deliver(null, new AMQShortString(toString()), msg); } } } Modified: incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrentDeliveryManagerTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrentDeliveryManagerTest.java?view=diff&rev=494121&r1=494120&r2=494121 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrentDeliveryManagerTest.java (original) +++ incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ConcurrentDeliveryManagerTest.java Mon Jan 8 09:02:26 2007 @@ -21,6 +21,7 @@ package org.apache.qpid.server.queue; import org.apache.qpid.AMQException; +import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.server.queue.ConcurrentDeliveryManager; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.DefaultQueueRegistry; @@ -33,7 +34,7 @@ try { System.setProperty("concurrentdeliverymanager","true"); - _mgr = new ConcurrentDeliveryManager(_subscriptions, new AMQQueue("myQ", false, "guest", false, + _mgr = new ConcurrentDeliveryManager(_subscriptions, new AMQQueue(new AMQShortString("myQ"), false, new AMQShortString("guest"), false, new DefaultQueueRegistry())); } catch (Throwable t) Modified: incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java?view=diff&rev=494121&r1=494120&r2=494121 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java (original) +++ incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/DeliveryManagerTest.java Mon Jan 8 09:02:26 2007 @@ -23,6 +23,7 @@ import org.apache.qpid.server.handler.OnCurrentThreadExecutor; import org.apache.qpid.server.store.StoreContext; import org.apache.qpid.AMQException; +import org.apache.qpid.framing.AMQShortString; import junit.framework.TestSuite; @@ -31,6 +32,7 @@ protected final SubscriptionSet _subscriptions = new SubscriptionSet(); protected DeliveryManager _mgr; protected StoreContext _storeContext = new StoreContext(); + private static final AMQShortString DEFAULT_QUEUE_NAME = new AMQShortString("Me"); public DeliveryManagerTest() throws Exception { @@ -47,7 +49,7 @@ for (int i = 0; i < batch; i++) { - _mgr.deliver(_storeContext, "Me", messages[i]); + _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i]); } SubscriptionTestHelper s1 = new SubscriptionTestHelper("1"); @@ -57,7 +59,7 @@ for (int i = batch; i < messages.length; i++) { - _mgr.deliver(_storeContext, "Me", messages[i]); + _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i]); } assertTrue(s1.getMessages().isEmpty()); @@ -95,7 +97,7 @@ for (int i = 0; i < batch; i++) { - _mgr.deliver(_storeContext, "Me", messages[i]); + _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i]); } assertEquals(batch, s1.getMessages().size()); @@ -109,7 +111,7 @@ s1.setSuspended(true); for (int i = batch; i < messages.length; i++) { - _mgr.deliver(_storeContext, "Me", messages[i]); + _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i]); } _mgr.processAsync(new OnCurrentThreadExecutor()); @@ -131,7 +133,7 @@ try { AMQMessage msg = message(true); - _mgr.deliver(_storeContext, "Me", msg); + _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, msg); msg.checkDeliveredToConsumer(); fail("expected exception did not occur"); } @@ -153,7 +155,7 @@ _subscriptions.addSubscriber(s); s.setSuspended(true); AMQMessage msg = message(true); - _mgr.deliver(_storeContext, "Me", msg); + _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, msg); msg.checkDeliveredToConsumer(); fail("expected exception did not occur"); } Modified: incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java?view=diff&rev=494121&r1=494120&r2=494121 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java (original) +++ incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java Mon Jan 8 09:02:26 2007 @@ -23,6 +23,7 @@ import org.apache.qpid.AMQException; import org.apache.qpid.framing.AMQDataBlock; import org.apache.qpid.framing.FieldTable; +import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.server.AMQChannel; import org.apache.qpid.server.protocol.AMQProtocolSession; import org.apache.qpid.server.store.MessageStore; @@ -53,12 +54,12 @@ { } - public String getContextKey() + public AMQShortString getContextKey() { return null; } - public void setContextKey(String contextKey) + public void setContextKey(AMQShortString contextKey) { } Modified: incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java?view=diff&rev=494121&r1=494120&r2=494121 ============================================================================== --- incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java (original) +++ incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SynchronizedDeliveryManagerTest.java Mon Jan 8 09:02:26 2007 @@ -25,6 +25,7 @@ import org.apache.qpid.server.queue.DefaultQueueRegistry; import org.apache.qpid.server.queue.DeliveryManagerTest; import org.apache.qpid.AMQException; +import org.apache.qpid.framing.AMQShortString; import junit.framework.TestSuite; @@ -35,7 +36,7 @@ try { System.setProperty("concurrentdeliverymanager","false"); - _mgr = new SynchronizedDeliveryManager(_subscriptions, new AMQQueue("myQ", false, "guest", false, + _mgr = new SynchronizedDeliveryManager(_subscriptions, new AMQQueue(new AMQShortString("myQ"), false, new AMQShortString("guest"), false, new DefaultQueueRegistry())); } catch (Throwable t)
