Removed original IntAllocator; renamed IntBitSetAllocator to IntAllocator.

Author: Steve Powell

src/com/rabbitmq/client/impl/ChannelManager.java

@@ -24,7 +24,7 @@
 import java.util.Set;
 
 import com.rabbitmq.client.ShutdownSignalException;
-import com.rabbitmq.utility.IntBitSetAllocator;
+import com.rabbitmq.utility.IntAllocator;
 
 /**
  * Manages a set of channels, indexed by channel number.
@@ -34,7 +34,7 @@ public class ChannelManager {
     /** Mapping from channel number to AMQChannel instance */
     private final Map<Integer, ChannelN> _channelMap =
         Collections.synchronizedMap(new HashMap<Integer, ChannelN>());
-    private final IntBitSetAllocator channelNumberAllocator;
+    private final IntAllocator channelNumberAllocator;
 
     /** Maximum channel number available on this connection. */
     public final int _channelMax;
@@ -50,7 +50,7 @@ public ChannelManager(int channelMax) {
             channelMax = (1 << 16) - 1;
         }
         _channelMax = channelMax;
-        channelNumberAllocator = new IntBitSetAllocator(1, channelMax);
+        channelNumberAllocator = new IntAllocator(1, channelMax);
     }
 
 

src/com/rabbitmq/utility/IntBitSetAllocator.java renamed to src/com/rabbitmq/utility/IntAllocator.java

@@ -38,7 +38,7 @@
  * range.
  * <br/>Very little Object creation and destruction occurs in use.
  */
-public class IntBitSetAllocator {
+public class IntAllocator {
 
     private final int loRange; // the integer bit 0 represents
     private final int hiRange; // the integer(+1) the highest bit represents
@@ -50,12 +50,12 @@ public class IntBitSetAllocator {
     private final BitSet freeSet;
 
     /**
-     * Creates an IntBitSetAllocator allocating integer IDs within the
+     * Creates an IntAllocator allocating integer IDs within the
      * inclusive range [<code>bottom</code>, <code>top</code>].
      * @param bottom lower end of range
      * @param top upper end of range (inclusive)
      */
-    public IntBitSetAllocator(int bottom, int top) {
+    public IntAllocator(int bottom, int top) {
         this.loRange = bottom;
         this.hiRange = top + 1;
         this.numberOfBits = hiRange - loRange;
@@ -111,7 +111,7 @@ public boolean reserve(int reservation) {
     @Override
     public String toString() {
         StringBuilder sb
-            = new StringBuilder("IntBitSetAllocator{allocated = [");
+            = new StringBuilder("IntAllocator{allocated = [");
 
         int firstClearBit = this.freeSet.nextClearBit(0);
         if (firstClearBit < this.numberOfBits) {

test/src/com/rabbitmq/utility/IntBitSetAllocatorTests.java renamed to test/src/com/rabbitmq/utility/IntAllocatorTests.java

@@ -23,12 +23,12 @@
 
 import junit.framework.TestCase;
 
-public class IntBitSetAllocatorTests extends TestCase {
+public class IntAllocatorTests extends TestCase {
 
     private static final int TEST_ITERATIONS = 50000;
     private static final int HI_RANGE = 100000;
     private static final int LO_RANGE = 100;
-    private IntBitSetAllocator iAll = new IntBitSetAllocator(LO_RANGE, HI_RANGE);
+    private IntAllocator iAll = new IntAllocator(LO_RANGE, HI_RANGE);
 
     private Random rand = new Random(70608L);
 
@@ -40,15 +40,13 @@ public void testReserveAndFree() throws Exception {
                 iAll.free(trial);
                 set.remove(trial);
             } else {
-                assertTrue("Did not reserve free integer " + trial,
-                        iAll.reserve(trial));
+                assertTrue("Did not reserve free integer " + trial, iAll.reserve(trial));
                 set.add(trial);
             }
         }
 
         for (int trial : set) {
-            assertFalse("Integer " + trial + " not allocated!",
-                    iAll.reserve(trial));
+            assertFalse("Integer " + trial + " not allocated!", iAll.reserve(trial));
         }
     }
 
@@ -62,31 +60,28 @@ public void testAllocateAndFree() throws Exception {
             } else {
                 if (!set.isEmpty()) {
                     int trial = extractOne(set);
-                    assertFalse("Allocator agreed to reserve " + trial,
-                            iAll.reserve(trial));
+                    assertFalse("Allocator agreed to reserve " + trial, iAll.reserve(trial));
                     iAll.free(trial);
                 }
             }
         }
 
         for (int trial : set) {
-            assertFalse("Integer " + trial + " should be allocated!",
-                    iAll.reserve(trial));
+            assertFalse("Integer " + trial + " should be allocated!", iAll.reserve(trial));
         }
     }
 
     public void testToString() throws Exception {
-        IntBitSetAllocator ibs = new IntBitSetAllocator(LO_RANGE, HI_RANGE);
-        assertEquals("IntBitSetAllocator{allocated = []}", ibs.toString());
+        IntAllocator ibs = new IntAllocator(LO_RANGE, HI_RANGE);
+        assertEquals("IntAllocator{allocated = []}", ibs.toString());
         ibs.allocate();
-        assertEquals("IntBitSetAllocator{allocated = [100]}", ibs.toString());
+        assertEquals("IntAllocator{allocated = [100]}", ibs.toString());
         for(int i = 200; i<211; i=i+4) {
             ibs.reserve(i);
             ibs.reserve(i+1);
             ibs.reserve(i+2);
         }
-        assertEquals("IntBitSetAllocator{allocated = "
-                    + "[100, 200..202, 204..206, 208..210]}"
+        assertEquals("IntAllocator{allocated = [100, 200..202, 204..206, 208..210]}"
                     , ibs.toString());
     }