You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2014/01/29 15:48:55 UTC
svn commit: r1562466 [4/6] - in /qpid/branches/java-broker-bdb-ha: ./ qpid/
qpid/cpp/src/ qpid/cpp/src/qpid/client/ qpid/cpp/src/qpid/framing/
qpid/cpp/src/qpid/ha/ qpid/cpp/src/qpid/messaging/amqp/ qpid/cpp/src/tests/
qpid/java/ qpid/java/amqp-1-0-cli...
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java Wed Jan 29 14:48:50 2014
@@ -231,7 +231,7 @@ public class AMQQueueFactoryTest extends
false,
attributes);
- assertEquals("Queue not a priorty queue", AMQPriorityQueue.class, queue.getClass());
+ assertEquals("Queue not a priority queue", AMQPriorityQueue.class, queue.getClass());
verifyQueueRegistered("testPriorityQueue");
verifyRegisteredQueueCount(1);
}
@@ -251,7 +251,7 @@ public class AMQQueueFactoryTest extends
//verify that no alternate exchange or DLQ were produced
- assertNull("Queue should not have an alternate exchange as DLQ wasnt enabled", queue.getAlternateExchange());
+ assertNull("Queue should not have an alternate exchange as DLQ wasn't enabled", queue.getAlternateExchange());
assertNull("The DLQ should not exist", _virtualHost.getQueue(dlQueueName));
verifyRegisteredQueueCount(1);
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/ConflationQueueListTest.java Wed Jan 29 14:48:50 2014
@@ -66,7 +66,7 @@ public class ConflationQueueListTest ext
ServerMessage message = createTestServerMessage(null);
QueueEntry addedEntry = _list.add(message);
- addedEntry.discard();
+ addedEntry.delete();
int numberOfEntries = countEntries(_list);
assertEquals(0, numberOfEntries);
@@ -86,7 +86,7 @@ public class ConflationQueueListTest ext
ServerMessage message = createTestServerMessage(TEST_KEY_VALUE);
QueueEntry addedEntry = _list.add(message);
- addedEntry.discard();
+ addedEntry.delete();
int numberOfEntries = countEntries(_list);
assertEquals(0, numberOfEntries);
@@ -146,7 +146,7 @@ public class ConflationQueueListTest ext
assertEquals(1, countEntries(_list));
assertEquals(1, _list.getLatestValuesMap().size());
- addedEntry.discard();
+ addedEntry.delete();
assertEquals(0, countEntries(_list));
assertEquals(0, _list.getLatestValuesMap().size());
@@ -166,8 +166,8 @@ public class ConflationQueueListTest ext
assertEquals(2, countEntries(_list));
assertEquals(2, _list.getLatestValuesMap().size());
- addedEntry1.discard();
- addedEntry2.discard();
+ addedEntry1.delete();
+ addedEntry2.delete();
assertEquals(0, countEntries(_list));
assertEquals(0, _list.getLatestValuesMap().size());
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java Wed Jan 29 14:48:50 2014
@@ -346,7 +346,7 @@ public class MockAMQQueue implements AMQ
return null;
}
- public List<Long> getMessagesOnTheQueue(int num, int offest)
+ public List<Long> getMessagesOnTheQueue(int num, int offset)
{
return null;
}
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java Wed Jan 29 14:48:50 2014
@@ -23,6 +23,7 @@ package org.apache.qpid.server.queue;
import org.apache.qpid.AMQException;
import org.apache.qpid.server.filter.Filterable;
import org.apache.qpid.server.message.AMQMessageHeader;
+import org.apache.qpid.server.message.InstanceProperties;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.subscription.Subscription;
@@ -56,17 +57,7 @@ public class MockQueueEntry implements Q
}
- public boolean delete()
- {
- return false;
- }
-
- public void dequeue()
- {
-
- }
-
- public void discard()
+ public void delete()
{
}
@@ -76,11 +67,6 @@ public class MockQueueEntry implements Q
}
- public void dispose()
- {
-
- }
-
public boolean expired() throws AMQException
{
return false;
@@ -121,11 +107,6 @@ public class MockQueueEntry implements Q
return false;
}
- public boolean isDeleted()
- {
- return false;
- }
-
public boolean isQueueDeleted()
{
@@ -161,26 +142,6 @@ public class MockQueueEntry implements Q
return false;
}
-
- public void requeue()
- {
-
-
- }
-
- public void requeue(Subscription subscription)
- {
- //To change body of implemented methods use File | Settings | File Templates.
- }
-
-
- public void setDeliveredToSubscription()
- {
-
-
- }
-
-
public void setRedelivered()
{
@@ -213,12 +174,7 @@ public class MockQueueEntry implements Q
_message = msg;
}
- public boolean isDequeued()
- {
- return false;
- }
-
- public boolean isDispensed()
+ public boolean isDeleted()
{
return false;
}
@@ -252,6 +208,12 @@ public class MockQueueEntry implements Q
@Override
public Filterable asFilterable()
{
- return Filterable.Factory.newInstance(_message, new QueueEntryInstanceProperties(this));
+ return Filterable.Factory.newInstance(_message, getInstanceProperties());
+ }
+
+ @Override
+ public InstanceProperties getInstanceProperties()
+ {
+ return InstanceProperties.EMPTY;
}
}
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/NotificationCheckTest.java Wed Jan 29 14:48:50 2014
@@ -85,7 +85,7 @@ public class NotificationCheckTest exten
verifyZeroInteractions(_listener);
MESSAGE_AGE_ALERT.notifyIfNecessary(_message, _queue, _listener);
- // Uses contains as first part of message is nondeterministic
+ // Uses contains as first part of message is non-deterministic
verify(_listener).notifyClients(eq(MESSAGE_AGE_ALERT), eq(_queue), contains("s : Maximum age on queue threshold (1s) breached."));
}
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java Wed Jan 29 14:48:50 2014
@@ -21,6 +21,7 @@ package org.apache.qpid.server.queue;
import junit.framework.TestCase;
import org.apache.qpid.AMQException;
+import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.queue.QueueEntry.EntryState;
import org.apache.qpid.server.subscription.MockSubscription;
@@ -41,7 +42,7 @@ public abstract class QueueEntryImplTest
protected QueueEntryImpl _queueEntry2;
protected QueueEntryImpl _queueEntry3;
- public abstract QueueEntryImpl getQueueEntryImpl(int msgid) throws AMQException;
+ public abstract QueueEntryImpl getQueueEntryImpl(int msgId) throws AMQException;
public abstract void testCompareTo();
@@ -56,18 +57,13 @@ public abstract class QueueEntryImplTest
_queueEntry3 = getQueueEntryImpl(3);
}
- public void testAquire()
+ public void testAcquire()
{
assertTrue("Queue entry should be in AVAILABLE state before invoking of acquire method",
_queueEntry.isAvailable());
acquire();
}
- public void testDequeue()
- {
- dequeue();
- }
-
public void testDelete()
{
delete();
@@ -79,27 +75,12 @@ public abstract class QueueEntryImplTest
* Entry in state ACQUIRED should be released and its status should be
* changed to AVAILABLE.
*/
- public void testReleaseAquired()
+ public void testReleaseAcquired()
{
acquire();
_queueEntry.release();
assertTrue("Queue entry should be in AVAILABLE state after invoking of release method",
- _queueEntry.isAvailable());
- }
-
- /**
- * Tests release method for entry in dequeued state.
- * <p>
- * Invoking release on dequeued entry should not have any effect on its
- * state.
- */
- public void testReleaseDequeued()
- {
- dequeue();
- _queueEntry.release();
- EntryState state = getState();
- assertEquals("Invoking of release on entry in DEQUEUED state should not have any effect",
- QueueEntry.DEQUEUED_STATE, state);
+ _queueEntry.isAvailable());
}
/**
@@ -126,17 +107,6 @@ public abstract class QueueEntryImplTest
_queueEntry.isDeleted());
}
- /**
- * A helper method to put tested entry into dequeue state and assert the sate
- */
- private void dequeue()
- {
- acquire();
- _queueEntry.dequeue();
- EntryState state = getState();
- assertEquals("Queue entry should be in DEQUEUED state after invoking of dequeue method",
- QueueEntry.DEQUEUED_STATE, state);
- }
/**
* A helper method to put tested entry into acquired state and assert the sate
@@ -203,7 +173,7 @@ public abstract class QueueEntryImplTest
}
/**
- * Tests if entries in DEQUQUED or DELETED state are not returned by getNext method.
+ * Tests if entries in DEQUEUED or DELETED state are not returned by getNext method.
*/
public void testGetNext()
{
@@ -216,6 +186,9 @@ public abstract class QueueEntryImplTest
{
ServerMessage message = mock(ServerMessage.class);
when(message.getMessageNumber()).thenReturn((long)i);
+ final MessageReference reference = mock(MessageReference.class);
+ when(reference.getMessage()).thenReturn(message);
+ when(message.newReference()).thenReturn(reference);
QueueEntryImpl entry = queueEntryList.add(message);
entries[i] = entry;
}
@@ -235,13 +208,13 @@ public abstract class QueueEntryImplTest
}
}
- // delete second
+ // discard second
entries[1].acquire();
entries[1].delete();
- // dequeue third
+ // discard third
entries[2].acquire();
- entries[2].dequeue();
+ entries[2].delete();
QueueEntry next = entries[0].getNextValidEntry();
assertEquals("expected forth entry",entries[3], next);
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java Wed Jan 29 14:48:50 2014
@@ -117,7 +117,7 @@ public abstract class QueueEntryListTest
entry = entryList.next(entry);
count++;
}
- assertEquals("Get next didnt get all the list entries", getExpectedListLength(), count);
+ assertEquals("Get next didn't get all the list entries", getExpectedListLength(), count);
}
/**
@@ -142,7 +142,7 @@ public abstract class QueueEntryListTest
* @see QueueEntryListTestBase#getTestList()
* @see QueueEntryListTestBase#getExpectedListLength()
*/
- public void testDequedMessagedNotPresentInIterator() throws Exception
+ public void testDequeuedMessagedNotPresentInIterator() throws Exception
{
final int numberOfMessages = getExpectedListLength();
final QueueEntryList<QueueEntry> entryList = getTestList();
@@ -156,7 +156,7 @@ public abstract class QueueEntryListTest
if(counter++ % 2 == 0)
{
queueEntry.acquire();
- queueEntry.dequeue();
+ queueEntry.delete();
}
}
@@ -225,7 +225,8 @@ public abstract class QueueEntryListTest
assertNull(list.next(queueEntry2));
//'delete' the 2nd QueueEntry
- assertTrue("Deleting node should have succeeded", queueEntry2.delete());
+ queueEntry2.delete();
+ assertTrue("Deleting node should have succeeded", queueEntry2.isDeleted());
QueueEntryIterator<QueueEntry> iter = list.iterator();
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java Wed Jan 29 14:48:50 2014
@@ -674,15 +674,15 @@ public class SimpleAMQQueueTest extends
@Override
public void run()
{
- // we dont actually want/need this runner to do any work
+ // we don't actually want/need this runner to do any work
// because we we are already doing it!
}
});
// check expected messages delivered to correct consumers
- verifyRecievedMessages(msgListSub1, sub1.getMessages());
- verifyRecievedMessages(msgListSub2, sub2.getMessages());
- verifyRecievedMessages(msgListSub3, sub3.getMessages());
+ verifyReceivedMessages(msgListSub1, sub1.getMessages());
+ verifyReceivedMessages(msgListSub2, sub2.getMessages());
+ verifyReceivedMessages(msgListSub3, sub3.getMessages());
}
/**
@@ -791,7 +791,7 @@ public class SimpleAMQQueueTest extends
//delete message from top
_queue.deleteMessageFromTop();
- //get queue netries
+ //get queue entries
List<QueueEntry> entries = _queue.getMessagesOnTheQueue();
// assert queue entries
@@ -908,7 +908,7 @@ public class SimpleAMQQueueTest extends
Thread.currentThread().interrupt();
}
List<QueueEntry> expected = createEntriesList(entries.get(0), entries.get(2), entries.get(3));
- verifyRecievedMessages(expected, subscription.getMessages());
+ verifyReceivedMessages(expected, subscription.getMessages());
}
/**
@@ -936,12 +936,8 @@ public class SimpleAMQQueueTest extends
{
return new SimpleQueueEntryImpl(this, message)
{
- public boolean isDequeued()
- {
- return (message.getMessageNumber() % 2 == 0);
- }
- public boolean isDispensed()
+ public boolean isDeleted()
{
return (message.getMessageNumber() % 2 == 0);
}
@@ -1166,8 +1162,8 @@ public class SimpleAMQQueueTest extends
List<QueueEntry> entries = queue.getMessagesOnTheQueue();
QueueEntry entry = entries.get(dequeueMessageIndex);
entry.acquire();
- entry.dequeue();
- assertTrue(entry.isDequeued());
+ entry.delete();
+ assertTrue(entry.isDeleted());
return entry;
}
@@ -1181,15 +1177,15 @@ public class SimpleAMQQueueTest extends
return entriesList;
}
- private void verifyRecievedMessages(List<QueueEntry> expected,
- List<QueueEntry> delivered)
+ private void verifyReceivedMessages(List<QueueEntry> expected,
+ List<QueueEntry> delivered)
{
assertEquals("Consumer did not receive the expected number of messages",
expected.size(), delivered.size());
for (QueueEntry msg : expected)
{
- assertTrue("Consumer did not recieve msg: "
+ assertTrue("Consumer did not receive msg: "
+ msg.getMessage().getMessageNumber(), delivered.contains(msg));
}
}
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java Wed Jan 29 14:48:50 2014
@@ -21,18 +21,24 @@
package org.apache.qpid.server.queue;
import org.apache.qpid.AMQException;
+import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public class SimpleQueueEntryImplTest extends QueueEntryImplTestBase {
+public class SimpleQueueEntryImplTest extends QueueEntryImplTestBase
+{
private SimpleQueueEntryList queueEntryList = new SimpleQueueEntryList(new MockAMQQueue("test"));
- public QueueEntryImpl getQueueEntryImpl(int msgId) throws AMQException {
+ public QueueEntryImpl getQueueEntryImpl(int msgId) throws AMQException
+ {
ServerMessage message = mock(ServerMessage.class);
when(message.getMessageNumber()).thenReturn((long)msgId);
+ final MessageReference reference = mock(MessageReference.class);
+ when(reference.getMessage()).thenReturn(message);
+ when(message.newReference()).thenReturn(reference);
return queueEntryList.add(message);
}
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java Wed Jan 29 14:48:50 2014
@@ -132,37 +132,45 @@ public class SimpleQueueEntryListTest ex
//requiring a scavenge once the requested threshold of 9 deletes is passed
//Delete the 2nd message only
- assertTrue("Failed to delete QueueEntry", entriesMap.remove(2).delete());
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap,2));
verifyDeletedButPresentBeforeScavenge(head, 2);
//Delete messages 12 to 14
- assertTrue("Failed to delete QueueEntry", entriesMap.remove(12).delete());
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap,12));
verifyDeletedButPresentBeforeScavenge(head, 12);
- assertTrue("Failed to delete QueueEntry", entriesMap.remove(13).delete());
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap,13));
verifyDeletedButPresentBeforeScavenge(head, 13);
- assertTrue("Failed to delete QueueEntry", entriesMap.remove(14).delete());
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap,14));
verifyDeletedButPresentBeforeScavenge(head, 14);
//Delete message 20 only
- assertTrue("Failed to delete QueueEntry", entriesMap.remove(20).delete());
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap,20));
verifyDeletedButPresentBeforeScavenge(head, 20);
//Delete messages 81 to 84
- assertTrue("Failed to delete QueueEntry", entriesMap.remove(81).delete());
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap,81));
verifyDeletedButPresentBeforeScavenge(head, 81);
- assertTrue("Failed to delete QueueEntry", entriesMap.remove(82).delete());
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap,82));
verifyDeletedButPresentBeforeScavenge(head, 82);
- assertTrue("Failed to delete QueueEntry", entriesMap.remove(83).delete());
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap,83));
verifyDeletedButPresentBeforeScavenge(head, 83);
- assertTrue("Failed to delete QueueEntry", entriesMap.remove(84).delete());
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap,84));
verifyDeletedButPresentBeforeScavenge(head, 84);
//Delete message 99 - this is the 10th message deleted that is after the queue head
//and so will invoke the scavenge() which is set to go after 9 previous deletions
- assertTrue("Failed to delete QueueEntry", entriesMap.remove(99).delete());
+ assertTrue("Failed to delete QueueEntry", remove(entriesMap,99));
verifyAllDeletedMessagedNotPresent(head, entriesMap);
}
+
+ private boolean remove(Map<Integer,QueueEntry> entriesMap, int pos)
+ {
+ QueueEntry entry = entriesMap.remove(pos);
+ boolean wasDeleted = entry.isDeleted();
+ entry.delete();
+ return entry.isDeleted() && !wasDeleted;
+ }
private void verifyDeletedButPresentBeforeScavenge(SimpleQueueEntryImpl head, long messageId)
{
@@ -211,6 +219,9 @@ public class SimpleQueueEntryListTest ex
{
ServerMessage message = mock(ServerMessage.class);
when(message.getMessageNumber()).thenReturn((long)i);
+ final MessageReference reference = mock(MessageReference.class);
+ when(reference.getMessage()).thenReturn(message);
+ when(message.newReference()).thenReturn(reference);
entries[i] = queueEntryList.add(message);
}
@@ -235,7 +246,7 @@ public class SimpleQueueEntryListTest ex
// dequeue third
entries[2].acquire();
- entries[2].dequeue();
+ entries[2].delete();
SimpleQueueEntryImpl next = entries[2].getNextValidEntry();
assertEquals("expected forth entry", entries[3], next);
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryImplTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryImplTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryImplTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryImplTest.java Wed Jan 29 14:48:50 2014
@@ -22,19 +22,22 @@ package org.apache.qpid.server.queue;
import java.util.Collections;
import org.apache.qpid.AMQException;
import org.apache.qpid.server.message.AMQMessageHeader;
+import org.apache.qpid.server.message.MessageReference;
import org.apache.qpid.server.message.ServerMessage;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public class SortedQueueEntryImplTest extends QueueEntryImplTestBase {
+public class SortedQueueEntryImplTest extends QueueEntryImplTestBase
+{
public final static String keys[] = { "CCC", "AAA", "BBB" };
private SelfValidatingSortedQueueEntryList queueEntryList = new SelfValidatingSortedQueueEntryList(new MockAMQQueue("test"),"KEY");
- public QueueEntryImpl getQueueEntryImpl(int msgId) throws AMQException {
+ public QueueEntryImpl getQueueEntryImpl(int msgId) throws AMQException
+ {
final ServerMessage message = mock(ServerMessage.class);
AMQMessageHeader hdr = mock(AMQMessageHeader.class);
when(message.getMessageHeader()).thenReturn(hdr);
@@ -42,6 +45,9 @@ public class SortedQueueEntryImplTest ex
when(hdr.containsHeader(eq("KEY"))).thenReturn(true);
when(hdr.getHeaderNames()).thenReturn(Collections.singleton("KEY"));
+ final MessageReference reference = mock(MessageReference.class);
+ when(reference.getMessage()).thenReturn(message);
+ when(message.newReference()).thenReturn(reference);
return queueEntryList.add(message);
}
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java Wed Jan 29 14:48:50 2014
@@ -136,7 +136,7 @@ public class AuthenticatedPrincipalTest
assertFalse(user1principal2.equals(user1principal1));
}
- public void testEqualsWithDisimilarObjects()
+ public void testEqualsWithDissimilarObjects()
{
UsernamePrincipal wrappedPrincipal = new UsernamePrincipal("user1");
AuthenticatedPrincipal authenticatedPrincipal = new AuthenticatedPrincipal(wrappedPrincipal);
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java Wed Jan 29 14:48:50 2014
@@ -253,7 +253,7 @@ public class Base64MD5PasswordFilePrinci
}
catch (IOException e)
{
- fail("Unable to valdate file contents due to:" + e.getMessage());
+ fail("Unable to validate file contents due to:" + e.getMessage());
}
}
@@ -384,7 +384,7 @@ public class Base64MD5PasswordFilePrinci
}
catch (IOException e)
{
- fail("Unable to valdate file contents due to:" + e.getMessage());
+ fail("Unable to validate file contents due to:" + e.getMessage());
}
}
@@ -445,7 +445,7 @@ public class Base64MD5PasswordFilePrinci
try
{
_database.verifyPassword("made.up.username", PASSWORD.toCharArray());
- fail("Should not have been able to verify this non-existant users password.");
+ fail("Should not have been able to verify this nonexistent users password.");
}
catch (AccountNotFoundException e)
{
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java Wed Jan 29 14:48:50 2014
@@ -141,7 +141,7 @@ public class PlainPasswordFilePrincipalD
}
catch (IOException e)
{
- fail("Unable to valdate file contents due to:" + e.getMessage());
+ fail("Unable to validate file contents due to:" + e.getMessage());
}
testFile.delete();
}
@@ -275,7 +275,7 @@ public class PlainPasswordFilePrincipalD
}
catch (IOException e)
{
- fail("Unable to valdate file contents due to:" + e.getMessage());
+ fail("Unable to validate file contents due to:" + e.getMessage());
}
testFile.delete();
}
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java Wed Jan 29 14:48:50 2014
@@ -38,7 +38,6 @@ import org.apache.qpid.server.model.Brok
import org.apache.qpid.server.security.SubjectCreator;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
-import org.apache.qpid.server.security.auth.jmx.JMXPasswordAuthenticator;
import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
import org.apache.qpid.server.security.SecurityManager;
@@ -58,7 +57,7 @@ public class JMXPasswordAuthenticatorTes
private JMXPasswordAuthenticator _rmipa;
- private SubjectCreator _usernamePasswordOkaySuvjectCreator = createMockSubjectCreator(true, null);
+ private SubjectCreator _usernamePasswordOkaySubjectCreator = createMockSubjectCreator(true, null);
private SubjectCreator _badPasswordSubjectCreator = createMockSubjectCreator(false, null);
protected void setUp() throws Exception
@@ -72,7 +71,7 @@ public class JMXPasswordAuthenticatorTes
*/
public void testAuthenticationSuccess()
{
- when(_broker.getSubjectCreator(any(SocketAddress.class))).thenReturn(_usernamePasswordOkaySuvjectCreator);
+ when(_broker.getSubjectCreator(any(SocketAddress.class))).thenReturn(_usernamePasswordOkaySubjectCreator);
when(_securityManager.accessManagement()).thenReturn(true);
Subject newSubject = _rmipa.authenticate(_credentials);
@@ -100,7 +99,7 @@ public class JMXPasswordAuthenticatorTes
public void testAuthorisationFailure()
{
- when(_broker.getSubjectCreator(any(SocketAddress.class))).thenReturn(_usernamePasswordOkaySuvjectCreator);
+ when(_broker.getSubjectCreator(any(SocketAddress.class))).thenReturn(_usernamePasswordOkaySubjectCreator);
when(_securityManager.accessManagement()).thenReturn(false);
try
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java Wed Jan 29 14:48:50 2014
@@ -96,7 +96,7 @@ public class ExternalAuthenticationManag
assertEquals("person", saslServer.getAuthorizationID());
}
- public void testAuthenticatePrinicpalCnAndDc() throws Exception
+ public void testAuthenticatePrincipalCnAndDc() throws Exception
{
X500Principal principal = new X500Principal("CN=person, DC=example, DC=com");
UsernamePrincipal expectedPrincipal = new UsernamePrincipal("person@example.com");
@@ -111,7 +111,7 @@ public class ExternalAuthenticationManag
assertEquals("person@example.com", saslServer.getAuthorizationID());
}
- public void testAuthenticatePrinicpalCnDc_OtherComponentsIgnored() throws Exception
+ public void testAuthenticatePrincipalCnDc_OtherComponentsIgnored() throws Exception
{
X500Principal principal = new X500Principal("CN=person, DC=example, DC=com, O=My Company Ltd, L=Newbury, ST=Berkshire, C=GB");
UsernamePrincipal expectedPrincipal = new UsernamePrincipal("person@example.com");
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/SaslServerTestCase.java Wed Jan 29 14:48:50 2014
@@ -33,15 +33,15 @@ public abstract class SaslServerTestCase
protected SaslServer server;
protected String username = "u";
protected String password = "p";
- protected String notpassword = "a";
+ protected String notPassword = "a";
protected PrincipalDatabase db = new TestPrincipalDatabase();
- protected byte[] correctresponse;
- protected byte[] wrongresponse;
+ protected byte[] correctResponse;
+ protected byte[] wrongResponse;
- public void testSucessfulAuth() throws SaslException
+ public void testSuccessfulAuth() throws SaslException
{
- byte[] resp = this.server.evaluateResponse(correctresponse);
+ byte[] resp = this.server.evaluateResponse(correctResponse);
assertNull(resp);
}
@@ -50,7 +50,7 @@ public abstract class SaslServerTestCase
boolean exceptionCaught = false;
try
{
- byte[] resp = this.server.evaluateResponse(wrongresponse);
+ byte[] resp = this.server.evaluateResponse(wrongResponse);
}
catch (SaslException e)
{
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/amqplain/AMQPlainSaslServerTest.java Wed Jan 29 14:48:50 2014
@@ -36,8 +36,8 @@ public class AMQPlainSaslServerTest exte
FieldTable table = FieldTableFactory.newFieldTable();
table.setString("LOGIN", username);
table.setString("PASSWORD", password);
- correctresponse = table.getDataAsBytes();
- table.setString("PASSWORD", notpassword);
- wrongresponse = table.getDataAsBytes();
+ correctResponse = table.getDataAsBytes();
+ table.setString("PASSWORD", notPassword);
+ wrongResponse = table.getDataAsBytes();
}
}
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/sasl/plain/PlainSaslServerTest.java Wed Jan 29 14:48:50 2014
@@ -32,8 +32,8 @@ public class PlainSaslServerTest extends
UsernamePasswordInitialiser handler = new PlainInitialiser();
handler.initialise(db);
this.server = new PlainSaslServer(handler.getCallbackHandler());
- correctresponse = new byte[]{0x0, (byte) username.charAt(0), 0x0, (byte) password.charAt(0)};
- wrongresponse = new byte[]{0x0,(byte) username.charAt(0), 0x0, (byte) notpassword.charAt(0)};
+ correctResponse = new byte[]{0x0, (byte) username.charAt(0), 0x0, (byte) password.charAt(0)};
+ wrongResponse = new byte[]{0x0,(byte) username.charAt(0), 0x0, (byte) notPassword.charAt(0)};
}
}
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/group/FileGroupDatabaseTest.java Wed Jan 29 14:48:50 2014
@@ -187,7 +187,7 @@ public class FileGroupDatabaseTest exten
assertTrue(groups.contains(MY_GROUP1));
}
- public void testGetGroupPrincipalsForUserWhenUserAdddedToGroupTheyAreAlreadyIn() throws Exception
+ public void testGetGroupPrincipalsForUserWhenUserAddedToGroupTheyAreAlreadyIn() throws Exception
{
writeAndSetGroupFile("myGroup.users", USER1);
_groupDatabase.addUserToGroup(USER1, MY_GROUP);
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java Wed Jan 29 14:48:50 2014
@@ -40,7 +40,7 @@ import org.apache.qpid.AMQStoreException
import org.apache.qpid.common.AMQPFilterTypes;
import org.apache.qpid.server.binding.Binding;
import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.message.EnqueueableMessage;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.UUIDGenerator;
@@ -441,7 +441,7 @@ public abstract class AbstractDurableCon
UUID queueId1 = UUIDGenerator.generateRandomUUID();
TransactionLogResource queue1 = mock(TransactionLogResource.class);
when(queue1.getId()).thenReturn(queueId1);
- EnqueableMessage message1 = mock(EnqueableMessage.class);
+ EnqueueableMessage message1 = mock(EnqueueableMessage.class);
when(message1.isPersistent()).thenReturn(true);
when(message1.getMessageNumber()).thenReturn(messageNumber);
final StoredMessage storedMessage = mock(StoredMessage.class);
@@ -454,9 +454,9 @@ public abstract class AbstractDurableCon
private static class TestRecord implements Record
{
private TransactionLogResource _queue;
- private EnqueableMessage _message;
+ private EnqueueableMessage _message;
- public TestRecord(TransactionLogResource queue, EnqueableMessage message)
+ public TestRecord(TransactionLogResource queue, EnqueueableMessage message)
{
super();
_queue = queue;
@@ -470,7 +470,7 @@ public abstract class AbstractDurableCon
}
@Override
- public EnqueableMessage getMessage()
+ public EnqueueableMessage getMessage()
{
return _message;
}
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/DurableConfigurationRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/DurableConfigurationRecovererTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/DurableConfigurationRecovererTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/DurableConfigurationRecovererTest.java Wed Jan 29 14:48:50 2014
@@ -375,7 +375,7 @@ public class DurableConfigurationRecover
}
catch(IllegalConfigurationException e)
{
- assertEquals("Unkown type for configured object: Wibble", e.getMessage());
+ assertEquals("Unknown type for configured object: Wibble", e.getMessage());
}
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/EventManagerTest.java Wed Jan 29 14:48:50 2014
@@ -45,7 +45,7 @@ public class EventManagerTest extends Te
verifyZeroInteractions(_mockListener);
}
- public void testEventListenerFiresMulitpleTimes()
+ public void testEventListenerFiresMultipleTimes()
{
_eventManager.addEventListener(_mockListener, BEFORE_ACTIVATE);
_eventManager.addEventListener(_mockListener, AFTER_ACTIVATE);
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java Wed Jan 29 14:48:50 2014
@@ -28,7 +28,7 @@ import java.util.UUID;
import org.apache.log4j.Logger;
import org.apache.qpid.AMQStoreException;
-import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.message.EnqueueableMessage;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.store.MessageStoreRecoveryHandler.StoredMessageRecoveryHandler;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -103,10 +103,10 @@ public abstract class MessageStoreQuotaE
{
Transaction transaction = _store.newTransaction();
- List<EnqueableMessage> messages = new ArrayList<EnqueableMessage>();
+ List<EnqueueableMessage> messages = new ArrayList<EnqueueableMessage>();
for (int i = 0; i < getNumberOfMessagesToFillStore(); i++)
{
- EnqueableMessage m = addMessage(i);
+ EnqueueableMessage m = addMessage(i);
messages.add(m);
transaction.enqueueMessage(this, m);
}
@@ -114,7 +114,7 @@ public abstract class MessageStoreQuotaE
assertEvent(1, Event.PERSISTENT_MESSAGE_SIZE_OVERFULL);
- for (EnqueableMessage m : messages)
+ for (EnqueueableMessage m : messages)
{
m.getStoredMessage().remove();
}
@@ -122,7 +122,7 @@ public abstract class MessageStoreQuotaE
assertEvent(2, Event.PERSISTENT_MESSAGE_SIZE_UNDERFULL);
}
- protected EnqueableMessage addMessage(long id) throws AMQStoreException
+ protected EnqueueableMessage addMessage(long id) throws AMQStoreException
{
StorableMessageMetaData metaData = createMetaData(id, MESSAGE_DATA.length);
StoredMessage<?> handle = _store.addMessage(metaData);
@@ -158,7 +158,7 @@ public abstract class MessageStoreQuotaE
return _transactionResource;
}
- private static class TestMessage implements EnqueableMessage
+ private static class TestMessage implements EnqueueableMessage
{
private final StoredMessage<?> _handle;
private final long _messageId;
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/StateManagerTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/StateManagerTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/StateManagerTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/StateManagerTest.java Wed Jan 29 14:48:50 2014
@@ -99,7 +99,7 @@ public class StateManagerTest extends Te
{
assertEquals(State.INITIAL, _manager.getState());
performValidTransition(StateManager.INITIALISE);
- performValidTransition(StateManager.INITALISE_COMPLETE);
+ performValidTransition(StateManager.INITIALISE_COMPLETE);
performValidTransition(StateManager.ACTIVATE);
performValidTransition(StateManager.ACTIVATE_COMPLETE);
performValidTransition(StateManager.QUIESCE);
@@ -112,13 +112,13 @@ public class StateManagerTest extends Te
_manager = new StateManager(this);
assertEquals(State.INITIAL, _manager.getState());
performValidTransition(StateManager.INITIALISE);
- performValidTransition(StateManager.INITALISE_COMPLETE);
+ performValidTransition(StateManager.INITIALISE_COMPLETE);
performValidTransition(StateManager.CLOSE_INITIALISED);
performValidTransition(StateManager.CLOSE_COMPLETE);
_manager = new StateManager(this);
performValidTransition(StateManager.INITIALISE);
- performValidTransition(StateManager.INITALISE_COMPLETE);
+ performValidTransition(StateManager.INITIALISE_COMPLETE);
performValidTransition(StateManager.ACTIVATE);
performValidTransition(StateManager.ACTIVATE_COMPLETE);
performValidTransition(StateManager.QUIESCE);
@@ -140,7 +140,7 @@ public class StateManagerTest extends Te
assertEquals(State.INITIAL, _manager.getState());
performInvalidTransitions(StateManager.INITIALISE, State.INITIALISED);
- performInvalidTransitions(StateManager.INITALISE_COMPLETE, State.ACTIVATING, State.CLOSING);
+ performInvalidTransitions(StateManager.INITIALISE_COMPLETE, State.ACTIVATING, State.CLOSING);
performInvalidTransitions(StateManager.ACTIVATE, State.ACTIVE, State.CLOSING);
performInvalidTransitions(StateManager.ACTIVATE_COMPLETE, State.QUIESCING, State.CLOSING, State.INITIALISED);
performInvalidTransitions(StateManager.QUIESCE, State.QUIESCED);
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/TestableMemoryMessageStore.java Wed Jan 29 14:48:50 2014
@@ -21,7 +21,7 @@
package org.apache.qpid.server.store;
import org.apache.qpid.AMQStoreException;
-import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.message.EnqueueableMessage;
import org.apache.qpid.server.queue.AMQQueue;
import java.nio.ByteBuffer;
@@ -56,13 +56,13 @@ public class TestableMemoryMessageStore
private class TestableTransaction implements Transaction
{
@Override
- public void enqueueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException
+ public void enqueueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException
{
getMessages().put(message.getMessageNumber(), (AMQQueue)queue);
}
@Override
- public void dequeueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException
+ public void dequeueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException
{
getMessages().remove(message.getMessageNumber());
}
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/subscription/SubscriptionListTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/subscription/SubscriptionListTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/subscription/SubscriptionListTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/subscription/SubscriptionListTest.java Wed Jan 29 14:48:50 2014
@@ -251,7 +251,7 @@ public class SubscriptionListTest extend
* Test that if the subscription not contained in the list is requested to be removed
* that the removal fails
*/
- public void testRemoveNonExistantNode()
+ public void testRemoveNonexistentNode()
{
Subscription sub4 = new MockSubscription();
assertNull("Should not have been a node present for the subscription", getNodeForSubscription(_subList, sub4));
@@ -360,7 +360,7 @@ public class SubscriptionListTest extend
*/
public void testIteratorSkipsFirstDeletedNode()
{
- //'delete' but dont remove the node for the 1st subscription
+ //'delete' but don't remove the node for the 1st subscription
assertTrue("Deleting subscription node should have succeeded",
getNodeForSubscription(_subList, _sub1).delete());
assertNotNull("Should still have been a node present for the deleted subscription",
@@ -383,7 +383,7 @@ public class SubscriptionListTest extend
*/
public void testIteratorSkipsCentralDeletedNode()
{
- //'delete' but dont remove the node for the 2nd subscription
+ //'delete' but don't remove the node for the 2nd subscription
assertTrue("Deleting subscription node should have succeeded",
getNodeForSubscription(_subList, _sub2).delete());
assertNotNull("Should still have been a node present for the deleted subscription",
@@ -406,7 +406,7 @@ public class SubscriptionListTest extend
*/
public void testIteratorSkipsDeletedFinalNode()
{
- //'delete' but dont remove the node for the 3rd subscription
+ //'delete' but don't remove the node for the 3rd subscription
assertTrue("Deleting subscription node should have succeeded",
getNodeForSubscription(_subList, _sub3).delete());
assertNotNull("Should still have been a node present for the deleted 3rd subscription",
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java Wed Jan 29 14:48:50 2014
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.*;
import java.util.Collections;
-import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.message.EnqueueableMessage;
import org.apache.qpid.server.queue.BaseQueue;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.StoreFuture;
@@ -37,7 +37,7 @@ public class AsyncAutoCommitTransactionT
private static final String STRICT_ORDER_SYSTEM_PROPERTY = AsyncAutoCommitTransaction.QPID_STRICT_ORDER_WITH_MIXED_DELIVERY_MODE;
private FutureRecorder _futureRecorder = mock(FutureRecorder.class);
- private EnqueableMessage _message = mock(EnqueableMessage.class);
+ private EnqueueableMessage _message = mock(EnqueueableMessage.class);
private BaseQueue _queue = mock(BaseQueue.class);
private MessageStore _messageStore = mock(MessageStore.class);
private Transaction _storeTransaction = mock(Transaction.class);
@@ -72,7 +72,7 @@ public class AsyncAutoCommitTransactionT
verifyZeroInteractions(_postTransactionAction);
}
- public void testEnqueuePersistentMessageOnMultiplQueuesPostCommitNotCalled() throws Exception
+ public void testEnqueuePersistentMessageOnMultipleQueuesPostCommitNotCalled() throws Exception
{
setTestSystemProperty(STRICT_ORDER_SYSTEM_PROPERTY, "false");
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/AutoCommitTransactionTest.java Wed Jan 29 14:48:50 2014
@@ -361,7 +361,7 @@ public class AutoCommitTransactionTest e
}
/**
- * Tests the add of a post-commit action. Since AutoCommitTranctions
+ * Tests the add of a post-commit action. Since AutoCommitTransactions
* have no long lived transactions, the post commit action is fired immediately.
*/
public void testPostCommitActionFiredImmediately() throws Exception
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/LocalTransactionTest.java Wed Jan 29 14:48:50 2014
@@ -347,7 +347,7 @@ public class LocalTransactionTest extend
}
/**
- * Tests the add of a post-commit action. Unlike AutoCommitTranctions, the post transaction actions
+ * Tests the add of a post-commit action. Unlike AutoCommitTransactions, the post transaction actions
* is added to a list to be fired on commit or rollback.
*/
public void testAddingPostCommitActionNotFiredImmediately() throws Exception
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java Wed Jan 29 14:48:50 2014
@@ -23,7 +23,7 @@ package org.apache.qpid.server.txn;
import org.apache.qpid.server.txn.ServerTransaction.Action;
/**
- * Mock implementation of a ServerTranaction Action
+ * Mock implementation of a ServerTransaction Action
* allowing its state to be observed.
*
*/
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java Wed Jan 29 14:48:50 2014
@@ -22,7 +22,7 @@ package org.apache.qpid.server.txn;
import org.apache.commons.lang.NotImplementedException;
import org.apache.qpid.AMQStoreException;
-import org.apache.qpid.server.message.EnqueableMessage;
+import org.apache.qpid.server.message.EnqueueableMessage;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.NullMessageStore;
import org.apache.qpid.server.store.StoreFuture;
@@ -60,7 +60,7 @@ class MockStoreTransaction implements Tr
return _state;
}
- public void enqueueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException
+ public void enqueueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException
{
if (_throwExceptionOnQueueOp)
{
@@ -81,7 +81,7 @@ class MockStoreTransaction implements Tr
return _numberOfEnqueuedMessages;
}
- public void dequeueMessage(TransactionLogResource queue, EnqueableMessage message) throws AMQStoreException
+ public void dequeueMessage(TransactionLogResource queue, EnqueueableMessage message) throws AMQStoreException
{
if (_throwExceptionOnQueueOp)
{
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/StandardVirtualHostTest.java Wed Jan 29 14:48:50 2014
@@ -279,7 +279,7 @@ public class StandardVirtualHostTest ext
* @param vhostName name of the virtualhost
* @param queueName name of the queue
* @param exchangeName name of a direct exchange to declare (unless dontDeclare = true) and bind the queue to (null = none)
- * @param dontDeclare if true then dont declare the exchange, even if its name is non-null
+ * @param dontDeclare if true then don't declare the exchange, even if its name is non-null
* @param routingKeys routingKeys to bind the queue with (empty array = none)
* @return
*/
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java Wed Jan 29 14:48:50 2014
@@ -182,7 +182,7 @@ public class PlainConfiguration extends
break; // continue reading next line
}
- // invalid location for continuation character (add one to line beacuse we ate the EOL)
+ // invalid location for continuation character (add one to line because we ate the EOL)
throw new IllegalConfigurationException(String.format(PREMATURE_CONTINUATION_MSG, getLine() + 1));
}
else if (_st.ttype == '\'' || _st.ttype == '"')
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/Rule.java Wed Jan 29 14:48:50 2014
@@ -35,7 +35,7 @@ import org.apache.qpid.server.security.a
*/
public class Rule implements Comparable<Rule>
{
- /** String indicating all identitied. */
+ /** String indicating all identified. */
public static final String ALL = "all";
private Integer _number;
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java Wed Jan 29 14:48:50 2014
@@ -242,7 +242,7 @@ public class RuleSet
/** Returns true if a username has the name[@domain][/realm] format */
protected boolean isvalidUserName(String name)
{
- // check for '@' and '/' in namne
+ // check for '@' and '/' in name
int atPos = name.indexOf(AT);
int slashPos = name.indexOf(SLASH);
boolean atFound = atPos != StringUtils.INDEX_NOT_FOUND && atPos == name.lastIndexOf(AT);
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/PlainConfigurationTest.java Wed Jan 29 14:48:50 2014
@@ -323,7 +323,7 @@ public class PlainConfigurationTest exte
* be introduced anywhere in the ACL, whereas the C++ supports only whitespace at the beginning of
* of line.
*/
- public void testCommentsSuppported() throws Exception
+ public void testCommentsSupported() throws Exception
{
final PlainConfiguration config = writeACLConfig("#Comment",
"ACL DENY-LOG user1 ACCESS VIRTUALHOST # another comment",
@@ -362,7 +362,7 @@ public class PlainConfigurationTest exte
/**
* Tests interpretation of an acl utilising line continuation.
*/
- public void testLineContination() throws Exception
+ public void testLineContinuation() throws Exception
{
final PlainConfiguration config = writeACLConfig("ACL DENY-LOG user1 \\",
"ACCESS VIRTUALHOST");
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRuleTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRuleTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRuleTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRuleTest.java Wed Jan 29 14:48:50 2014
@@ -51,7 +51,7 @@ public class HostnameFirewallRuleTest ex
assertTrue(_HostnameFirewallRule.matches(addressWithMatchingHostname));
}
- public void testSingleHostnameWilcard() throws Exception
+ public void testSingleHostnameWildcard() throws Exception
{
String hostnameInRule = ".*FOO.*";
InetAddress addressWithMatchingHostname = mock(InetAddress.class);
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java Wed Jan 29 14:48:50 2014
@@ -329,7 +329,7 @@ public class DefaultAccessControlTest ex
/**
* Tests that granting of access method rights with mask allows matching operations to be performed on the specified component
*/
- public void testAuthoriseAccessMethodWhenMatchingAcessOperationsAllowedOnSpecifiedComponent() throws ConfigurationException
+ public void testAuthoriseAccessMethodWhenMatchingAccessOperationsAllowedOnSpecifiedComponent() throws ConfigurationException
{
final RuleSet rs = new RuleSet();
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java Wed Jan 29 14:48:50 2014
@@ -89,7 +89,7 @@ public class ServerSession extends Sessi
{
private static final Logger _logger = LoggerFactory.getLogger(ServerSession.class);
- private static final String NULL_DESTINTATION = UUID.randomUUID().toString();
+ private static final String NULL_DESTINATION = UUID.randomUUID().toString();
private static final int PRODUCER_CREDIT_TOPUP_THRESHOLD = 1 << 30;
private static final int UNFINISHED_COMMAND_QUEUE_THRESHOLD = 500;
@@ -421,12 +421,12 @@ public class ServerSession extends Sessi
public void register(String destination, Subscription_0_10 sub)
{
- _subscriptions.put(destination == null ? NULL_DESTINTATION : destination, sub);
+ _subscriptions.put(destination == null ? NULL_DESTINATION : destination, sub);
}
public Subscription_0_10 getSubscription(String destination)
{
- return _subscriptions.get(destination == null ? NULL_DESTINTATION : destination);
+ return _subscriptions.get(destination == null ? NULL_DESTINATION : destination);
}
public void unregister(Subscription_0_10 sub)
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java Wed Jan 29 14:48:50 2014
@@ -976,7 +976,7 @@ public class ServerSessionDelegate exten
}
else
{
- //TODO - here because of non-compiant python tests
+ //TODO - here because of non-compliant python tests
// should raise exception ILLEGAL_ARGUMENT "binding-key not set"
if (!method.hasBindingKey())
{
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Subscription_0_10.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Subscription_0_10.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Subscription_0_10.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/Subscription_0_10.java Wed Jan 29 14:48:50 2014
@@ -37,7 +37,6 @@ import org.apache.qpid.server.message.Se
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.BaseQueue;
import org.apache.qpid.server.queue.QueueEntry;
-import org.apache.qpid.server.queue.QueueEntryInstanceProperties;
import org.apache.qpid.server.subscription.Subscription;
import org.apache.qpid.server.txn.AutoCommitTransaction;
import org.apache.qpid.server.txn.ServerTransaction;
@@ -532,7 +531,7 @@ public class Subscription_0_10 implement
{
restoreCredit(entry);
}
- entry.discard();
+ entry.delete();
}
public void onRollback()
@@ -548,7 +547,7 @@ public class Subscription_0_10 implement
entry.routeToAlternate();
if(entry.isAcquiredBy(this))
{
- entry.discard();
+ entry.delete();
}
}
@@ -581,11 +580,11 @@ public class Subscription_0_10 implement
final ServerMessage msg = entry.getMessage();
if (alternateExchange != null)
{
- final List<? extends BaseQueue> destinationQueues = alternateExchange.route(entry.getMessage(), new QueueEntryInstanceProperties(entry));
+ final List<? extends BaseQueue> destinationQueues = alternateExchange.route(entry.getMessage(), entry.getInstanceProperties());
if (destinationQueues == null || destinationQueues.isEmpty())
{
- entry.discard();
+ entry.delete();
logActor.message( ChannelMessages.DISCARDMSG_NOROUTE(msg.getMessageNumber(), alternateExchange.getName()));
}
@@ -602,7 +601,7 @@ public class Subscription_0_10 implement
}
else
{
- entry.discard();
+ entry.delete();
logActor.message(ChannelMessages.DISCARDMSG_NOALTEXCH(msg.getMessageNumber(), entry.getQueue().getName(), msg.getRoutingKey()));
}
}
@@ -787,7 +786,7 @@ public class Subscription_0_10 implement
{
_unacknowledgedBytes.addAndGet(-entry.getSize());
_unacknowledgedCount.decrementAndGet();
- entry.discard();
+ entry.delete();
}
}
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/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/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1562466&r1=1562465&r2=1562466&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Wed Jan 29 14:48:50 2014
@@ -74,7 +74,6 @@ import org.apache.qpid.server.protocol.A
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.BaseQueue;
import org.apache.qpid.server.queue.QueueEntry;
-import org.apache.qpid.server.queue.QueueEntryInstanceProperties;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.StoreFuture;
@@ -394,7 +393,7 @@ public class AMQChannel implements AMQSe
*
* Pre-requisite: the current message is judged to have no destination queues.
*
- * @throws AMQConnectionException if the message is mandatoryclose-on-no-route
+ * @throws AMQConnectionException if the message is mandatory close-on-no-route
* @see AMQProtocolSession#isCloseWhenNoRoute()
*/
private void handleUnroutableMessage(AMQMessage message) throws AMQConnectionException
@@ -736,7 +735,7 @@ public class AMQChannel implements AMQSe
}
else
{
- unacked.discard();
+ unacked.delete();
}
}
@@ -771,7 +770,7 @@ public class AMQChannel implements AMQSe
_logger.warn(System.identityHashCode(this) + " Requested requeue of message(" + unacked
+ "):" + deliveryTag + " but no queue defined and no DeadLetter queue so DROPPING message.");
- unacked.discard();
+ unacked.delete();
}
}
else
@@ -970,7 +969,7 @@ public class AMQChannel implements AMQSe
// perform an Async delivery for each of the subscriptions in this
// Channel. The alternative would be to ensure that the subscription
// had received the change in suspension state. That way the logic
- // behind decieding to start an async delivery was located with the
+ // behind deciding to start an async delivery was located with the
// Subscription.
if (wasSuspended)
{
@@ -1362,7 +1361,7 @@ public class AMQChannel implements AMQSe
{
for(QueueEntry entry : _ackedMessages)
{
- entry.discard();
+ entry.delete();
}
}
finally
@@ -1571,19 +1570,19 @@ public class AMQChannel implements AMQSe
{
_logger.debug("No alternate exchange configured for queue, must discard the message as unable to DLQ: delivery tag: " + deliveryTag);
_actor.message(_logSubject, ChannelMessages.DISCARDMSG_NOALTEXCH(msg.getMessageNumber(), queue.getName(), msg.getRoutingKey()));
- rejectedQueueEntry.discard();
+ rejectedQueueEntry.delete();
return;
}
final List<? extends BaseQueue> destinationQueues =
- altExchange.route(rejectedQueueEntry.getMessage(), new QueueEntryInstanceProperties(rejectedQueueEntry));
+ altExchange.route(rejectedQueueEntry.getMessage(), rejectedQueueEntry.getInstanceProperties());
if (destinationQueues == null || destinationQueues.isEmpty())
{
_logger.debug("Routing process provided no queues to enqueue the message on, must discard message as unable to DLQ: delivery tag: " + deliveryTag);
_actor.message(_logSubject, ChannelMessages.DISCARDMSG_NOROUTE(msg.getMessageNumber(), altExchange.getName()));
- rejectedQueueEntry.discard();
+ rejectedQueueEntry.delete();
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org