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 2011/12/28 14:02:48 UTC
svn commit: r1225178 [5/8] - in /qpid/trunk/qpid/java: ./ bdbstore/src/main/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/
bdbstore/src/test/ bdbstore/src/test/jav...
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java Wed Dec 28 13:02:41 2011
@@ -72,7 +72,7 @@ public class AbstractHeadersExchangeTest
/**
* Not used in this test, just there to stub out the routing calls
*/
- private MessageStore _store = new MemoryMessageStore();
+ private MemoryMessageStore _store = new MemoryMessageStore();
BindingFactory bindingFactory = new BindingFactory(new DurableConfigurationStore.Source()
@@ -310,7 +310,7 @@ public class AbstractHeadersExchangeTest
* @throws AMQException
*/
@Override
- public void enqueue(ServerMessage msg, PostEnqueueAction action) throws AMQException
+ public void enqueue(ServerMessage msg, boolean sync, PostEnqueueAction action) throws AMQException
{
messages.add( new HeadersExchangeTest.Message((AMQMessage) msg));
final QueueEntry queueEntry = new QueueEntry()
@@ -318,47 +318,47 @@ public class AbstractHeadersExchangeTest
public AMQQueue getQueue()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public AMQMessage getMessage()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public long getSize()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public boolean getDeliveredToConsumer()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public boolean expired() throws AMQException
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public boolean isAvailable()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public boolean isAcquired()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public boolean acquire()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public boolean acquire(Subscription sub)
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public boolean delete()
@@ -373,17 +373,17 @@ public class AbstractHeadersExchangeTest
public boolean acquiredBySubscription()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public boolean isAcquiredBy(Subscription subscription)
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public void release()
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public boolean releaseButRetain()
@@ -393,82 +393,82 @@ public class AbstractHeadersExchangeTest
public boolean immediateAndNotDelivered()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public void setRedelivered()
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public AMQMessageHeader getMessageHeader()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public boolean isPersistent()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public boolean isRedelivered()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public Subscription getDeliveredSubscription()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public void reject()
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public boolean isRejectedBy(long subscriptionId)
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public void dequeue()
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void dispose()
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void discard()
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void routeToAlternate()
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public boolean isQueueDeleted()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public void addStateChangeListener(StateChangeListener listener)
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public boolean removeStateChangeListener(StateChangeListener listener)
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public int compareTo(final QueueEntry o)
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public boolean isDequeued()
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java Wed Dec 28 13:02:41 2011
@@ -64,17 +64,17 @@ public class AMQPriorityQueueTest extend
ArrayList<QueueEntry> msgs = _subscription.getMessages();
try
{
- assertEquals(new Long(1L), msgs.get(0).getMessage().getMessageNumber());
- assertEquals(new Long(6L), msgs.get(1).getMessage().getMessageNumber());
- assertEquals(new Long(8L), msgs.get(2).getMessage().getMessageNumber());
-
- assertEquals(new Long(2L), msgs.get(3).getMessage().getMessageNumber());
- assertEquals(new Long(5L), msgs.get(4).getMessage().getMessageNumber());
- assertEquals(new Long(7L), msgs.get(5).getMessage().getMessageNumber());
-
- assertEquals(new Long(3L), msgs.get(6).getMessage().getMessageNumber());
- assertEquals(new Long(4L), msgs.get(7).getMessage().getMessageNumber());
- assertEquals(new Long(9L), msgs.get(8).getMessage().getMessageNumber());
+ assertEquals(1L, msgs.get(0).getMessage().getMessageNumber());
+ assertEquals(6L, msgs.get(1).getMessage().getMessageNumber());
+ assertEquals(8L, msgs.get(2).getMessage().getMessageNumber());
+
+ assertEquals(2L, msgs.get(3).getMessage().getMessageNumber());
+ assertEquals(5L, msgs.get(4).getMessage().getMessageNumber());
+ assertEquals(7L, msgs.get(5).getMessage().getMessageNumber());
+
+ assertEquals(3L, msgs.get(6).getMessage().getMessageNumber());
+ assertEquals(4L, msgs.get(7).getMessage().getMessageNumber());
+ assertEquals(9L, msgs.get(8).getMessage().getMessageNumber());
}
catch (AssertionFailedError afe)
{
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java Wed Dec 28 13:02:41 2011
@@ -168,22 +168,22 @@ public class MockAMQQueue implements AMQ
public UUID getId()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public QueueConfigType getConfigType()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public ConfiguredObject getParent()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public boolean isDurable()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public boolean isAutoDelete()
@@ -199,7 +199,7 @@ public class MockAMQQueue implements AMQ
public AMQShortString getOwner()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public void setVirtualHost(VirtualHost virtualhost)
@@ -219,22 +219,22 @@ public class MockAMQQueue implements AMQ
public void registerSubscription(Subscription subscription, boolean exclusive) throws AMQException
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void unregisterSubscription(Subscription subscription) throws AMQException
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public int getConsumerCount()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public int getActiveConsumerCount()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public boolean hasExclusiveSubscriber()
@@ -244,37 +244,37 @@ public class MockAMQQueue implements AMQ
public boolean isUnused()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public boolean isEmpty()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public int getMessageCount()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public int getUndeliveredMessageCount()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public long getQueueDepth()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public long getReceivedMessageCount()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public long getOldestMessageArrivalTime()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public boolean isDeleted()
@@ -297,59 +297,58 @@ public class MockAMQQueue implements AMQ
}
+ public void enqueue(ServerMessage message, boolean sync, PostEnqueueAction action) throws AMQException
+ {
+ }
+
public void requeue(QueueEntry entry)
{
- //To change body of implemented methods use File | Settings | File Templates.
}
public void requeue(QueueEntryImpl storeContext, Subscription subscription)
{
- //To change body of implemented methods use File | Settings | File Templates.
}
public void dequeue(QueueEntry entry, Subscription sub)
{
- //To change body of implemented methods use File | Settings | File Templates.
}
public boolean resend(QueueEntry entry, Subscription subscription) throws AMQException
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public void addQueueDeleteTask(Task task)
{
- //To change body of implemented methods use File | Settings | File Templates.
}
public void removeQueueDeleteTask(final Task task)
{
- //To change body of implemented methods use File | Settings | File Templates.
}
public List<QueueEntry> getMessagesOnTheQueue()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public List<QueueEntry> getMessagesOnTheQueue(long fromMessageId, long toMessageId)
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public List<Long> getMessagesOnTheQueue(int num)
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public List<Long> getMessagesOnTheQueue(int num, int offest)
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public QueueEntry getMessageOnTheQueue(long messageId)
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public List<QueueEntry> getMessagesRangeOnTheQueue(long fromPosition, long toPosition)
@@ -359,132 +358,123 @@ public class MockAMQQueue implements AMQ
public void moveMessagesToAnotherQueue(long fromMessageId, long toMessageId, String queueName, ServerTransaction storeContext)
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void copyMessagesToAnotherQueue(long fromMessageId, long toMessageId, String queueName, ServerTransaction storeContext)
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void removeMessagesFromQueue(long fromMessageId, long toMessageId)
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public long getMaximumMessageSize()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public void setMaximumMessageSize(long value)
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public long getMaximumMessageCount()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public void setMaximumMessageCount(long value)
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public long getMaximumQueueDepth()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public void setMaximumQueueDepth(long value)
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public long getMaximumMessageAge()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public void setMaximumMessageAge(long maximumMessageAge)
{
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public boolean getBlockOnQueueFull()
- {
- return false;
- }
-
- public void setBlockOnQueueFull(boolean block)
- {
+
}
public long getMinimumAlertRepeatGap()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public void deleteMessageFromTop()
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public long clearQueue()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public void checkMessageStatus() throws AMQException
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public Set<NotificationCheck> getNotificationChecks()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public void flushSubscription(Subscription sub) throws AMQException
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void deliverAsync(Subscription sub)
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void deliverAsync()
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void stop()
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public boolean isExclusive()
{
- return false; //To change body of implemented methods use File | Settings | File Templates.
+ return false;
}
public Exchange getAlternateExchange()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public void setAlternateExchange(Exchange exchange)
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public Map<String, Object> getArguments()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public void checkCapacity(AMQChannel channel)
@@ -493,12 +483,12 @@ public class MockAMQQueue implements AMQ
public ManagedObject getManagedObject()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public int compareTo(AMQQueue o)
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public void setMinimumAlertRepeatGap(long value)
@@ -508,22 +498,22 @@ public class MockAMQQueue implements AMQ
public long getCapacity()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public void setCapacity(long capacity)
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public long getFlowResumeCapacity()
{
- return 0; //To change body of implemented methods use File | Settings | File Templates.
+ return 0;
}
public void setFlowResumeCapacity(long flowResumeCapacity)
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void configure(ConfigurationPlugin config)
@@ -533,7 +523,7 @@ public class MockAMQQueue implements AMQ
public ConfigurationPlugin getConfiguration()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
public AuthorizationHolder getAuthorizationHolder()
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java Wed Dec 28 13:02:41 2011
@@ -23,7 +23,6 @@ package org.apache.qpid.server.queue;
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.TransactionLog;
import org.apache.qpid.server.store.StoredMessage;
import org.apache.qpid.server.message.MessageMetaData;
import org.apache.qpid.framing.ContentHeaderBody;
@@ -97,7 +96,17 @@ public class MockStoredMessage implement
return src.limit();
}
- public TransactionLog.StoreFuture flushToStore()
+
+
+ public ByteBuffer getContent(int offsetInMessage, int size)
+ {
+ ByteBuffer buf = ByteBuffer.allocate(size);
+ getContent(offsetInMessage, buf);
+ buf.position(0);
+ return buf;
+ }
+
+ public MessageStore.StoreFuture flushToStore()
{
return MessageStore.IMMEDIATE_FUTURE;
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java Wed Dec 28 13:02:41 2011
@@ -164,7 +164,7 @@ public abstract class QueueEntryListTest
final QueueEntry head = getTestList().getHead();
assertNull("Head entry should not contain an actual message", head.getMessage());
assertEquals("Unexpected message id for first list entry", getExpectedFirstMsgId(), getTestList().next(head)
- .getMessage().getMessageNumber().longValue());
+ .getMessage().getMessageNumber());
}
/**
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java Wed Dec 28 13:02:41 2011
@@ -649,9 +649,7 @@ public class SimpleAMQQueueTest extends
public void onRollback()
{
}
- });
-
-
+ }, 0L);
// Check that it is enqueued
AMQQueue data = _store.getMessages().get(1L);
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java Wed Dec 28 13:02:41 2011
@@ -162,8 +162,8 @@ public class SimpleQueueEntryListTest ex
while (entry != null)
{
assertFalse("Entry " + entry.getMessage().getMessageNumber() + " should not have been deleted", entry.isDeleted());
- assertNotNull("QueueEntry was not found in the list of remaining entries",
- remainingMessages.get(entry.getMessage().getMessageNumber().intValue()));
+ assertNotNull("QueueEntry "+entry.getMessage().getMessageNumber()+" was not found in the list of remaining entries " + remainingMessages,
+ remainingMessages.get((int)(entry.getMessage().getMessageNumber())));
count++;
entry = entry.getNextNode();
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java Wed Dec 28 13:02:41 2011
@@ -317,7 +317,7 @@ public class SortedQueueEntryListTest ex
assertEquals("Sorted queue entry value is not as expected",
expectedSortKey, entry.getMessage().getMessageHeader().getHeader("KEY"));
assertEquals("Sorted queue entry id is not as expected",
- Long.valueOf(expectedMessageId), entry.getMessage().getMessageNumber());
+ expectedMessageId, entry.getMessage().getMessageNumber());
}
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java Wed Dec 28 13:02:41 2011
@@ -558,7 +558,7 @@ public class MessageStoreTest extends In
/**
* Delete the Store Environment path
*
- * @param configuration The configuration that contains the store environment path.
+ * @param environmentPath The configuration that contains the store environment path.
*/
private void cleanup(File environmentPath)
{
@@ -636,7 +636,7 @@ public class MessageStoreTest extends In
{
//To change body of implemented methods use File | Settings | File Templates.
}
- });
+ }, 0L);
}
}
@@ -710,7 +710,7 @@ public class MessageStoreTest extends In
if (queue.isDurable() && !queue.isAutoDelete())
{
- getVirtualHost().getMessageStore().createQueue(queue, queueArguments);
+ getVirtualHost().getDurableConfigurationStore().createQueue(queue, queueArguments);
}
}
catch (AMQException e)
@@ -754,7 +754,7 @@ public class MessageStoreTest extends In
getVirtualHost().getExchangeRegistry().registerExchange(exchange);
if (durable)
{
- getVirtualHost().getMessageStore().createExchange(exchange);
+ getVirtualHost().getDurableConfigurationStore().createExchange(exchange);
}
}
catch (AMQException e)
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/SkeletonMessageStore.java Wed Dec 28 13:02:41 2011
@@ -26,6 +26,7 @@ import org.apache.qpid.AMQStoreException
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.framing.abstraction.ContentChunk;
+import org.apache.qpid.server.message.EnqueableMessage;
import org.apache.qpid.server.message.MessageMetaData;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.exchange.Exchange;
@@ -42,18 +43,11 @@ import java.nio.ByteBuffer;
*/
public class SkeletonMessageStore implements MessageStore
{
- private final AtomicLong _messageId = new AtomicLong(1);
-
- public void configure(String base, Configuration config) throws Exception
- {
- }
-
public void configureConfigStore(String name,
ConfigurationRecoveryHandler recoveryHandler,
Configuration config,
LogSubject logSubject) throws Exception
{
- //To change body of implemented methods use File | Settings | File Templates.
}
public void configureMessageStore(String name,
@@ -61,7 +55,6 @@ public class SkeletonMessageStore implem
Configuration config,
LogSubject logSubject) throws Exception
{
- //To change body of implemented methods use File | Settings | File Templates.
}
public void close() throws Exception
@@ -70,31 +63,28 @@ public class SkeletonMessageStore implem
public <M extends StorableMessageMetaData> StoredMessage<M> addMessage(M metaData)
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return null;
}
- public void removeMessage(Long messageId)
- {
- }
public void createExchange(Exchange exchange) throws AMQStoreException
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void removeExchange(Exchange exchange) throws AMQStoreException
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void bindQueue(Exchange exchange, AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQStoreException
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void unbindQueue(Exchange exchange, AMQShortString routingKey, AMQQueue queue, FieldTable args) throws AMQStoreException
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void createQueue(AMQQueue queue) throws AMQStoreException
@@ -105,63 +95,11 @@ public class SkeletonMessageStore implem
{
}
-
-
-
- public List<AMQQueue> createQueues() throws AMQException
- {
- return null;
- }
-
- public Long getNewMessageId()
- {
- return _messageId.getAndIncrement();
- }
-
- public void storeContentBodyChunk(
- Long messageId,
- int index,
- ContentChunk contentBody,
- boolean lastContentBody) throws AMQException
- {
-
- }
-
- public void storeMessageMetaData(Long messageId, MessageMetaData messageMetaData) throws AMQException
- {
-
- }
-
- public MessageMetaData getMessageMetaData(Long messageId) throws AMQException
- {
- return null;
- }
-
- public ContentChunk getContentBodyChunk(Long messageId, int index) throws AMQException
- {
- return null;
- }
-
public boolean isPersistent()
{
return false;
}
- public void storeMessageHeader(Long messageNumber, ServerMessage message)
- {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public void storeContent(Long messageNumber, long offset, ByteBuffer body)
- {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
- public ServerMessage getMessage(Long messageNumber)
- {
- return null; //To change body of implemented methods use File | Settings | File Templates.
- }
-
public void removeQueue(final AMQQueue queue) throws AMQStoreException
{
@@ -172,7 +110,7 @@ public class SkeletonMessageStore implem
Configuration storeConfiguration,
LogSubject logSubject) throws Exception
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public Transaction newTransaction()
@@ -180,19 +118,19 @@ public class SkeletonMessageStore implem
return new Transaction()
{
- public void enqueueMessage(TransactionLogResource queue, Long messageId) throws AMQStoreException
+ public void enqueueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
- public void dequeueMessage(TransactionLogResource queue, Long messageId) throws AMQStoreException
+ public void dequeueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public void commitTran() throws AMQStoreException
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
public StoreFuture commitTranAsync() throws AMQStoreException
@@ -213,7 +151,7 @@ public class SkeletonMessageStore implem
public void abortTran() throws AMQStoreException
{
- //To change body of implemented methods use File | Settings | File Templates.
+
}
};
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestMemoryMessageStore.java Wed Dec 28 13:02:41 2011
@@ -82,6 +82,12 @@ public class TestMemoryMessageStore exte
return _storedMessage.getContent(offsetInMessage, dst);
}
+
+ public ByteBuffer getContent(int offsetInMessage, int size)
+ {
+ return _storedMessage.getContent(offsetInMessage, size);
+ }
+
public StoreFuture flushToStore()
{
return _storedMessage.flushToStore();
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java Wed Dec 28 13:02:41 2011
@@ -25,6 +25,8 @@ import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.qpid.AMQStoreException;
+import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.queue.AMQQueue;
/**
@@ -66,14 +68,14 @@ public class TestableMemoryMessageStore
private class TestableTransaction implements Transaction
{
- public void enqueueMessage(TransactionLogResource queue, Long messageId) throws AMQStoreException
+ public void enqueueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException
{
- getMessages().put(messageId, (AMQQueue)queue);
+ getMessages().put(message.getMessageNumber(), (AMQQueue)queue);
}
- public void dequeueMessage(TransactionLogResource queue, Long messageId) throws AMQStoreException
+ public void dequeueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException
{
- getMessages().remove(messageId);
+ getMessages().remove(message.getMessageNumber());
}
public void commitTran() throws AMQStoreException
@@ -143,6 +145,12 @@ public class TestableMemoryMessageStore
return _storedMessage.getContent(offsetInMessage, dst);
}
+
+ public ByteBuffer getContent(int offsetInMessage, int size)
+ {
+ return _storedMessage.getContent(offsetInMessage, size);
+ }
+
public StoreFuture flushToStore()
{
return _storedMessage.flushToStore();
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java Wed Dec 28 13:02:41 2011
@@ -29,7 +29,7 @@ import org.apache.qpid.server.queue.AMQQ
import org.apache.qpid.server.queue.MockAMQQueue;
import org.apache.qpid.server.queue.MockQueueEntry;
import org.apache.qpid.server.queue.QueueEntry;
-import org.apache.qpid.server.store.TransactionLog;
+import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.txn.MockStoreTransaction.TransactionState;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -44,7 +44,7 @@ public class AutoCommitTransactionTest e
{
private ServerTransaction _transaction = null; // Class under test
- private TransactionLog _transactionLog;
+ private MessageStore _transactionLog;
private AMQQueue _queue;
private List<AMQQueue> _queues;
private Collection<QueueEntry> _queueEntries;
@@ -137,7 +137,7 @@ public class AutoCommitTransactionTest e
_message = createTestMessage(false);
_queues = createTestBaseQueues(new boolean[] {false, false, false});
- _transaction.enqueue(_queues, _message, _action);
+ _transaction.enqueue(_queues, _message, _action, 0L);
assertEquals("Enqueue of non-persistent message must not cause message to be enqueued", 0, _storeTransaction.getNumberOfEnqueuedMessages());
assertEquals("Unexpected transaction state", TransactionState.NOT_STARTED, _storeTransaction.getState());
@@ -157,7 +157,7 @@ public class AutoCommitTransactionTest e
_message = createTestMessage(true);
_queues = createTestBaseQueues(new boolean[] {false, false, false});
- _transaction.enqueue(_queues, _message, _action);
+ _transaction.enqueue(_queues, _message, _action, 0L);
assertEquals("Enqueue of persistent message to non-durable queues must not cause message to be enqueued", 0, _storeTransaction.getNumberOfEnqueuedMessages());
assertEquals("Unexpected transaction state", TransactionState.NOT_STARTED, _storeTransaction.getState());
@@ -175,7 +175,7 @@ public class AutoCommitTransactionTest e
_message = createTestMessage(true);
_queues = createTestBaseQueues(new boolean[] {false, true, false, true});
- _transaction.enqueue(_queues, _message, _action);
+ _transaction.enqueue(_queues, _message, _action, 0L);
assertEquals("Enqueue of persistent message to durable/non-durable queues must cause messages to be enqueued", 2, _storeTransaction.getNumberOfEnqueuedMessages());
assertEquals("Unexpected transaction state", TransactionState.COMMITTED, _storeTransaction.getState());
@@ -198,7 +198,7 @@ public class AutoCommitTransactionTest e
try
{
- _transaction.enqueue(_queues, _message, _action);
+ _transaction.enqueue(_queues, _message, _action, 0L);
fail("Exception not thrown");
}
catch (RuntimeException re)
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java Wed Dec 28 13:02:41 2011
@@ -29,7 +29,7 @@ import org.apache.qpid.server.queue.AMQQ
import org.apache.qpid.server.queue.MockAMQQueue;
import org.apache.qpid.server.queue.MockQueueEntry;
import org.apache.qpid.server.queue.QueueEntry;
-import org.apache.qpid.server.store.TransactionLog;
+import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.txn.MockStoreTransaction.TransactionState;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -51,7 +51,7 @@ public class LocalTransactionTest extend
private MockAction _action1;
private MockAction _action2;
private MockStoreTransaction _storeTransaction;
- private TransactionLog _transactionLog;
+ private MessageStore _transactionLog;
@Override
@@ -140,7 +140,7 @@ public class LocalTransactionTest extend
_message = createTestMessage(false);
_queues = createTestBaseQueues(new boolean[] {false, false, false});
- _transaction.enqueue(_queues, _message, _action1);
+ _transaction.enqueue(_queues, _message, _action1, 0L);
assertEquals("Enqueue of non-persistent message must not cause message to be enqueued", 0, _storeTransaction.getNumberOfEnqueuedMessages());
assertEquals("Unexpected transaction state", TransactionState.NOT_STARTED, _storeTransaction.getState());
@@ -156,7 +156,7 @@ public class LocalTransactionTest extend
_message = createTestMessage(true);
_queues = createTestBaseQueues(new boolean[] {false, false, false});
- _transaction.enqueue(_queues, _message, _action1);
+ _transaction.enqueue(_queues, _message, _action1, 0L);
assertEquals("Enqueue of persistent message to non-durable queues must not cause message to be enqueued", 0, _storeTransaction.getNumberOfEnqueuedMessages());
assertEquals("Unexpected transaction state", TransactionState.NOT_STARTED, _storeTransaction.getState());
@@ -173,7 +173,7 @@ public class LocalTransactionTest extend
_message = createTestMessage(true);
_queues = createTestBaseQueues(new boolean[] {false, true, false, true});
- _transaction.enqueue(_queues, _message, _action1);
+ _transaction.enqueue(_queues, _message, _action1, 0L);
assertEquals("Enqueue of persistent message to durable/non-durable queues must cause messages to be enqueued", 2, _storeTransaction.getNumberOfEnqueuedMessages());
assertEquals("Unexpected transaction state", TransactionState.STARTED, _storeTransaction.getState());
@@ -196,7 +196,7 @@ public class LocalTransactionTest extend
try
{
- _transaction.enqueue(_queues, _message, _action1);
+ _transaction.enqueue(_queues, _message, _action1, 0L);
fail("Exception not thrown");
}
catch (RuntimeException re)
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java Wed Dec 28 13:02:41 2011
@@ -27,6 +27,7 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.message.AMQMessageHeader;
import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.store.StoredMessage;
/**
* Mock Server Message allowing its persistent flag to be controlled from test.
@@ -81,6 +82,11 @@ class MockServerMessage implements Serve
throw new NotImplementedException();
}
+ public StoredMessage getStoredMessage()
+ {
+ throw new NotImplementedException();
+ }
+
public long getExpiration()
{
throw new NotImplementedException();
@@ -91,12 +97,18 @@ class MockServerMessage implements Serve
throw new NotImplementedException();
}
+
+ public ByteBuffer getContent(int offset, int size)
+ {
+ throw new NotImplementedException();
+ }
+
public long getArrivalTime()
{
throw new NotImplementedException();
}
- public Long getMessageNumber()
+ public long getMessageNumber()
{
return 0L;
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java Wed Dec 28 13:02:41 2011
@@ -24,11 +24,11 @@ import org.apache.commons.configuration.
import org.apache.commons.lang.NotImplementedException;
import org.apache.qpid.AMQStoreException;
import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.store.TransactionLog;
-import org.apache.qpid.server.store.TransactionLogRecoveryHandler;
-import org.apache.qpid.server.store.TransactionLogResource;
-import org.apache.qpid.server.store.TransactionLog.StoreFuture;
-import org.apache.qpid.server.store.TransactionLog.Transaction;
+import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.server.store.*;
+import org.apache.qpid.server.store.MessageStore.StoreFuture;
+import org.apache.qpid.server.store.MessageStore.Transaction;
/**
* Mock implementation of a (Store) Transaction allow its state to be observed.
@@ -61,7 +61,7 @@ class MockStoreTransaction implements Tr
return _state;
}
- public void enqueueMessage(TransactionLogResource queue, Long messageId) throws AMQStoreException
+ public void enqueueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException
{
if (_throwExceptionOnQueueOp)
{
@@ -82,7 +82,7 @@ class MockStoreTransaction implements Tr
return _numberOfEnqueuedMessages;
}
- public void dequeueMessage(TransactionLogResource queue, Long messageId) throws AMQStoreException
+ public void dequeueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException
{
if (_throwExceptionOnQueueOp)
{
@@ -107,10 +107,33 @@ class MockStoreTransaction implements Tr
_state = TransactionState.ABORTED;
}
- public static TransactionLog createTestTransactionLog(final MockStoreTransaction storeTransaction)
+ public static MessageStore createTestTransactionLog(final MockStoreTransaction storeTransaction)
{
- return new TransactionLog()
+ return new MessageStore()
{
+ public void configureMessageStore(final String name,
+ final MessageStoreRecoveryHandler recoveryHandler,
+ final Configuration config,
+ final LogSubject logSubject) throws Exception
+ {
+ //TODO.
+ }
+
+ public void close() throws Exception
+ {
+ //TODO.
+ }
+
+ public <T extends StorableMessageMetaData> StoredMessage<T> addMessage(final T metaData)
+ {
+ return null; //TODO.
+ }
+
+ public boolean isPersistent()
+ {
+ return false; //TODO.
+ }
+
public void configureTransactionLog(String name, TransactionLogRecoveryHandler recoveryHandler,
Configuration storeConfiguration, LogSubject logSubject) throws Exception
{
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java Wed Dec 28 13:02:41 2011
@@ -41,7 +41,6 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.stats.StatisticsCounter;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.MessageStore;
-import org.apache.qpid.server.store.TransactionLog;
public class MockVirtualHost implements VirtualHost
{
@@ -159,10 +158,6 @@ public class MockVirtualHost implements
return null;
}
- public TransactionLog getTransactionLog()
- {
- return null;
- }
public void removeBrokerConnection(BrokerLink brokerLink)
{
Propchange: qpid/trunk/qpid/java/broker/src/velocity/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 28 13:02:41 2011
@@ -0,0 +1,2 @@
+*.iml
+
Propchange: qpid/trunk/qpid/java/client/example/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 28 13:02:41 2011
@@ -0,0 +1,2 @@
+*.iml
+
Propchange: qpid/trunk/qpid/java/client/src/main/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 28 13:02:41 2011
@@ -0,0 +1,2 @@
+*.iml
+
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java Wed Dec 28 13:02:41 2011
@@ -30,7 +30,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Queue;
import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID;
@@ -60,23 +59,7 @@ import org.apache.qpid.filter.MessageFil
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.transport.ExchangeBoundResult;
-import org.apache.qpid.transport.ExchangeQueryResult;
-import org.apache.qpid.transport.ExecutionErrorCode;
-import org.apache.qpid.transport.ExecutionException;
-import org.apache.qpid.transport.MessageAcceptMode;
-import org.apache.qpid.transport.MessageAcquireMode;
-import org.apache.qpid.transport.MessageCreditUnit;
-import org.apache.qpid.transport.MessageFlowMode;
-import org.apache.qpid.transport.MessageTransfer;
-import org.apache.qpid.transport.Option;
-import org.apache.qpid.transport.QueueQueryResult;
-import org.apache.qpid.transport.Range;
-import org.apache.qpid.transport.RangeSet;
-import org.apache.qpid.transport.Session;
-import org.apache.qpid.transport.SessionException;
-import org.apache.qpid.transport.SessionListener;
-import org.apache.qpid.transport.TransportException;
+import org.apache.qpid.transport.*;
import org.apache.qpid.util.Serial;
import org.apache.qpid.util.Strings;
import org.slf4j.Logger;
@@ -141,13 +124,13 @@ public class AMQSession_0_10 extends AMQ
private long maxAckDelay = Long.getLong("qpid.session.max_ack_delay", 1000);
private TimerTask flushTask = null;
- private RangeSet unacked = new RangeSet();
+ private RangeSet unacked = RangeSetFactory.createRangeSet();
private int unackedCount = 0;
/**
* Used to store the range of in tx messages
*/
- private final RangeSet _txRangeSet = new RangeSet();
+ private final RangeSet _txRangeSet = RangeSetFactory.createRangeSet();
private int _txSize = 0;
//--- constructors
@@ -460,7 +443,7 @@ public class AMQSession_0_10 extends AMQ
public void sendRecover() throws AMQException, FailoverException
{
// release all unacked messages
- RangeSet all = new RangeSet();
+ RangeSet all = RangeSetFactory.createRangeSet();
RangeSet delivered = gatherRangeSet(_unacknowledgedMessageTags);
RangeSet prefetched = gatherRangeSet(_prefetchedMessageTags);
for (Iterator<Range> deliveredIter = delivered.iterator(); deliveredIter.hasNext();)
@@ -483,7 +466,7 @@ public class AMQSession_0_10 extends AMQ
private RangeSet gatherRangeSet(ConcurrentLinkedQueue<Long> messageTags)
{
- RangeSet ranges = new RangeSet();
+ RangeSet ranges = RangeSetFactory.createRangeSet();
while (true)
{
Long tag = messageTags.poll();
@@ -518,7 +501,7 @@ public class AMQSession_0_10 extends AMQ
public void rejectMessage(long deliveryTag, boolean requeue)
{
// The value of requeue is always true
- RangeSet ranges = new RangeSet();
+ RangeSet ranges = RangeSetFactory.createRangeSet();
ranges.add((int) deliveryTag);
flushProcessed(ranges, false);
if (requeue)
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java Wed Dec 28 13:02:41 2011
@@ -21,6 +21,8 @@
package org.apache.qpid.client;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.ArrayList;
import java.util.Map;
@@ -80,7 +82,7 @@ import org.apache.qpid.transport.Transpo
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public final class AMQSession_0_8 extends AMQSession<BasicMessageConsumer_0_8, BasicMessageProducer_0_8>
+public class AMQSession_0_8 extends AMQSession<BasicMessageConsumer_0_8, BasicMessageProducer_0_8>
{
/** Used for debugging. */
private static final Logger _logger = LoggerFactory.getLogger(AMQSession.class);
@@ -96,8 +98,8 @@ public final class AMQSession_0_8 extend
* @param defaultPrefetchHighMark The maximum number of messages to prefetched before suspending the session.
* @param defaultPrefetchLowMark The number of prefetched messages at which to resume the session.
*/
- AMQSession_0_8(AMQConnection con, int channelId, boolean transacted, int acknowledgeMode,
- MessageFactoryRegistry messageFactoryRegistry, int defaultPrefetchHighMark, int defaultPrefetchLowMark)
+ protected AMQSession_0_8(AMQConnection con, int channelId, boolean transacted, int acknowledgeMode,
+ MessageFactoryRegistry messageFactoryRegistry, int defaultPrefetchHighMark, int defaultPrefetchLowMark)
{
super(con,channelId,transacted,acknowledgeMode,messageFactoryRegistry,defaultPrefetchHighMark,defaultPrefetchLowMark);
@@ -150,7 +152,7 @@ public final class AMQSession_0_8 extend
_logger.debug("Sending ack for delivery tag " + deliveryTag + " on channel " + _channelId);
}
- getProtocolHandler().writeFrame(ackFrame);
+ getProtocolHandler().writeFrame(ackFrame, !getTransacted());
_unacknowledgedMessageTags.remove(deliveryTag);
}
@@ -512,7 +514,7 @@ public final class AMQSession_0_8 extend
// Bounced message is processed here, away from the mina thread
AbstractJMSMessage bouncedMessage =
_messageFactoryRegistry.createMessage(0, false, msg.getExchange(),
- msg.getRoutingKey(), msg.getContentHeader(), msg.getBodies());
+ msg.getRoutingKey(), msg.getContentHeader(), msg.getBodies(),_queueDestinationCache,_topicDestinationCache);
AMQConstant errorCode = AMQConstant.getConstant(msg.getReplyCode());
AMQShortString reason = msg.getReplyText();
_logger.debug("Message returned with error code " + errorCode + " (" + reason + ")");
@@ -572,6 +574,16 @@ public final class AMQSession_0_8 extend
}, _connection).execute();
}
+ public DestinationCache<AMQQueue> getQueueDestinationCache()
+ {
+ return _queueDestinationCache;
+ }
+
+ public DestinationCache<AMQTopic> getTopicDestinationCache()
+ {
+ return _topicDestinationCache;
+ }
+
class QueueDeclareOkHandler extends SpecificMethodFrameListener
{
@@ -613,12 +625,12 @@ public final class AMQSession_0_8 extend
return okHandler._messageCount;
}
- protected final boolean tagLE(long tag1, long tag2)
+ protected boolean tagLE(long tag1, long tag2)
{
return tag1 <= tag2;
}
- protected final boolean updateRollbackMark(long currentMark, long deliveryTag)
+ protected boolean updateRollbackMark(long currentMark, long deliveryTag)
{
return false;
}
@@ -695,4 +707,55 @@ public final class AMQSession_0_8 extend
return null;
}
}
+
+ public abstract static class DestinationCache<T extends AMQDestination>
+ {
+ private final Map<AMQShortString, Map<AMQShortString, T>> cache = new HashMap<AMQShortString, Map<AMQShortString, T>>();
+
+ public T getDestination(AMQShortString exchangeName, AMQShortString routingKey)
+ {
+ Map<AMQShortString, T> routingMap = cache.get(exchangeName);
+ if(routingMap == null)
+ {
+ routingMap = new LinkedHashMap<AMQShortString, T>()
+ {
+
+ protected boolean removeEldestEntry(Map.Entry<AMQShortString, T> eldest)
+ {
+ return size() >= 200;
+ }
+ };
+ cache.put(exchangeName,routingMap);
+ }
+ T destination = routingMap.get(routingKey);
+ if(destination == null)
+ {
+ destination = newDestination(exchangeName, routingKey);
+ routingMap.put(routingKey,destination);
+ }
+ return destination;
+ }
+
+ protected abstract T newDestination(AMQShortString exchangeName, AMQShortString routingKey);
+ }
+
+ private static class TopicDestinationCache extends DestinationCache<AMQTopic>
+ {
+ protected AMQTopic newDestination(AMQShortString exchangeName, AMQShortString routingKey)
+ {
+ return new AMQTopic(exchangeName, routingKey, null);
+ }
+ }
+
+ private static class QueueDestinationCache extends DestinationCache<AMQQueue>
+ {
+ protected AMQQueue newDestination(AMQShortString exchangeName, AMQShortString routingKey)
+ {
+ return new AMQQueue(exchangeName, routingKey, routingKey);
+ }
+ }
+
+ private final TopicDestinationCache _topicDestinationCache = new TopicDestinationCache();
+ private final QueueDestinationCache _queueDestinationCache = new QueueDestinationCache();
+
}
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java Wed Dec 28 13:02:41 2011
@@ -272,10 +272,8 @@ public class BasicMessageConsumer_0_10 e
*/
private void acknowledgeMessage(final AbstractJMSMessage message) throws AMQException
{
- final RangeSet ranges = new RangeSet();
- ranges.add((int) message.getDeliveryTag());
_0_10session.messageAcknowledge
- (ranges,
+ (Range.newInstance((int) message.getDeliveryTag()),
_acknowledgeMode != org.apache.qpid.jms.Session.NO_ACKNOWLEDGE);
final AMQException amqe = _0_10session.getCurrentException();
@@ -294,9 +292,7 @@ public class BasicMessageConsumer_0_10 e
*/
private void flushUnwantedMessage(final AbstractJMSMessage message) throws AMQException
{
- final RangeSet ranges = new RangeSet();
- ranges.add((int) message.getDeliveryTag());
- _0_10session.flushProcessed(ranges,false);
+ _0_10session.flushProcessed(Range.newInstance((int) message.getDeliveryTag()),false);
final AMQException amqe = _0_10session.getCurrentException();
if (amqe != null)
@@ -315,10 +311,8 @@ public class BasicMessageConsumer_0_10 e
private boolean acquireMessage(final AbstractJMSMessage message) throws AMQException
{
boolean result = false;
- final RangeSet ranges = new RangeSet();
- ranges.add((int) message.getDeliveryTag());
- final Acquired acq = _0_10session.getQpidSession().messageAcquire(ranges).get();
+ final Acquired acq = _0_10session.getQpidSession().messageAcquire(Range.newInstance((int)message.getDeliveryTag())).get();
final RangeSet acquired = acq.getTransfers();
if (acquired != null && acquired.size() > 0)
@@ -451,7 +445,7 @@ public class BasicMessageConsumer_0_10 e
{
if (_synchronousQueue.size() > 0)
{
- RangeSet ranges = new RangeSet();
+ RangeSet ranges = RangeSetFactory.createRangeSet();
Iterator iterator = _synchronousQueue.iterator();
while (iterator.hasNext())
{
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java Wed Dec 28 13:02:41 2011
@@ -38,11 +38,13 @@ import org.slf4j.LoggerFactory;
public class BasicMessageConsumer_0_8 extends BasicMessageConsumer<UnprocessedMessage_0_8>
{
protected final Logger _logger = LoggerFactory.getLogger(getClass());
+ private AMQSession_0_8.DestinationCache<AMQTopic> _topicDestinationCache;
+ private AMQSession_0_8.DestinationCache<AMQQueue> _queueDestinationCache;
private final RejectBehaviour _rejectBehaviour;
protected BasicMessageConsumer_0_8(int channelId, AMQConnection connection, AMQDestination destination,
- String messageSelector, boolean noLocal, MessageFactoryRegistry messageFactory, AMQSession session,
+ String messageSelector, boolean noLocal, MessageFactoryRegistry messageFactory, AMQSession_0_8 session,
AMQProtocolHandler protocolHandler, FieldTable rawSelector, int prefetchHigh, int prefetchLow,
boolean exclusive, int acknowledgeMode, boolean browseOnly, boolean autoClose) throws JMSException
{
@@ -60,6 +62,9 @@ public class BasicMessageConsumer_0_8 ex
consumerArguments.put(AMQPFilterTypes.NO_CONSUME.getValue(), Boolean.TRUE);
}
+ _topicDestinationCache = session.getTopicDestinationCache();
+ _queueDestinationCache = session.getQueueDestinationCache();
+
if (destination.getRejectBehaviour() != null)
{
_rejectBehaviour = destination.getRejectBehaviour();
@@ -100,7 +105,8 @@ public class BasicMessageConsumer_0_8 ex
return _messageFactory.createMessage(messageFrame.getDeliveryTag(),
messageFrame.isRedelivered(), messageFrame.getExchange(),
- messageFrame.getRoutingKey(), messageFrame.getContentHeader(), messageFrame.getBodies());
+ messageFrame.getRoutingKey(), messageFrame.getContentHeader(), messageFrame.getBodies(),
+ _queueDestinationCache, _topicDestinationCache);
}
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java Wed Dec 28 13:02:41 2011
@@ -48,7 +48,10 @@ public class BasicDeliverMethodHandler i
body.getExchange(),
body.getRoutingKey(),
body.getRedelivered());
- _logger.debug("New JmsDeliver method received:" + session);
+ if(_logger.isDebugEnabled())
+ {
+ _logger.debug("New JmsDeliver method received:" + session);
+ }
session.unprocessedMessageReceived(channelId, msg);
}
}
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java Wed Dec 28 13:02:41 2011
@@ -124,7 +124,7 @@ public class AMQMessageDelegate_0_10 ext
*/
public static void updateExchangeTypeMapping(Header header, org.apache.qpid.transport.Session session)
{
- DeliveryProperties deliveryProps = header.get(DeliveryProperties.class);
+ DeliveryProperties deliveryProps = header.getDeliveryProperties();
if (deliveryProps != null)
{
String exchange = deliveryProps.getExchange();
@@ -132,7 +132,7 @@ public class AMQMessageDelegate_0_10 ext
}
- MessageProperties msgProps = header.get(MessageProperties.class);
+ MessageProperties msgProps = header.getMessageProperties();
if (msgProps != null && msgProps.getReplyTo() != null)
{
String exchange = msgProps.getReplyTo().getExchange();
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java Wed Dec 28 13:02:41 2011
@@ -31,12 +31,7 @@ import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.MessageNotWriteableException;
-import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.AMQTopic;
-import org.apache.qpid.client.CustomJMSXProperty;
-import org.apache.qpid.client.JMSAMQException;
+import org.apache.qpid.client.*;
import org.apache.qpid.collections.ReferenceMap;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.BasicContentHeaderProperties;
@@ -81,7 +76,8 @@ public class AMQMessageDelegate_0_8 exte
// Used when generating a received message object
protected AMQMessageDelegate_0_8(long deliveryTag, BasicContentHeaderProperties contentHeader, AMQShortString exchange,
- AMQShortString routingKey)
+ AMQShortString routingKey, AMQSession_0_8.DestinationCache<AMQQueue> queueDestinationCache,
+ AMQSession_0_8.DestinationCache<AMQTopic> topicDestinationCache)
{
this(contentHeader, deliveryTag);
@@ -95,10 +91,10 @@ public class AMQMessageDelegate_0_8 exte
switch (type.intValue())
{
case AMQDestination.QUEUE_TYPE:
- dest = new AMQQueue(exchange, routingKey, routingKey);
+ dest = queueDestinationCache.getDestination(exchange, routingKey);
break;
case AMQDestination.TOPIC_TYPE:
- dest = new AMQTopic(exchange, routingKey, null);
+ dest = topicDestinationCache.getDestination(exchange, routingKey);
break;
default:
// Use the generateDestination method
@@ -133,10 +129,66 @@ public class AMQMessageDelegate_0_8 exte
{
if (messageId != null)
{
- getContentHeaderProperties().setMessageId("ID:" + messageId);
+ getContentHeaderProperties().setMessageId(asShortStringMsgId(messageId));
}
}
+ private static final byte[] HEX_DIGITS = {0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,
+ 0x61,0x62,0x63,0x64,0x65,0x66};
+
+ private static AMQShortString asShortStringMsgId(UUID messageId)
+ {
+ long msb = messageId.getMostSignificantBits();
+ long lsb = messageId.getLeastSignificantBits();
+
+ byte[] messageIdBytes = new byte[39];
+ messageIdBytes[0] = (byte) 'I';
+ messageIdBytes[1] = (byte) 'D';
+ messageIdBytes[2] = (byte) ':';
+
+ messageIdBytes[3] = HEX_DIGITS[(int)((msb >> 60) & 0xFl)];
+ messageIdBytes[4] = HEX_DIGITS[(int)((msb >> 56) & 0xFl)];
+ messageIdBytes[5] = HEX_DIGITS[(int)((msb >> 52) & 0xFl)];
+ messageIdBytes[6] = HEX_DIGITS[(int)((msb >> 48) & 0xFl)];
+ messageIdBytes[7] = HEX_DIGITS[(int)((msb >> 44) & 0xFl)];
+ messageIdBytes[8] = HEX_DIGITS[(int)((msb >> 40) & 0xFl)];
+ messageIdBytes[9] = HEX_DIGITS[(int)((msb >> 36) & 0xFl)];
+ messageIdBytes[10] = HEX_DIGITS[(int)((msb >> 32) & 0xFl)];
+
+ messageIdBytes[11] = (byte) '-';
+ messageIdBytes[12] = HEX_DIGITS[(int)((msb >> 28) & 0xFl)];
+ messageIdBytes[13] = HEX_DIGITS[(int)((msb >> 24) & 0xFl)];
+ messageIdBytes[14] = HEX_DIGITS[(int)((msb >> 20) & 0xFl)];
+ messageIdBytes[15] = HEX_DIGITS[(int)((msb >> 16) & 0xFl)];
+ messageIdBytes[16] = (byte) '-';
+ messageIdBytes[17] = HEX_DIGITS[(int)((msb >> 12) & 0xFl)];
+ messageIdBytes[18] = HEX_DIGITS[(int)((msb >> 8) & 0xFl)];
+ messageIdBytes[19] = HEX_DIGITS[(int)((msb >> 4) & 0xFl)];
+ messageIdBytes[20] = HEX_DIGITS[(int)(msb & 0xFl)];
+ messageIdBytes[21] = (byte) '-';
+
+ messageIdBytes[22] = HEX_DIGITS[(int)((lsb >> 60) & 0xFl)];
+ messageIdBytes[23] = HEX_DIGITS[(int)((lsb >> 56) & 0xFl)];
+ messageIdBytes[24] = HEX_DIGITS[(int)((lsb >> 52) & 0xFl)];
+ messageIdBytes[25] = HEX_DIGITS[(int)((lsb >> 48) & 0xFl)];
+
+ messageIdBytes[26] = (byte) '-';
+
+ messageIdBytes[27] = HEX_DIGITS[(int)((lsb >> 44) & 0xFl)];
+ messageIdBytes[28] = HEX_DIGITS[(int)((lsb >> 40) & 0xFl)];
+ messageIdBytes[29] = HEX_DIGITS[(int)((lsb >> 36) & 0xFl)];
+ messageIdBytes[30] = HEX_DIGITS[(int)((lsb >> 32) & 0xFl)];
+ messageIdBytes[31] = HEX_DIGITS[(int)((lsb >> 28) & 0xFl)];
+ messageIdBytes[32] = HEX_DIGITS[(int)((lsb >> 24) & 0xFl)];
+ messageIdBytes[33] = HEX_DIGITS[(int)((lsb >> 20) & 0xFl)];
+ messageIdBytes[34] = HEX_DIGITS[(int)((lsb >> 16) & 0xFl)];
+ messageIdBytes[35] = HEX_DIGITS[(int)((lsb >> 12) & 0xFl)];
+ messageIdBytes[36] = HEX_DIGITS[(int)((lsb >> 8) & 0xFl)];
+ messageIdBytes[37] = HEX_DIGITS[(int)((lsb >> 4) & 0xFl)];
+ messageIdBytes[38] = HEX_DIGITS[(int)(lsb & 0xFl)];
+
+ return new AMQShortString(messageIdBytes,0,39);
+ }
public long getJMSTimestamp() throws JMSException
{
@@ -413,7 +465,7 @@ public class AMQMessageDelegate_0_8 exte
}
checkWritableProperties();
- getJmsHeaders().setByte(propertyName, new Byte(b));
+ getJmsHeaders().setByte(propertyName, b);
}
public void setShortProperty(String propertyName, short i) throws JMSException
@@ -424,13 +476,13 @@ public class AMQMessageDelegate_0_8 exte
}
checkWritableProperties();
- getJmsHeaders().setShort(propertyName, new Short(i));
+ getJmsHeaders().setShort(propertyName, i);
}
public void setIntProperty(String propertyName, int i) throws JMSException
{
checkWritableProperties();
- getJmsHeaders().setInteger(propertyName, new Integer(i));
+ getJmsHeaders().setInteger(propertyName, i);
}
public void setLongProperty(String propertyName, long l) throws JMSException
@@ -441,7 +493,7 @@ public class AMQMessageDelegate_0_8 exte
}
checkWritableProperties();
- getJmsHeaders().setLong(propertyName, new Long(l));
+ getJmsHeaders().setLong(propertyName, l);
}
public void setFloatProperty(String propertyName, float f) throws JMSException
@@ -452,7 +504,7 @@ public class AMQMessageDelegate_0_8 exte
}
checkWritableProperties();
- getJmsHeaders().setFloat(propertyName, new Float(f));
+ getJmsHeaders().setFloat(propertyName, f);
}
public void setDoubleProperty(String propertyName, double v) throws JMSException
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java Wed Dec 28 13:02:41 2011
@@ -21,6 +21,9 @@
package org.apache.qpid.client.message;
import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQSession_0_8;
+import org.apache.qpid.client.AMQTopic;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.ContentBody;
import org.apache.qpid.framing.ContentHeaderBody;
@@ -44,7 +47,9 @@ public abstract class AbstractJMSMessage
protected AbstractJMSMessage create08MessageWithBody(long messageNbr, ContentHeaderBody contentHeader,
AMQShortString exchange, AMQShortString routingKey,
- List bodies) throws AMQException
+ List bodies,
+ AMQSession_0_8.DestinationCache<AMQQueue> queueDestinationCache,
+ AMQSession_0_8.DestinationCache<AMQTopic> topicDestinationCache) throws AMQException
{
ByteBuffer data;
final boolean debug = _logger.isDebugEnabled();
@@ -99,7 +104,7 @@ public abstract class AbstractJMSMessage
AMQMessageDelegate delegate = new AMQMessageDelegate_0_8(messageNbr,
(BasicContentHeaderProperties) contentHeader.getProperties(),
- exchange, routingKey);
+ exchange, routingKey, queueDestinationCache, topicDestinationCache);
return createMessage(delegate, data);
}
@@ -149,10 +154,12 @@ public abstract class AbstractJMSMessage
public AbstractJMSMessage createMessage(long messageNbr, boolean redelivered, ContentHeaderBody contentHeader,
- AMQShortString exchange, AMQShortString routingKey, List bodies)
+ AMQShortString exchange, AMQShortString routingKey, List bodies,
+ AMQSession_0_8.DestinationCache<AMQQueue> queueDestinationCache,
+ AMQSession_0_8.DestinationCache<AMQTopic> topicDestinationCache)
throws JMSException, AMQException
{
- final AbstractJMSMessage msg = create08MessageWithBody(messageNbr, contentHeader, exchange, routingKey, bodies);
+ final AbstractJMSMessage msg = create08MessageWithBody(messageNbr, contentHeader, exchange, routingKey, bodies, queueDestinationCache, topicDestinationCache);
msg.setJMSRedelivered(redelivered);
msg.setReceivedFromServer();
return msg;
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactory.java Wed Dec 28 13:02:41 2011
@@ -25,6 +25,9 @@ import java.util.List;
import javax.jms.JMSException;
import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQSession_0_8;
+import org.apache.qpid.client.AMQTopic;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.transport.DeliveryProperties;
@@ -36,7 +39,7 @@ public interface MessageFactory
AbstractJMSMessage createMessage(long deliveryTag, boolean redelivered,
ContentHeaderBody contentHeader,
AMQShortString exchange, AMQShortString routingKey,
- List bodies)
+ List bodies, AMQSession_0_8.DestinationCache<AMQQueue> queueDestinationCache, AMQSession_0_8.DestinationCache<AMQTopic> topicDestinationCache)
throws JMSException, AMQException;
AbstractJMSMessage createMessage(long deliveryTag, boolean redelivered,
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java?rev=1225178&r1=1225177&r2=1225178&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java Wed Dec 28 13:02:41 2011
@@ -28,6 +28,9 @@ import java.nio.ByteBuffer;
import javax.jms.JMSException;
import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQSession_0_8;
+import org.apache.qpid.client.AMQTopic;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.BasicContentHeaderProperties;
import org.apache.qpid.framing.ContentHeaderBody;
@@ -93,15 +96,19 @@ public class MessageFactoryRegistry
* Create a message. This looks up the MIME type from the content header and instantiates the appropriate
* concrete message type.
*
+ *
* @param deliveryTag the AMQ message id
* @param redelivered true if redelivered
* @param contentHeader the content header that was received
* @param bodies a list of ContentBody instances @return the message.
- * @throws AMQException
+ * @param queueDestinationCache
+ *@param topicDestinationCache @throws AMQException
* @throws JMSException
*/
public AbstractJMSMessage createMessage(long deliveryTag, boolean redelivered, AMQShortString exchange,
- AMQShortString routingKey, ContentHeaderBody contentHeader, List bodies)
+ AMQShortString routingKey, ContentHeaderBody contentHeader, List bodies,
+ AMQSession_0_8.DestinationCache<AMQQueue> queueDestinationCache,
+ AMQSession_0_8.DestinationCache<AMQTopic> topicDestinationCache)
throws AMQException, JMSException
{
BasicContentHeaderProperties properties = (BasicContentHeaderProperties) contentHeader.getProperties();
@@ -118,13 +125,13 @@ public class MessageFactoryRegistry
mf = _default;
}
- return mf.createMessage(deliveryTag, redelivered, contentHeader, exchange, routingKey, bodies);
+ return mf.createMessage(deliveryTag, redelivered, contentHeader, exchange, routingKey, bodies, queueDestinationCache, topicDestinationCache);
}
public AbstractJMSMessage createMessage(MessageTransfer transfer) throws AMQException, JMSException
{
- MessageProperties mprop = transfer.getHeader().get(MessageProperties.class);
+ MessageProperties mprop = transfer.getHeader().getMessageProperties();
String messageType = "";
if ( mprop == null || mprop.getContentType() == null)
{
@@ -143,7 +150,7 @@ public class MessageFactoryRegistry
boolean redelivered = false;
DeliveryProperties deliverProps;
- if((deliverProps = transfer.getHeader().get(DeliveryProperties.class)) != null)
+ if((deliverProps = transfer.getHeader().getDeliveryProperties()) != null)
{
redelivered = deliverProps.getRedelivered();
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org