You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2015/06/02 22:53:50 UTC
svn commit: r1683186 [1/5] - in /qpid/java/trunk:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upg...
Author: rgodfrey
Date: Tue Jun 2 20:53:49 2015
New Revision: 1683186
URL: http://svn.apache.org/r1683186
Log:
QPID-6545 : AMQP 0-8/0-9/0-9-1 should use UTF-8 encoding for all short/long strings
Removed:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/FieldTableSupport.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/AMQShortStringTokenizer.java
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngineTest.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQQueue.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQTemporaryQueue.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQTemporaryTopic.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQTopic.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQUndefinedDestination.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/TemporaryDestination.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractAMQMessageDelegate.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/url/URLParser.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/jms/Session.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/jms/failover/FailoverExchangeMethod.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactory.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/codec/ClientDecoder.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/codec/ServerDecoder.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/common/AMQPFilterTypes.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/AMQTypedValue.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FrameCreatingMethodProcessor.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/MethodRegistry.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolVersion.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/Transport.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/url/BindingURL.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/transport/network/TransportTest.java
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/session/QueueDeclareTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/QueueLoggingTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ArrivalTimeFilterTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ModelTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueBindTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueMessageDurabilityTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/stats/StatisticsReportingTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/MessageToStringTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/close/JavaServerCloseRaceConditionTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/UTF8Test.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
qpid/java/trunk/test-profiles/JavaPre010Excludes
Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java Tue Jun 2 20:53:49 2015
@@ -136,7 +136,7 @@ public class UpgradeFrom4To5 extends Abs
arguments = new FieldTable();
}
- AMQShortString selectorFilterKey = AMQPFilterTypes.JMS_SELECTOR.getValue();
+ AMQShortString selectorFilterKey = AMQShortString.valueOf(AMQPFilterTypes.JMS_SELECTOR.getValue());
if (!arguments.containsKey(selectorFilterKey))
{
if (_logger.isDebugEnabled())
@@ -176,7 +176,7 @@ public class UpgradeFrom4To5 extends Abs
DatabaseEntry newValue = new DatabaseEntry();
binding.objectToEntry(record, newValue);
targetDatabase.put(transaction, key, newValue);
- existingQueues.add(record.getNameShortString().asString());
+ existingQueues.add(record.getNameShortString().toString());
sourceDatabase.delete(transaction, key);
}
};
@@ -227,7 +227,7 @@ public class UpgradeFrom4To5 extends Abs
{
QueueEntryKey entryKey = queueEntryKeyBinding.entryToObject(key);
Long messageId = entryKey.getMessageId();
- final String queueName = entryKey.getQueueName().asString();
+ final String queueName = entryKey.getQueueName().toString();
if (!existingQueues.contains(queueName))
{
if (queuesToDiscard.contains(queueName))
Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java Tue Jun 2 20:53:49 2015
@@ -386,7 +386,7 @@ public class UpgradeFrom5To6 extends Abs
Transaction transaction, DatabaseEntry key, DatabaseEntry value)
{
OldQueueEntryKey oldEntryRecord = oldBinding.entryToObject(key);
- UUID queueId = UUIDGenerator.generateQueueUUID(oldEntryRecord.getQueueName().asString(), virtualHostName);
+ UUID queueId = UUIDGenerator.generateQueueUUID(oldEntryRecord.getQueueName().toString(), virtualHostName);
NewQueueEntryKey newEntryRecord = new NewQueueEntryKey(queueId, oldEntryRecord.getMessageId());
DatabaseEntry newKey = new DatabaseEntry();
@@ -415,9 +415,11 @@ public class UpgradeFrom5To6 extends Abs
{
// TODO: check and remove orphaned bindings
BindingRecord bindingRecord = binding.entryToObject(key);
- String exchangeName = bindingRecord.getExchangeName() == null ? ExchangeDefaults.DEFAULT_EXCHANGE_NAME : bindingRecord.getExchangeName().asString();
- String queueName = bindingRecord.getQueueName().asString();
- String routingKey = bindingRecord.getRoutingKey().asString();
+ String exchangeName = bindingRecord.getExchangeName() == null ? ExchangeDefaults.DEFAULT_EXCHANGE_NAME : bindingRecord
+ .getExchangeName()
+ .toString();
+ String queueName = bindingRecord.getQueueName().toString();
+ String routingKey = bindingRecord.getRoutingKey().toString();
FieldTable arguments = bindingRecord.getArguments();
UUID bindingId = UUIDGenerator.generateBindingUUID(exchangeName, queueName, routingKey, virtualHostName);
@@ -448,10 +450,10 @@ public class UpgradeFrom5To6 extends Abs
Transaction transaction, DatabaseEntry key, DatabaseEntry value)
{
ExchangeRecord exchangeRecord = exchangeBinding.entryToObject(value);
- String exchangeName = exchangeRecord.getNameShortString().asString();
+ String exchangeName = exchangeRecord.getNameShortString().toString();
if (!DEFAULT_EXCHANGES_SET.contains(exchangeName) && !"<<default>>".equals(exchangeName))
{
- String exchangeType = exchangeRecord.getType().asString();
+ String exchangeType = exchangeRecord.getType().toString();
boolean autoDelete = exchangeRecord.isAutoDelete();
UUID exchangeId = UUIDGenerator.generateExchangeUUID(exchangeName, virtualHostName);
@@ -485,9 +487,9 @@ public class UpgradeFrom5To6 extends Abs
Transaction transaction, DatabaseEntry key, DatabaseEntry value)
{
OldQueueRecord queueRecord = queueBinding.entryToObject(value);
- String queueName = queueRecord.getNameShortString().asString();
+ String queueName = queueRecord.getNameShortString().toString();
queueNames.add(queueName);
- String owner = queueRecord.getOwner() == null ? null : queueRecord.getOwner().asString();
+ String owner = queueRecord.getOwner() == null ? null : queueRecord.getOwner().toString();
boolean exclusive = queueRecord.isExclusive();
FieldTable arguments = queueRecord.getArguments();
Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java Tue Jun 2 20:53:49 2015
@@ -50,7 +50,6 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.client.AMQConnectionFactory;
import org.apache.qpid.client.AMQDestination;
import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.server.queue.QueueArgumentsConverter;
import org.apache.qpid.url.URLSyntaxException;
@@ -109,10 +108,9 @@ public class BDBStoreUpgradeTestPreparer
{
Connection connection = _connFac.createConnection();
AMQSession<?, ?> session = (AMQSession<?,?>)connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- AMQShortString queueName = new AMQShortString(NON_DURABLE_QUEUE_NAME);
AMQDestination destination = (AMQDestination) session.createQueue(NON_DURABLE_QUEUE_NAME);
- session.sendCreateQueue(queueName, false, false, false, null);
- session.bindQueue(queueName, queueName, null, new AMQShortString("amq.direct"), destination);
+ session.sendCreateQueue(NON_DURABLE_QUEUE_NAME, false, false, false, null);
+ session.bindQueue(NON_DURABLE_QUEUE_NAME, NON_DURABLE_QUEUE_NAME, null, "amq.direct", destination);
MessageProducer messageProducer = session.createProducer(destination);
sendMessages(session, messageProducer, destination, DeliveryMode.PERSISTENT, 1024, 3);
connection.close();
@@ -218,7 +216,7 @@ public class BDBStoreUpgradeTestPreparer
private Queue createAndBindQueueOnBroker(Session session, String queueName, final Map<String, Object> arguments, String exchangeName, String exchangeType) throws Exception
{
- ((AMQSession<?,?>) session).createQueue(new AMQShortString(queueName), false, true, false, arguments);
+ ((AMQSession<?,?>) session).createQueue(queueName, false, true, false, arguments);
Queue queue = session.createQueue("BURL:" + exchangeType + "://" + exchangeName + "/" + queueName + "/" + queueName + "?durable='true'");
((AMQSession<?,?>) session).declareAndBind((AMQDestination)queue);
return queue;
Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4to5Test.java Tue Jun 2 20:53:49 2015
@@ -161,15 +161,15 @@ public class UpgradeFrom4to5Test extends
BindingRecord record = null;
for (BindingRecord bindingRecord : queueBindings)
{
- if (bindingRecord.getQueueName().asString().equals(queueName)
- && bindingRecord.getExchangeName().asString().equals(exchangeName))
+ if (bindingRecord.getQueueName().toString().equals(queueName)
+ && bindingRecord.getExchangeName().toString().equals(exchangeName))
{
record = bindingRecord;
break;
}
}
assertNotNull("Binding is not found for queue " + queueName + " and exchange " + exchangeName, record);
- assertEquals("Unexpected routing key", routingKey, record.getRoutingKey().asString());
+ assertEquals("Unexpected routing key", routingKey, record.getRoutingKey().toString());
if (selectorKey != null)
{
@@ -200,7 +200,7 @@ public class UpgradeFrom4to5Test extends
DatabaseEntry key, DatabaseEntry value)
{
QueueEntryKey entryKey = queueEntryKeyBinding.entryToObject(key);
- String thisQueueName = entryKey.getQueueName().asString();
+ String thisQueueName = entryKey.getQueueName().toString();
if (thisQueueName.equals(queueName))
{
deliveryCounter.incrementAndGet();
@@ -285,7 +285,7 @@ public class UpgradeFrom4to5Test extends
DatabaseEntry key, DatabaseEntry value)
{
QueueRecord record = binding.entryToObject(value);
- String queueName = record.getNameShortString().asString();
+ String queueName = record.getNameShortString().toString();
actualQueueNames.add(queueName);
}
};
@@ -309,7 +309,7 @@ public class UpgradeFrom4to5Test extends
DatabaseEntry key, DatabaseEntry value)
{
QueueRecord record = binding.entryToObject(value);
- String queueName = record.getNameShortString().asString();
+ String queueName = record.getNameShortString().toString();
if (queueName.equals(queueName))
{
foundQueue.set(true);
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Tue Jun 2 20:53:49 2015
@@ -382,7 +382,7 @@ public class AMQChannel
public void setPublishFrame(MessagePublishInfo info, final MessageDestination e)
{
- String routingKey = info.getRoutingKey() == null ? null : info.getRoutingKey().asString();
+ String routingKey = AMQShortString.toString(info.getRoutingKey());
VirtualHostImpl virtualHost = getVirtualHost();
SecurityManager securityManager = virtualHost.getSecurityManager();
@@ -569,10 +569,8 @@ public class AMQChannel
{
boolean mandatory = message.isMandatory();
- String exchangeName = message.getMessagePublishInfo().getExchange() == null
- ? null : message.getMessagePublishInfo().getExchange().asString();
- String routingKey = message.getMessagePublishInfo().getRoutingKey() == null
- ? null : message.getMessagePublishInfo().getRoutingKey().asString();
+ String exchangeName = AMQShortString.toString(message.getMessagePublishInfo().getExchange());
+ String routingKey = AMQShortString.toString(message.getMessagePublishInfo().getRoutingKey());
final String description = String.format(
"[Exchange: %s, Routing key: %s]",
@@ -2085,7 +2083,7 @@ public class AMQChannel
AMQShortString consumerTag1 = consumerTag;
VirtualHostImpl<?, ?, ?> vHost = _connection.getVirtualHost();
sync();
- String queueName = queue == null ? null : queue.asString();
+ String queueName = AMQShortString.toString(queue);
MessageSource queue1 = queueName == null ? getDefaultQueue() : vHost.getMessageSource(queueName);
final Collection<MessageSource> sources = new HashSet<>();
@@ -2773,7 +2771,7 @@ public class AMQChannel
}
else
{
- String bindingKey = routingKey == null ? null : routingKey.asString();
+ String bindingKey = routingKey == null ? null : routingKey.toString();
if (exchange.isBound(bindingKey, queue))
{
@@ -2791,7 +2789,7 @@ public class AMQChannel
}
else
{
- if (exchange.isBound(routingKey == null ? "" : routingKey.asString()))
+ if (exchange.isBound(routingKey == null ? "" : routingKey.toString()))
{
replyCode = ExchangeBoundOkBody.OK;
@@ -2862,7 +2860,7 @@ public class AMQChannel
{
closeChannel(AMQConstant.NOT_FOUND, "Unknown exchange: '" + exchangeName + "'");
}
- else if (!(type == null || type.length() == 0) && !exchange.getType().equals(type.asString()))
+ else if (!(type == null || type.length() == 0) && !exchange.getType().equals(type.toString()))
{
_connection.closeConnection(AMQConstant.NOT_ALLOWED, "Attempt to redeclare exchange: '"
@@ -2886,7 +2884,7 @@ public class AMQChannel
{
try
{
- String name = exchangeName == null ? null : exchangeName.intern().toString();
+ String name = exchangeName.intern().toString();
String typeString = type == null ? null : type.intern().toString();
Map<String, Object> attributes = new HashMap<String, Object>();
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQMessage.java Tue Jun 2 20:53:49 2015
@@ -63,7 +63,7 @@ public class AMQMessage extends Abstract
AMQShortString routingKey = messageMetaData.getMessagePublishInfo().getRoutingKey();
if (routingKey != null)
{
- return routingKey.asString();
+ return routingKey.toString();
}
}
return null;
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java Tue Jun 2 20:53:49 2015
@@ -1471,14 +1471,10 @@ public class AMQProtocolEngine implement
_logger.debug("RECV ConnectionOpen[" +" virtualHost: " + virtualHostName + " capabilities: " + capabilities + " insist: " + insist + " ]");
}
- String virtualHostStr;
- if ((virtualHostName != null) && virtualHostName.charAt(0) == '/')
+ String virtualHostStr = AMQShortString.toString(virtualHostName);
+ if ((virtualHostStr != null) && virtualHostStr.charAt(0) == '/')
{
- virtualHostStr = virtualHostName.toString().substring(1);
- }
- else
- {
- virtualHostStr = virtualHostName == null ? null : virtualHostName.toString();
+ virtualHostStr = virtualHostStr.substring(1);
}
VirtualHostImpl<?,?,?> virtualHost = ((AmqpPort)getPort()).getVirtualHost(virtualHostStr);
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageConverter_v0_8_to_Internal.java Tue Jun 2 20:53:49 2015
@@ -219,22 +219,22 @@ public class MessageConverter_v0_8_to_In
{
AMQBindingURL burl = new AMQBindingURL(origReplyToString);
ReplyToComponents replyTo = new ReplyToComponents();
- AMQShortString routingKey = burl.getRoutingKey();
+ String routingKey = burl.getRoutingKey();
if(routingKey != null)
{
- replyTo.setRoutingKey(routingKey.asString());
+ replyTo.setRoutingKey(routingKey);
}
- AMQShortString exchangeName = burl.getExchangeName();
+ String exchangeName = burl.getExchangeName();
if(exchangeName != null)
{
- replyTo.setExchange(exchangeName.asString());
+ replyTo.setExchange(exchangeName);
}
- AMQShortString queueName = burl.getQueueName();
+ String queueName = burl.getQueueName();
if(queueName != null)
{
- replyTo.setQueue(queueName.asString());
+ replyTo.setQueue(queueName);
}
return replyTo;
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java Tue Jun 2 20:53:49 2015
@@ -150,7 +150,7 @@ public class MessageMetaData implements
return _contentHeaderBody.getProperties().getDeliveryMode() == BasicContentHeaderProperties.PERSISTENT;
}
- private static class MetaDataFactory implements MessageMetaDataType.Factory
+ private static class MetaDataFactory implements MessageMetaDataType.Factory<MessageMetaData>
{
@@ -176,15 +176,7 @@ public class MessageMetaData implements
return new MessageMetaData(publishBody, chb, arrivalTime);
}
- catch (IOException e)
- {
- throw new ConnectionScopedRuntimeException(e);
- }
- catch (AMQProtocolVersionException e)
- {
- throw new ConnectionScopedRuntimeException(e);
- }
- catch (AMQFrameDecodingException e)
+ catch (IOException | AMQFrameDecodingException | AMQProtocolVersionException e)
{
throw new ConnectionScopedRuntimeException(e);
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQChannelTest.java Tue Jun 2 20:53:49 2015
@@ -73,7 +73,7 @@ public class AMQChannelTest extends Qpid
int replyCode,
AMQShortString replyText)
{
- _replies.put(replyCode, replyText.asString());
+ _replies.put(replyCode, replyText.toString());
}
};
_replies = new HashMap<Integer, String>();
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngineTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngineTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngineTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngineTest.java Tue Jun 2 20:53:49 2015
@@ -26,24 +26,16 @@ import static org.mockito.Mockito.doThro
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.AMQFrameDecodingException;
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.properties.ConnectionStartProperties;
-import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.model.port.AmqpPort;
import org.apache.qpid.server.util.BrokerTestHelper;
-import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.server.util.ServerScopedRuntimeException;
import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.transport.ByteBufferSender;
-import org.apache.qpid.transport.SenderException;
import org.apache.qpid.transport.network.NetworkConnection;
public class AMQProtocolEngineTest extends QpidTestCase
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/QueueBrowserUsesNoAckTest.java Tue Jun 2 20:53:49 2015
@@ -143,7 +143,7 @@ public class QueueBrowserUsesNoAckTest e
private AMQShortString browse(AMQChannel channel, AMQQueue queue) throws Exception
{
FieldTable filters = new FieldTable();
- filters.put(AMQPFilterTypes.NO_CONSUME.getValue(), true);
+ filters.setBoolean(AMQPFilterTypes.NO_CONSUME.getValue(), true);
return channel.consumeFromSource(null, Collections.<MessageSource>singleton(queue), true, filters, true, false);
}
Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-0-10/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v0_10/MessageConverter_0_8_to_0_10.java Tue Jun 2 20:53:49 2015
@@ -151,22 +151,22 @@ public class MessageConverter_0_8_to_0_1
if(properties.getReplyTo() != null && properties.getReplyTo().length() != 0)
{
- String origReplyToString = properties.getReplyTo().asString();
+ String origReplyToString = properties.getReplyTo().toString();
ReplyTo replyTo = new ReplyTo();
// if the string looks like a binding URL, then attempt to parse it...
try
{
AMQBindingURL burl = new AMQBindingURL(origReplyToString);
- AMQShortString routingKey = burl.getRoutingKey();
+ String routingKey = burl.getRoutingKey();
if(routingKey != null)
{
- replyTo.setRoutingKey(routingKey.asString());
+ replyTo.setRoutingKey(routingKey);
}
- AMQShortString exchangeName = burl.getExchangeName();
+ String exchangeName = burl.getExchangeName();
if(exchangeName != null)
{
- replyTo.setExchange(exchangeName.asString());
+ replyTo.setExchange(exchangeName);
}
}
catch (URISyntaxException e)
Modified: qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-msg-conv-0-8-to-1-0/src/main/java/org/apache/qpid/server/protocol/converter/v0_8_v1_0/MessageConverter_0_8_to_1_0.java Tue Jun 2 20:53:49 2015
@@ -117,21 +117,21 @@ public class MessageConverter_0_8_to_1_0
if(burl.getExchangeName() != null && !burl.getExchangeName().equals(AMQShortString.EMPTY_STRING))
{
- replyTo = burl.getExchangeName().asString();
+ replyTo = burl.getExchangeName().toString();
if(burl.getRoutingKey() != null)
{
- replyTo += "/" + burl.getRoutingKey().asString();
+ replyTo += "/" + burl.getRoutingKey().toString();
}
}
else if(burl.getQueueName() != null && !burl.getQueueName().equals(AMQShortString.EMPTY_STRING))
{
- replyTo = burl.getQueueName().asString();
+ replyTo = burl.getQueueName().toString();
}
else if(burl.getRoutingKey() != null)
{
- replyTo = burl.getRoutingKey().asString();
+ replyTo = burl.getRoutingKey().toString();
}
else
{
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQAnyDestination.java Tue Jun 2 20:53:49 2015
@@ -26,7 +26,6 @@ import javax.jms.JMSException;
import javax.jms.Queue;
import javax.jms.Topic;
-import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.messaging.Address;
import org.apache.qpid.url.BindingURL;
@@ -41,7 +40,8 @@ import org.apache.qpid.url.BindingURL;
*/
public class AMQAnyDestination extends AMQDestination implements Queue, Topic
{
- private static final long serialVersionUID = 2853054849716163231L;
+
+ private static final long serialVersionUID = 5973347887436103851L;
public AMQAnyDestination()
{
@@ -63,10 +63,10 @@ public class AMQAnyDestination extends A
super(addr);
}
- public AMQAnyDestination(AMQShortString exchangeName,AMQShortString exchangeClass,
- AMQShortString routingKey,boolean isExclusive,
- boolean isAutoDelete, AMQShortString queueName,
- boolean isDurable, AMQShortString[] bindingKeys)
+ public AMQAnyDestination(String exchangeName, String exchangeClass,
+ String routingKey, boolean isExclusive,
+ boolean isAutoDelete, String queueName,
+ boolean isDurable, String[] bindingKeys)
{
super(exchangeName, exchangeClass, routingKey, isExclusive, isAutoDelete, queueName, isDurable, bindingKeys);
}
@@ -81,7 +81,7 @@ public class AMQAnyDestination extends A
{
if (getRoutingKey() != null)
{
- return getRoutingKey().asString();
+ return getRoutingKey();
}
else if (getSubject() != null)
{
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java Tue Jun 2 20:53:49 2015
@@ -79,7 +79,6 @@ import org.apache.qpid.client.util.JMSEx
import org.apache.qpid.common.QpidProperties;
import org.apache.qpid.configuration.ClientProperties;
import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.ProtocolVersion;
import org.apache.qpid.jms.BrokerDetails;
import org.apache.qpid.jms.Connection;
@@ -166,10 +165,10 @@ public class AMQConnection extends Close
*/
private QpidConnectionMetaData _connectionMetaData;
- private AMQShortString _defaultTopicExchangeName = AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_NAME);
- private AMQShortString _defaultQueueExchangeName = AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_NAME);
- private AMQShortString _temporaryTopicExchangeName = AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_NAME);
- private AMQShortString _temporaryQueueExchangeName = AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_NAME);
+ private String _defaultTopicExchangeName = ExchangeDefaults.TOPIC_EXCHANGE_NAME;
+ private String _defaultQueueExchangeName = ExchangeDefaults.DIRECT_EXCHANGE_NAME;
+ private String _temporaryTopicExchangeName = ExchangeDefaults.TOPIC_EXCHANGE_NAME;
+ private String _temporaryQueueExchangeName = ExchangeDefaults.DIRECT_EXCHANGE_NAME;
/**
* Thread Pool for executing connection level processes such as reporting asynchronous exceptions
@@ -1533,42 +1532,42 @@ public class AMQConnection extends Close
AMQConnectionFactory.class.getName(), null); // factory location
}
- public AMQShortString getDefaultTopicExchangeName()
+ public String getDefaultTopicExchangeName()
{
return _defaultTopicExchangeName;
}
- public void setDefaultTopicExchangeName(AMQShortString defaultTopicExchangeName)
+ public void setDefaultTopicExchangeName(String defaultTopicExchangeName)
{
_defaultTopicExchangeName = defaultTopicExchangeName;
}
- public AMQShortString getDefaultQueueExchangeName()
+ public String getDefaultQueueExchangeName()
{
return _defaultQueueExchangeName;
}
- public void setDefaultQueueExchangeName(AMQShortString defaultQueueExchangeName)
+ public void setDefaultQueueExchangeName(String defaultQueueExchangeName)
{
_defaultQueueExchangeName = defaultQueueExchangeName;
}
- public AMQShortString getTemporaryTopicExchangeName()
+ public String getTemporaryTopicExchangeName()
{
return _temporaryTopicExchangeName;
}
- public AMQShortString getTemporaryQueueExchangeName()
+ public String getTemporaryQueueExchangeName()
{
return _temporaryQueueExchangeName;
}
- public void setTemporaryTopicExchangeName(AMQShortString temporaryTopicExchangeName)
+ public void setTemporaryTopicExchangeName(String temporaryTopicExchangeName)
{
_temporaryTopicExchangeName = temporaryTopicExchangeName;
}
- public void setTemporaryQueueExchangeName(AMQShortString temporaryQueueExchangeName)
+ public void setTemporaryQueueExchangeName(String temporaryQueueExchangeName)
{
_temporaryQueueExchangeName = temporaryQueueExchangeName;
}
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java Tue Jun 2 20:53:49 2015
@@ -232,7 +232,7 @@ public class AMQConnectionDelegate_0_10
}
catch (ProtocolVersionException pe)
{
- return new ProtocolVersion(pe.getMajor(), pe.getMinor());
+ return ProtocolVersion.get(pe.getMajor(), pe.getMinor());
}
catch (ConnectionException ce)
{
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java Tue Jun 2 20:53:49 2015
@@ -441,7 +441,7 @@ public class AMQConnectionDelegate_8_0 i
public ProtocolVersion getProtocolVersion()
{
- return ProtocolVersion.v8_0;
+ return ProtocolVersion.v0_8;
}
public boolean verifyClientID() throws JMSException
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java Tue Jun 2 20:53:49 2015
@@ -21,7 +21,6 @@
package org.apache.qpid.client;
import org.apache.qpid.client.url.URLParser;
-import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.jms.BrokerDetails;
import org.apache.qpid.jms.ConnectionURL;
import org.apache.qpid.url.URLHelper;
@@ -184,44 +183,44 @@ public class AMQConnectionURL implements
_options.put(key, value);
}
- public AMQShortString getDefaultQueueExchangeName()
+ public String getDefaultQueueExchangeName()
{
- return _defaultQueueExchangeName == null ? null : new AMQShortString(_defaultQueueExchangeName);
+ return _defaultQueueExchangeName;
}
- public void setDefaultQueueExchangeName(AMQShortString defaultQueueExchangeName)
+ public void setDefaultQueueExchangeName(String defaultQueueExchangeName)
{
- _defaultQueueExchangeName = defaultQueueExchangeName == null ? null : defaultQueueExchangeName.asString();
+ _defaultQueueExchangeName = defaultQueueExchangeName;
}
- public AMQShortString getDefaultTopicExchangeName()
+ public String getDefaultTopicExchangeName()
{
- return _defaultTopicExchangeName == null ? null : new AMQShortString(_defaultTopicExchangeName);
+ return _defaultTopicExchangeName;
}
- public void setDefaultTopicExchangeName(AMQShortString defaultTopicExchangeName)
+ public void setDefaultTopicExchangeName(String defaultTopicExchangeName)
{
- _defaultTopicExchangeName = defaultTopicExchangeName == null ? null : defaultTopicExchangeName.asString();
+ _defaultTopicExchangeName = defaultTopicExchangeName;
}
- public AMQShortString getTemporaryQueueExchangeName()
+ public String getTemporaryQueueExchangeName()
{
- return _temporaryQueueExchangeName == null ? null : new AMQShortString(_temporaryQueueExchangeName);
+ return _temporaryQueueExchangeName;
}
- public void setTemporaryQueueExchangeName(AMQShortString temporaryQueueExchangeName)
+ public void setTemporaryQueueExchangeName(String temporaryQueueExchangeName)
{
- _temporaryQueueExchangeName = temporaryQueueExchangeName == null ? null : temporaryQueueExchangeName.asString();
+ _temporaryQueueExchangeName = temporaryQueueExchangeName;
}
- public AMQShortString getTemporaryTopicExchangeName()
+ public String getTemporaryTopicExchangeName()
{
- return _temporaryTopicExchangeName == null ? null : new AMQShortString(_temporaryTopicExchangeName);
+ return _temporaryTopicExchangeName;
}
- public void setTemporaryTopicExchangeName(AMQShortString temporaryTopicExchangeName)
+ public void setTemporaryTopicExchangeName(String temporaryTopicExchangeName)
{
- _temporaryTopicExchangeName = temporaryTopicExchangeName == null ? null : temporaryTopicExchangeName.asString() ;
+ _temporaryTopicExchangeName = temporaryTopicExchangeName;
}
@Override
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQDestination.java Tue Jun 2 20:53:49 2015
@@ -52,11 +52,12 @@ import org.apache.qpid.url.URLHelper;
public abstract class AMQDestination implements Destination, Referenceable, Externalizable
{
private static final Logger _logger = LoggerFactory.getLogger(AMQDestination.class);
- private static final long serialVersionUID = -3716263015355017537L;
+ private static final long serialVersionUID = -3152767926421156400L;
- private AMQShortString _exchangeName;
- private AMQShortString _exchangeClass;
+ private String _exchangeName;
+
+ private String _exchangeClass;
private boolean _exchangeAutoDelete;
@@ -74,11 +75,11 @@ public abstract class AMQDestination imp
private AtomicLong _addressResolved = new AtomicLong(0);
- private AMQShortString _queueName;
+ private String _queueName;
- private AMQShortString _routingKey;
+ private String _routingKey;
- private AMQShortString[] _bindingKeys;
+ private String[] _bindingKeys;
private String _url;
private AMQShortString _urlAsShortString;
@@ -298,55 +299,55 @@ public abstract class AMQDestination imp
_browseOnly = Boolean.parseBoolean(binding.getOption(BindingURL.OPTION_BROWSE));
_queueName = binding.getQueueName() == null ? null : binding.getQueueName();
_routingKey = binding.getRoutingKey() == null ? null : binding.getRoutingKey();
- _bindingKeys = binding.getBindingKeys() == null || binding.getBindingKeys().length == 0 ? new AMQShortString[0] : binding.getBindingKeys();
+ _bindingKeys = binding.getBindingKeys() == null || binding.getBindingKeys().length == 0 ? new String[0] : binding.getBindingKeys();
final String rejectBehaviourValue = binding.getOption(BindingURL.OPTION_REJECT_BEHAVIOUR);
_rejectBehaviour = rejectBehaviourValue == null ? null : RejectBehaviour.valueOf(rejectBehaviourValue.toUpperCase());
_consumerArguments = binding.getConsumerOptions();
}
- protected AMQDestination(AMQShortString exchangeName, AMQShortString exchangeClass, AMQShortString routingKey, AMQShortString queueName)
+ protected AMQDestination(String exchangeName, String exchangeClass, String routingKey, String queueName)
{
this(exchangeName, exchangeClass, routingKey, false, false, queueName, null);
}
- protected AMQDestination(AMQShortString exchangeName, AMQShortString exchangeClass, AMQShortString routingKey, AMQShortString queueName, AMQShortString[] bindingKeys)
+ protected AMQDestination(String exchangeName, String exchangeClass, String routingKey, String queueName, String[] bindingKeys)
{
this(exchangeName, exchangeClass, routingKey, false, false, queueName,bindingKeys);
}
- protected AMQDestination(AMQShortString exchangeName, AMQShortString exchangeClass, AMQShortString destinationName)
+ protected AMQDestination(String exchangeName, String exchangeClass, String destinationName)
{
this(exchangeName, exchangeClass, destinationName, false, false, null,null);
}
- protected AMQDestination(AMQShortString exchangeName, AMQShortString exchangeClass, AMQShortString routingKey, boolean isExclusive,
- boolean isAutoDelete, AMQShortString queueName)
+ protected AMQDestination(String exchangeName, String exchangeClass, String routingKey, boolean isExclusive,
+ boolean isAutoDelete, String queueName)
{
this(exchangeName, exchangeClass, routingKey, isExclusive, isAutoDelete, queueName, false,null);
}
- protected AMQDestination(AMQShortString exchangeName, AMQShortString exchangeClass, AMQShortString routingKey, boolean isExclusive,
- boolean isAutoDelete, AMQShortString queueName,AMQShortString[] bindingKeys)
+ protected AMQDestination(String exchangeName, String exchangeClass, String routingKey, boolean isExclusive,
+ boolean isAutoDelete, String queueName, String[] bindingKeys)
{
this(exchangeName, exchangeClass, routingKey, isExclusive, isAutoDelete, queueName, false,bindingKeys);
}
- protected AMQDestination(AMQShortString exchangeName, AMQShortString exchangeClass, AMQShortString routingKey, boolean isExclusive,
- boolean isAutoDelete, AMQShortString queueName, boolean isDurable){
+ protected AMQDestination(String exchangeName, String exchangeClass, String routingKey, boolean isExclusive,
+ boolean isAutoDelete, String queueName, boolean isDurable){
this (exchangeName, exchangeClass, routingKey, isExclusive,isAutoDelete,queueName,isDurable,null);
}
- protected AMQDestination(AMQShortString exchangeName, AMQShortString exchangeClass, AMQShortString routingKey, boolean isExclusive,
- boolean isAutoDelete, AMQShortString queueName, boolean isDurable,AMQShortString[] bindingKeys)
+ protected AMQDestination(String exchangeName, String exchangeClass, String routingKey, boolean isExclusive,
+ boolean isAutoDelete, String queueName, boolean isDurable, String[] bindingKeys)
{
- this (exchangeName, exchangeClass, routingKey, isExclusive,isAutoDelete,queueName,isDurable,bindingKeys, false);
+ this (exchangeName, exchangeClass, routingKey, isExclusive,isAutoDelete,queueName,isDurable, bindingKeys, false);
}
- protected AMQDestination(AMQShortString exchangeName, AMQShortString exchangeClass, AMQShortString routingKey, boolean isExclusive,
- boolean isAutoDelete, AMQShortString queueName, boolean isDurable,AMQShortString[] bindingKeys, boolean browseOnly)
+ protected AMQDestination(String exchangeName, String exchangeClass, String routingKey, boolean isExclusive,
+ boolean isAutoDelete, String queueName, boolean isDurable, String[] bindingKeys, boolean browseOnly)
{
- if ( (AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_CLASS).equals(exchangeClass) ||
- AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_CLASS).equals(exchangeClass))
+ if ( (ExchangeDefaults.DIRECT_EXCHANGE_CLASS.equals(exchangeClass) ||
+ ExchangeDefaults.TOPIC_EXCHANGE_CLASS.equals(exchangeClass))
&& routingKey == null)
{
throw new IllegalArgumentException("routing/binding key must not be null");
@@ -366,7 +367,7 @@ public abstract class AMQDestination imp
_isAutoDelete = isAutoDelete;
_queueName = queueName;
_isDurable = isDurable;
- _bindingKeys = bindingKeys == null || bindingKeys.length == 0 ? new AMQShortString[0] : bindingKeys;
+ _bindingKeys = bindingKeys == null || bindingKeys.length == 0 ? new String[0] : bindingKeys;
_destSyntax = DestSyntax.BURL;
_browseOnly = browseOnly;
_rejectBehaviour = null;
@@ -418,12 +419,12 @@ public abstract class AMQDestination imp
return _isDurable;
}
- public AMQShortString getExchangeName()
+ public String getExchangeName()
{
return _exchangeName;
}
- public AMQShortString getExchangeClass()
+ public String getExchangeClass()
{
return _exchangeClass;
}
@@ -445,12 +446,12 @@ public abstract class AMQDestination imp
public boolean isTopic()
{
- return AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_CLASS).equals(_exchangeClass);
+ return ExchangeDefaults.TOPIC_EXCHANGE_CLASS.equals(_exchangeClass);
}
public boolean isQueue()
{
- return AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_CLASS).equals(_exchangeClass);
+ return ExchangeDefaults.DIRECT_EXCHANGE_CLASS.equals(_exchangeClass);
}
public String getQueueName()
@@ -458,12 +459,12 @@ public abstract class AMQDestination imp
return _queueName == null ? null : _queueName.toString();
}
- public AMQShortString getAMQQueueName()
+ public String getAMQQueueName()
{
return _queueName;
}
- public void setQueueName(AMQShortString queueName)
+ public void setQueueName(String queueName)
{
_queueName = queueName;
@@ -472,12 +473,12 @@ public abstract class AMQDestination imp
_urlAsShortString = null;
}
- public AMQShortString getRoutingKey()
+ public String getRoutingKey()
{
return _routingKey;
}
- public AMQShortString[] getBindingKeys()
+ public String[] getBindingKeys()
{
if (_bindingKeys != null && _bindingKeys.length > 0)
{
@@ -487,7 +488,7 @@ public abstract class AMQDestination imp
{
// catering to the common use case where the
//routingKey is the same as the bindingKey.
- return new AMQShortString[]{_routingKey};
+ return new String[]{_routingKey};
}
}
@@ -571,7 +572,7 @@ public abstract class AMQDestination imp
if (_routingKey == null && _bindingKeys != null && _bindingKeys.length>0)
{
- for (AMQShortString bindingKey:_bindingKeys)
+ for (String bindingKey:_bindingKeys)
{
sb.append(BindingURL.OPTION_BINDING_KEY);
sb.append("='");
@@ -737,17 +738,17 @@ public abstract class AMQDestination imp
public static Destination createDestination(BindingURL binding)
{
- AMQShortString type = binding.getExchangeClass();
+ String type = binding.getExchangeClass();
- if (type.equals(AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_CLASS)))
+ if (type.equals(ExchangeDefaults.DIRECT_EXCHANGE_CLASS))
{
return new AMQQueue(binding);
}
- else if (type.equals(AMQShortString.valueOf(ExchangeDefaults.TOPIC_EXCHANGE_CLASS)))
+ else if (type.equals(ExchangeDefaults.TOPIC_EXCHANGE_CLASS))
{
return new AMQTopic(binding);
}
- else if (type.equals(AMQShortString.valueOf(ExchangeDefaults.HEADERS_EXCHANGE_CLASS)))
+ else if (type.equals(ExchangeDefaults.HEADERS_EXCHANGE_CLASS))
{
return new AMQHeadersExchange(binding);
}
@@ -908,17 +909,17 @@ public abstract class AMQDestination imp
_link = link;
}
- public void setExchangeName(AMQShortString name)
+ public void setExchangeName(String name)
{
this._exchangeName = name;
}
- public void setExchangeClass(AMQShortString type)
+ public void setExchangeClass(String type)
{
this._exchangeClass = type;
}
- public void setRoutingKey(AMQShortString rk)
+ public void setRoutingKey(String rk)
{
this._routingKey = rk;
}
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQHeadersExchange.java Tue Jun 2 20:53:49 2015
@@ -21,7 +21,6 @@
package org.apache.qpid.client;
import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.url.BindingURL;
/**
@@ -29,21 +28,17 @@ import org.apache.qpid.url.BindingURL;
*/
public class AMQHeadersExchange extends AMQDestination
{
- private static final long serialVersionUID = 2187866678283988301L;
+
+ private static final long serialVersionUID = -4415654819705406921L;
public AMQHeadersExchange(BindingURL binding)
{
super(binding);
}
- public AMQHeadersExchange(String name)
- {
- this(new AMQShortString(name));
- }
-
- public AMQHeadersExchange(AMQShortString queueName)
+ public AMQHeadersExchange(String queueName)
{
- super(queueName, AMQShortString.valueOf(ExchangeDefaults.HEADERS_EXCHANGE_CLASS), queueName, true, true, null);
+ super(queueName, ExchangeDefaults.HEADERS_EXCHANGE_CLASS, queueName, true, true, null);
}
public boolean isNameRequired()
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQQueue.java?rev=1683186&r1=1683185&r2=1683186&view=diff
==============================================================================
--- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQQueue.java (original)
+++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQQueue.java Tue Jun 2 20:53:49 2015
@@ -25,13 +25,13 @@ import java.net.URISyntaxException;
import javax.jms.Queue;
import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.messaging.Address;
import org.apache.qpid.url.BindingURL;
public class AMQQueue extends AMQDestination implements Queue
{
- private static final long serialVersionUID = -1283142598932655606L;
+
+ private static final long serialVersionUID = -6683926136231720218L;
public AMQQueue()
{
@@ -58,47 +58,28 @@ public class AMQQueue extends AMQDestina
super(binding);
}
- /**
- * Create a reference to a non temporary queue. Note this does not actually imply the queue exists.
- * @param name the name of the queue
- */
- public AMQQueue(AMQShortString exchangeName, String name)
- {
- this(exchangeName, new AMQShortString(name));
- }
-
/**
* Create a reference to a non temporary queue. Note this does not actually imply the queue exists.
* @param name the name of the queue
*/
- public AMQQueue(AMQShortString exchangeName, AMQShortString name)
+ public AMQQueue(String exchangeName, String name)
{
this(exchangeName, name, false);
}
- public AMQQueue(AMQShortString exchangeName, AMQShortString routingKey, AMQShortString queueName)
+ public AMQQueue(String exchangeName, String routingKey, String queueName)
{
- super(exchangeName, AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_CLASS), routingKey, false,
+ super(exchangeName, ExchangeDefaults.DIRECT_EXCHANGE_CLASS, routingKey, false,
false, queueName, false);
}
- public AMQQueue(AMQShortString exchangeName, AMQShortString routingKey, AMQShortString queueName,AMQShortString[] bindingKeys)
- {
- super(exchangeName, AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_CLASS), routingKey, false,
- false, queueName, false,bindingKeys);
- }
-
- /**
- * Create a reference to a non temporary queue. Note this does not actually imply the queue exists.
- * @param name the name of the queue
- */
- public AMQQueue(String exchangeName, String name)
+ public AMQQueue(String exchangeName, String routingKey, String queueName, String[] bindingKeys)
{
- this(new AMQShortString(exchangeName), new AMQShortString(name), false);
+ super(exchangeName, ExchangeDefaults.DIRECT_EXCHANGE_CLASS, routingKey, false,
+ false, queueName, false, bindingKeys);
}
-
public AMQQueue(AMQConnection connection, String name)
{
this(connection.getDefaultQueueExchangeName(),name);
@@ -106,22 +87,10 @@ public class AMQQueue extends AMQDestina
public AMQQueue(AMQConnection connection, String name, boolean temporary)
{
- this(connection.getDefaultQueueExchangeName(), new AMQShortString(name),temporary);
+ this(connection.getDefaultQueueExchangeName(), name,temporary);
}
- /**
- * Create a queue with a specified name.
- *
- * @param name the destination name (used in the routing key)
- * @param temporary if true the broker will generate a queue name, also if true then the queue is autodeleted
- * and exclusive
- */
- public AMQQueue(String exchangeName, String name, boolean temporary)
- {
- this(new AMQShortString(exchangeName), new AMQShortString(name),temporary);
- }
-
/**
* Create a queue with a specified name.
@@ -130,11 +99,11 @@ public class AMQQueue extends AMQDestina
* @param temporary if true the broker will generate a queue name, also if true then the queue is autodeleted
* and exclusive
*/
- public AMQQueue(AMQShortString exchangeName, AMQShortString name, boolean temporary)
+ public AMQQueue(String exchangeName, String name, boolean temporary)
{
// queue name is set to null indicating that the broker assigns a name in the case of temporary queues
// temporary queues are typically used as response queues
- this(exchangeName, name, temporary?null:name, temporary, temporary, !temporary);
+ this(exchangeName, name, temporary ? null : name, temporary, temporary, !temporary);
}
@@ -146,23 +115,23 @@ public class AMQQueue extends AMQDestina
* @param exclusive true if the queue should only permit a single consumer
* @param autoDelete true if the queue should be deleted automatically when the last consumers detaches
*/
- public AMQQueue(AMQShortString exchangeName, AMQShortString routingKey, AMQShortString queueName, boolean exclusive, boolean autoDelete)
+ public AMQQueue(String exchangeName, String routingKey, String queueName, boolean exclusive, boolean autoDelete)
{
this(exchangeName, routingKey, queueName, exclusive, autoDelete, false);
}
- public AMQQueue(AMQShortString exchangeName, AMQShortString routingKey, AMQShortString queueName, boolean exclusive, boolean autoDelete, boolean durable)
+ public AMQQueue(String exchangeName, String routingKey, String queueName, boolean exclusive, boolean autoDelete, boolean durable)
{
- this(exchangeName,routingKey,queueName,exclusive,autoDelete,durable,null);
+ this(exchangeName, routingKey, queueName, exclusive, autoDelete, durable, null);
}
- public AMQQueue(AMQShortString exchangeName, AMQShortString routingKey, AMQShortString queueName, boolean exclusive, boolean autoDelete, boolean durable,AMQShortString[] bindingKeys)
+ public AMQQueue(String exchangeName, String routingKey, String queueName, boolean exclusive, boolean autoDelete, boolean durable, String[] bindingKeys)
{
- super(exchangeName, AMQShortString.valueOf(ExchangeDefaults.DIRECT_EXCHANGE_CLASS), routingKey, exclusive,
+ super(exchangeName, ExchangeDefaults.DIRECT_EXCHANGE_CLASS, routingKey, exclusive,
autoDelete, queueName, durable, bindingKeys);
}
- public AMQShortString getRoutingKey()
+ public String getRoutingKey()
{
if (getAMQQueueName() != null && getAMQQueueName().equals(super.getRoutingKey()))
{
@@ -176,8 +145,8 @@ public class AMQQueue extends AMQDestina
public boolean isNameRequired()
{
- AMQShortString queueName = getAMQQueueName();
- return queueName == null || AMQShortString.EMPTY_STRING.equals(queueName);
+ String queueName = getAMQQueueName();
+ return queueName == null || "".equals(queueName);
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org