[jboss-cvs] JBoss Messaging SVN: r4420 - in trunk: src/main/org/jboss/messaging/core/list/impl and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 10 09:19:40 EDT 2008
Author: jmesnil
Date: 2008-06-10 09:19:40 -0400 (Tue, 10 Jun 2008)
New Revision: 4420
Modified:
trunk/src/main/org/jboss/messaging/core/list/PriorityLinkedList.java
trunk/src/main/org/jboss/messaging/core/list/impl/PriorityLinkedListImpl.java
trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/list/impl/PriorityLinkedListTest.java
Log:
refactoring + unit test for PriorityLinkedList
removed unused public methods remove(T, int) & removeLast()
iterator() now returns a Iterator<T> instead of a ListIterator<T>
Modified: trunk/src/main/org/jboss/messaging/core/list/PriorityLinkedList.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/list/PriorityLinkedList.java 2008-06-10 11:58:51 UTC (rev 4419)
+++ trunk/src/main/org/jboss/messaging/core/list/PriorityLinkedList.java 2008-06-10 13:19:40 UTC (rev 4420)
@@ -22,8 +22,8 @@
package org.jboss.messaging.core.list;
+import java.util.Iterator;
import java.util.List;
-import java.util.ListIterator;
/**
* A type of linked list which maintains items according to a priority
@@ -42,8 +42,6 @@
T removeFirst();
- T removeLast();
-
T peekFirst();
List<T> getAll();
@@ -52,9 +50,7 @@
int size();
- ListIterator<T> iterator();
+ Iterator<T> iterator();
boolean isEmpty();
-
- void remove(T messageReference, int priority);
}
Modified: trunk/src/main/org/jboss/messaging/core/list/impl/PriorityLinkedListImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/list/impl/PriorityLinkedListImpl.java 2008-06-10 11:58:51 UTC (rev 4419)
+++ trunk/src/main/org/jboss/messaging/core/list/impl/PriorityLinkedListImpl.java 2008-06-10 13:19:40 UTC (rev 4420)
@@ -22,6 +22,7 @@
package org.jboss.messaging.core.list.impl;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
@@ -102,31 +103,6 @@
return t;
}
- public T removeLast()
- {
- T t = null;
-
- for (int i = 0; i < priorities; i++)
- {
- LinkedList<T> ll = linkedLists.get(i);
- if (!ll.isEmpty())
- {
- t = ll.removeLast();
- }
- if (t != null)
- {
- break;
- }
- }
-
- if (t != null)
- {
- size--;
- }
-
- return t;
- }
-
public T peekFirst()
{
T t = null;
@@ -180,22 +156,12 @@
return size == 0;
}
- public void remove(final T messageReference, final int priority)
+ public Iterator<T> iterator()
{
- LinkedList<T> linkedList = linkedLists.get(priority);
-
- if (linkedList != null)
- {
- linkedList.remove(messageReference);
- }
- }
-
- public ListIterator<T> iterator()
- {
return new PriorityLinkedListIterator();
}
- private class PriorityLinkedListIterator implements ListIterator<T>
+ private class PriorityLinkedListIterator implements Iterator<T>
{
private int index;
@@ -208,11 +174,6 @@
currentIter = linkedLists.get(index).listIterator();
}
- public void add(final Object obj)
- {
- throw new UnsupportedOperationException();
- }
-
public boolean hasNext()
{
if (currentIter.hasNext())
@@ -233,11 +194,6 @@
}
return currentIter.hasNext();
}
-
- public boolean hasPrevious()
- {
- throw new UnsupportedOperationException();
- }
public T next()
{
@@ -248,31 +204,11 @@
return currentIter.next();
}
- public int nextIndex()
- {
- throw new UnsupportedOperationException();
- }
-
- public T previous()
- {
- throw new UnsupportedOperationException();
- }
-
- public int previousIndex()
- {
- throw new UnsupportedOperationException();
- }
-
public void remove()
{
currentIter.remove();
size--;
}
-
- public void set(final Object obj)
- {
- throw new UnsupportedOperationException();
- }
}
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java 2008-06-10 11:58:51 UTC (rev 4419)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java 2008-06-10 13:19:40 UTC (rev 4420)
@@ -22,6 +22,7 @@
package org.jboss.messaging.core.server.impl;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
@@ -232,7 +233,7 @@
{
MessageReference reference;
- ListIterator<MessageReference> iterator = null;
+ Iterator<MessageReference> iterator = null;
while (true)
{
@@ -342,7 +343,7 @@
public synchronized boolean removeReferenceWithID(final long id)
{
- ListIterator<MessageReference> iterator = messageReferences.iterator();
+ Iterator<MessageReference> iterator = messageReferences.iterator();
boolean removed = false;
@@ -365,7 +366,7 @@
public synchronized MessageReference getReference(final long id)
{
- ListIterator<MessageReference> iterator = messageReferences.iterator();
+ Iterator<MessageReference> iterator = messageReferences.iterator();
while (iterator.hasNext())
{
@@ -470,7 +471,7 @@
{
Transaction tx = new TransactionImpl(storageManager, null);
- ListIterator<MessageReference> iter = messageReferences.iterator();
+ Iterator<MessageReference> iter = messageReferences.iterator();
while (iter.hasNext())
{
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/list/impl/PriorityLinkedListTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/list/impl/PriorityLinkedListTest.java 2008-06-10 11:58:51 UTC (rev 4419)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/list/impl/PriorityLinkedListTest.java 2008-06-10 13:19:40 UTC (rev 4420)
@@ -22,7 +22,6 @@
package org.jboss.messaging.tests.unit.core.list.impl;
import java.util.Iterator;
-import java.util.ListIterator;
import org.jboss.messaging.core.list.PriorityLinkedList;
import org.jboss.messaging.core.list.impl.PriorityLinkedListImpl;
@@ -101,9 +100,23 @@
public void tearDown() throws Exception
{
+ list = null;
super.tearDown();
}
-
+
+ public void testEmpty() throws Exception
+ {
+ assertTrue(list.isEmpty());
+
+ list.addFirst(a, 0);
+
+ assertFalse(list.isEmpty());
+
+ Wibble w = list.removeFirst();
+ assertEquals(a, w);
+ assertTrue(list.isEmpty());
+ }
+
public void testAddFirst() throws Exception
{
list.addFirst(a, 0);
@@ -138,6 +151,29 @@
}
+ public void testPeekFirst()
+ {
+ list.addLast(a, 0);
+ list.addLast(b, 1);
+ list.addLast(c, 2);
+ list.addLast(d, 3);
+ list.addLast(e, 4);
+ list.addLast(f, 5);
+ list.addLast(g, 6);
+ list.addLast(h, 7);
+ list.addLast(i, 8);
+ list.addLast(j, 9);
+
+ assertEquals(j, list.peekFirst());
+ assertEquals(j, list.peekFirst());
+
+ list.removeFirst();
+
+ assertEquals(i, list.peekFirst());
+ assertEquals(i, list.peekFirst());
+
+ list.clear();
+ }
public void testRemoveFirst() throws Exception
{
@@ -301,7 +337,7 @@
list.addLast(j, 9);
- Iterator iter = list.getAll().iterator();
+ Iterator<Wibble> iter = list.getAll().iterator();
int count = 0;
while (iter.hasNext())
{
@@ -380,7 +416,7 @@
list.addLast(y, 0);
list.addLast(z, 0);
- ListIterator iter = list.iterator();
+ Iterator<Wibble> iter = list.iterator();
int c = 0;
while (iter.hasNext())
More information about the jboss-cvs-commits
mailing list