MP-11740 Prevent instantiating TreeMap with more than 1 bucket

Author: sarveswaran-m

src/main/java/com/trivago/fastutilconcurrentwrapper/ConcurrentLongShortTreeMapBuilder.java

@@ -5,10 +5,6 @@
 
 public final class ConcurrentLongShortTreeMapBuilder {
     private MapMode mapMode = MapMode.BLOCKING;
-    // floorEntry() requires all keys to reside in a single bucket to return
-    // correct results, so the bucket count is fixed at 1.
-    // ToDo: Identify a bucketing methodology that works for TreeMap
-    private static final int BUCKETS = 1;
     private short defaultValue = LongShortMap.DEFAULT_VALUE;
 
     private ConcurrentLongShortTreeMapBuilder() {
@@ -38,15 +34,13 @@ public enum MapMode {
             @Override
             LongShortTreeMap createMap(ConcurrentLongShortTreeMapBuilder builder) {
                 return new ConcurrentBusyWaitingLongShortTreeMap(
-                        BUCKETS,
                         builder.defaultValue);
             }
         },
         BLOCKING {
             @Override
             LongShortTreeMap createMap(ConcurrentLongShortTreeMapBuilder builder) {
                 return new ConcurrentLongShortTreeMap(
-                        BUCKETS,
                         builder.defaultValue);
             }
         };

src/main/java/com/trivago/fastutilconcurrentwrapper/LongShortTreeMap.java

@@ -6,6 +6,12 @@
  * A sorted {@link LongShortMap} that additionally supports a {@code floorEntry()} operation.
  */
 public interface LongShortTreeMap extends LongShortMap {
+
+    // floorEntry() requires all keys to reside in a single bucket to return
+    // correct results, so the bucket count is fixed at 1.
+    // ToDo: Identify a bucketing methodology that works for TreeMap
+    public static final int BUCKETS = 1;
+
     /**
      * Returns the entry with the greatest key less than or equal to the given key,
      * or {@code null} if no such key exists.

src/main/java/com/trivago/fastutilconcurrentwrapper/map/ConcurrentBusyWaitingLongShortTreeMap.java

@@ -13,7 +13,11 @@ public class ConcurrentBusyWaitingLongShortTreeMap extends PrimitiveConcurrentMa
     private final LongShortTreeMap[] maps;
     private final short defaultValue;
 
-    public ConcurrentBusyWaitingLongShortTreeMap(int numBuckets,
+    public ConcurrentBusyWaitingLongShortTreeMap(short defaultValue) {
+        this(LongShortTreeMap.BUCKETS,defaultValue);
+    }
+
+    private ConcurrentBusyWaitingLongShortTreeMap(int numBuckets,
                                              short defaultValue) {
         super(numBuckets);
 

src/main/java/com/trivago/fastutilconcurrentwrapper/map/ConcurrentLongShortTreeMap.java

@@ -12,7 +12,11 @@ public class ConcurrentLongShortTreeMap extends PrimitiveConcurrentMap implement
     private final LongShortTreeMap[] maps;
     private final short defaultValue;
 
-    public ConcurrentLongShortTreeMap(int numBuckets, short defaultValue) {
+    public ConcurrentLongShortTreeMap(short defaultValue) {
+        this(LongShortTreeMap.BUCKETS,defaultValue);
+    }
+
+    private ConcurrentLongShortTreeMap(int numBuckets, short defaultValue) {
         super(numBuckets);
         this.maps = new LongShortTreeMap[numBuckets];
         this.defaultValue = defaultValue;

src/test/java/com/trivago/fastutilconcurrentwrapper/longshort/ConcurrentBusyWaitingLongShortTreeMapTest.java

@@ -6,6 +6,6 @@
 public class ConcurrentBusyWaitingLongShortTreeMapTest extends AbstractLongShortTreeMapTest {
     @Override
     LongShortTreeMap createMap() {
-        return new ConcurrentBusyWaitingLongShortTreeMap(1, defaultValue);
+        return new ConcurrentBusyWaitingLongShortTreeMap(defaultValue);
     }
 }

src/test/java/com/trivago/fastutilconcurrentwrapper/longshort/ConcurrentPrimitiveLongShortTreeMapTest.java

@@ -6,6 +6,6 @@
 public class ConcurrentPrimitiveLongShortTreeMapTest extends AbstractLongShortTreeMapTest {
     @Override
     LongShortTreeMap createMap() {
-        return new ConcurrentLongShortTreeMap(1, defaultValue);
+        return new ConcurrentLongShortTreeMap(defaultValue);
     }
 }